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

modules/misc/check-config.nix

@@ -1,6 +1,7 @@
 {pkgs, ...}:
 
 {
+  options = {
     environment.checkConfigurationOptions = pkgs.lib.mkOption {
       default = true;
       example = false;
@@ -8,4 +9,5 @@
         Whether to check the validity of the entire configuration.
       '';
     };
+  };
 }

modules/services/x11/desktop-managers/default.nix

@@ -11,7 +11,7 @@ let
 in
 
 {
-  require = [
+  imports = [
     ./kde.nix
     ./kde4.nix
     ./gnome.nix
@@ -19,13 +19,9 @@ in
     ./none.nix
   ];
 
-  services = {
+  options = {
-    xserver = {
+    services.xserver.desktopManager = {
-      displayManager = {
-        session = cfg.session.list;
-      };
 
-      desktopManager = {
       session = mkOption {
         default = [];
         example = [{
@@ -66,11 +62,13 @@ in
           else
             throw "Default desktop manager ($(defaultDM)) not found.";
       };
-      };
+
     };
   };
 
-  environment = mkIf cfg.session.needBGPackages {
+  config = {
-    x11Packages = [ pkgs.feh ];
+    services.xserver.displayManager.session = cfg.session.list;
+    environment.x11Packages =
+      mkIf cfg.session.needBGPackages [ pkgs.feh ];
   };
 }

modules/services/x11/window-managers/default.nix

@@ -6,7 +6,7 @@ let
 in
 
 {
-  require = [
+  imports = [
     ./compiz.nix
     ./kwm.nix
     ./metacity.nix
@@ -16,13 +16,9 @@ in
     ./xmonad.nix
   ];
 
-  services = {
+  options = {
-    xserver = {
+    services.xserver.windowManager = {
-      displayManager = {
-        session = cfg.session;
-      };
 
-      windowManager = {
       session = mkOption {
         default = [];
         example = [{
@@ -52,7 +48,11 @@ in
           else
             throw "Default window manager (${defaultWM}) not found.";
       };
+
     };
   };
+
+  config = {
+    services.xserver.displayManager.session = cfg.session;
   };
 }

modules/services/x11/window-managers/xmonad.nix

@@ -6,18 +6,18 @@ let
 in
 
 {
-  services = {
+  options = {
-    xserver = {
+    services.xserver.windowManager.xmonad = {
-
-      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 = "
@@ -26,7 +26,5 @@ in
         ";
       }];
     };
-
-    };
   };
 }