From 77fa14725fd0c7a674f95264bc6cc585e338db6f Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Fri, 19 Apr 2019 09:47:19 -0300
Subject: nixos/deepin: move deepin-menu.nix into deepin.nix

---
 nixos/modules/module-list.nix                      |  1 -
 .../services/desktops/deepin/deepin-menu.nix       | 29 ----------------------
 nixos/modules/services/desktops/deepin/deepin.nix  | 10 ++++++++
 3 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 nixos/modules/services/desktops/deepin/deepin-menu.nix

(limited to 'nixos')

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 ];
     })
 
   ];
-- 
cgit 1.4.1