* More cleanup.

svn path=/nixos/branches/modular-nixos/; revision=15773

lib/eval-config.nix

@@ -7,7 +7,16 @@
 rec {
   configComponents = [
     configuration
-    { require = import ../modules/module-list.nix; }
+    {
+      require = import ../modules/module-list.nix;
+      environment.checkConfigurationOptions = pkgs.lib.mkOption {
+        default = true;
+        example = false;
+        description = ''
+          Whether to check the validity of the entire configuration.
+        '';
+      };
+    }
   ];
 
   config =

modules/legacy.nix

@@ -1,7 +1,5 @@
 {
   require = [
-    ../system/assertion.nix
-    ../system/nixos-environment.nix
     ../system/nixos-installer.nix
     ../upstart-jobs/cron/locate.nix
     ../upstart-jobs/ldap

modules/module-list.nix

@@ -10,6 +10,7 @@
   ./config/users-groups.nix
   ./installer/grub/grub.nix
   ./legacy.nix
+  ./misc/assertions.nix
   ./programs/bash/bash.nix
   ./programs/pwdutils/pwdutils.nix
   ./programs/ssh.nix

system/nixos-environment.nix

@@ -1,15 +0,0 @@
-{pkgs, config, ...}:
-
-with pkgs.lib;
-
-{
-  environment = {
-    checkConfigurationOptions = mkOption {
-      default = true;
-      example = false;
-      description = "
-        If all configuration options must be checked. Non-existing options fail build.
-      ";
-    };
-  };
-}