diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-04-19 09:47:19 -0300 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2019-05-05 17:14:41 -0300 |
| commit | 77fa14725fd0c7a674f95264bc6cc585e338db6f (patch) | |
| tree | f50cf2e52d1310b7f1c91554e9451f263a0cb1b3 /nixos/modules | |
| parent | 6121a8e3b53e1438d02c814864ab85b230f58adc (diff) | |
nixos/deepin: move deepin-menu.nix into deepin.nix
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/deepin/deepin-menu.nix | 29 | ||||
| -rw-r--r-- | nixos/modules/services/desktops/deepin/deepin.nix | 10 |
3 files changed, 10 insertions, 30 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 28e3d5171492..a07461022a31 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -257,7 +257,6 @@ ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix ./services/desktops/deepin/deepin.nix - ./services/desktops/deepin/deepin-menu.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/pantheon/contractor.nix diff --git a/nixos/modules/services/desktops/deepin/deepin-menu.nix b/nixos/modules/services/desktops/deepin/deepin-menu.nix deleted file mode 100644 index 23fe5a741c42..000000000000 --- a/nixos/modules/services/desktops/deepin/deepin-menu.nix +++ /dev/null @@ -1,29 +0,0 @@ -# deepin-menu - -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - services.deepin.deepin-menu = { - - enable = lib.mkEnableOption - "DBus service for unified menus in Deepin Desktop Environment"; - - }; - - }; - - - ###### implementation - - config = lib.mkIf config.services.deepin.deepin-menu.enable { - - services.dbus.packages = [ pkgs.deepin.deepin-menu ]; - - }; - -} diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix index 192dec48308e..eff9c05fdce3 100644 --- a/nixos/modules/services/desktops/deepin/deepin.nix +++ b/nixos/modules/services/desktops/deepin/deepin.nix @@ -13,6 +13,10 @@ Deepin Desktop Environment. "; + services.deepin.deepin-menu.enable = lib.mkEnableOption " + DBus service for unified menus in Deepin Desktop Environment. + "; + }; @@ -51,6 +55,12 @@ group = "deepin-daemon"; isSystemUser = true; }; + + services.deepin.deepin-menu.enable = true; + }) + + (lib.mkIf config.services.deepin.deepin-menu.enable { + services.dbus.packages = [ pkgs.deepin.deepin-menu ]; }) ]; |