Convert module which are declaring options into modules separated with an

"options" set to declare options and a "config" set to define options.

svn path=/nixos/trunk/; revision=17148

1 files changed, 17 insertions, 19 deletions

diff --git a/modules/services/x11/window-managers/xmonad.nix b/modules/services/x11/window-managers/xmonad.nix
index 3d2df59655a..2cbb5002d6c 100644
--- a/modules/services/x11/window-managers/xmonad.nix
+++ b/modules/services/x11/window-managers/xmonad.nix
@@ -6,27 +6,25 @@ let
 in
 
 {
-  services = {
-    xserver = {
-
-      windowManager = {
-        xmonad = {
-          enable = mkOption {
-            default = false;
-            example = true;
-            description = "Enable the xmonad window manager.";
-          };
-        };
-
-        session = mkIf cfg.enable [{
-          name = "xmonad";
-          start = "
-            ${pkgs.haskellPackages.xmonad}/bin/xmonad &
-            waitPID=$!
-          ";
-        }];
+  options = {
+    services.xserver.windowManager.xmonad = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the xmonad window manager.";
       };
+    };
+  };
 
+  config = {
+    services.xserver.windowManager = {
+      session = mkIf cfg.enable [{
+        name = "xmonad";
+        start = "
+          ${pkgs.haskellPackages.xmonad}/bin/xmonad &
+          waitPID=$!
+        ";
+      }];
     };
   };
 }