1 files changed, 27 insertions, 32 deletions
diff --git a/modules/services/x11/desktop-managers/gnome.nix b/modules/services/x11/desktop-managers/gnome.nix
index 3fa82bae2ba..b0212446ad3 100644
--- a/modules/services/x11/desktop-managers/gnome.nix
+++ b/modules/services/x11/desktop-managers/gnome.nix
@@ -1,47 +1,42 @@
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
+
+with pkgs.lib;
 
 let
-  inherit (pkgs.lib) mkOption mkIf;
+
   cfg = config.services.xserver.desktopManager.gnome;
   gnome = pkgs.gnome;
 
-  options = { services = { xserver = { desktopManager = {
+in
 
-    gnome = {
-      enable = mkOption {
-        default = false;
-        example = true;
-        description = "Enable a gnome terminal as a desktop manager.";
-      };
-    };
+{
 
-  }; }; }; };
-in
+  options = {
 
-mkIf cfg.enable {
-  require = options;
+    services.xserver.desktopManager.gnome.enable = mkOption {
+      default = false;
+      example = true;
+      description = "Enable a gnome terminal as a desktop manager.";
+    };
+
+  };
 
-  services = {
-    xserver = {
+  config = mkIf cfg.enable {
 
-      desktopManager = {
-        session = [{
-          name = "gnome";
-          start = ''
-            ${gnome.gnometerminal}/bin/gnome-terminal -ls &
-            waitPID=$!
-          '';
-        }];
+    services.xserver.desktopManager.session = singleton
+      { name = "gnome";
+        start = ''
+          ${gnome.gnometerminal}/bin/gnome-terminal -ls &
+          waitPID=$!
+        '';
       };
 
-    };
-  };
+    environment.systemPackages =
+      [ gnome.gnometerminal
+        gnome.GConf
+        gnome.gconfeditor
+      ];
 
-  environment = {
-    x11Packages = [
-      gnome.gnometerminal
-      gnome.GConf
-      gnome.gconfeditor
-    ];
   };
+
 }