* Move the definition of the set of system packages to

  modules/config/system-path.nix.  system/system.nix is now almost
  empty.
* Removed the cleanStart option - it should be possible to get the
  same functionality by overriding config.system.path (or defining
  config.system.systemPackages with a higher priority - don't know if
  that works though).

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

default.nix

@@ -19,7 +19,6 @@ in
     grubMenuBuilder
     kernel
     modulesTree
-    nix
     system
     systemPath
     config
@@ -40,7 +39,9 @@ in
     modulesClosure
     ;
 
-  nixFallback = system.nix;
+  nix = system.config.environment.nix;
+
+  nixFallback = (import nixpkgs {}).nixUnstable;
 
   manifests = system.config.installer.manifests; # exported here because nixos-rebuild uses it
 

modules/config/system-path.nix

@@ -0,0 +1,150 @@
+# This module defines the packages that appear in
+# /var/run/current-system/sw.
+
+{pkgs, config, ...}:
+
+with pkgs.lib;
+
+let
+
+  # NixOS installation/updating tools.
+  nixosTools = import ../../installer {
+    inherit pkgs config;
+  };
+
+
+  systemPackages =
+    [ config.system.sbin.modprobe # must take precedence over module_init_tools
+      config.system.sbin.mount # must take precedence over util-linux
+      config.environment.nix
+      nixosTools.nixosInstall
+      nixosTools.nixosRebuild
+      nixosTools.nixosCheckout
+      nixosTools.nixosHardwareScan
+      nixosTools.nixosGenSeccureKeys
+      pkgs.acl
+      pkgs.attr
+      pkgs.bashInteractive # bash with ncurses support
+      pkgs.bzip2
+      pkgs.coreutils
+      pkgs.cpio
+      pkgs.curl
+      pkgs.e2fsprogs
+      pkgs.findutils
+      pkgs.glibc # for ldd, getent
+      pkgs.glibcLocales
+      pkgs.gnugrep
+      pkgs.gnused
+      pkgs.gnutar
+      pkgs.grub
+      pkgs.gzip
+      pkgs.iputils
+      pkgs.less
+      pkgs.libcap
+      pkgs.lvm2
+      pkgs.man
+      pkgs.mdadm
+      pkgs.module_init_tools
+      pkgs.nano
+      pkgs.ncurses
+      pkgs.netcat
+      pkgs.nettools
+      pkgs.ntp
+      pkgs.openssh
+      pkgs.pciutils
+      pkgs.perl
+      pkgs.procps
+      pkgs.pwdutils
+      pkgs.reiserfsprogs
+      pkgs.rsync
+      pkgs.seccure
+      pkgs.strace
+      pkgs.su
+      pkgs.sysklogd
+      pkgs.sysvtools
+      pkgs.time
+      pkgs.udev
+      pkgs.upstart
+      pkgs.usbutils
+      pkgs.utillinux
+      pkgs.wirelesstools
+      (import ../../helpers/info-wrapper.nix {inherit (pkgs) bash texinfo writeScriptBin;})
+    ]
+    ++ pkgs.lib.optional config.services.bitlbee.enable pkgs.bitlbee
+    ++ pkgs.lib.optional config.networking.defaultMailServer.directDelivery pkgs.ssmtp 
+    ++ config.environment.extraPackages
+    ++ pkgs.lib.optional config.fonts.enableFontDir config.system.build.x11Fonts
+
+    # NSS modules need to be in `systemPath' so that (i) the builder
+    # chroot gets to seem them, and (ii) applications can benefit from
+    # changes in the list of NSS modules at run-time, without requiring
+    # a reboot.
+    ++ config.system.nssModules.list;
+
+
+  options = {
+
+    environment = {
+
+      systemPackages = mkOption {
+        default = systemPackages;
+        description = ''
+          The set of packages that appear in
+          /var/run/current-system/sw.  These packages are
+          automatically available to all users, and are
+          automatically updated every time you rebuild the system
+          configuration.  (The latter is the main difference with
+          installing them in the default profile,
+          <filename>/nix/var/nix/profiles/default</filename>.
+        '';
+      };
+
+      # !!! Obsolete.
+      extraPackages = mkOption {
+        default = [];
+        example = [pkgs.firefox pkgs.thunderbird];
+        description = ''
+          This option allows you to add additional packages to the system
+          path.
+        '';
+      };
+
+      pathsToLink = mkOption {
+        default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
+        example = ["/"];
+        description = "
+          Lists directories to be symlinked in `/var/run/current-system/sw'.
+        ";
+      };
+
+    };
+
+    system = {
+
+      path = mkOption {
+        default = config.environment.systemPackages;
+        description = ''
+          The packages you want in the boot environment.
+        '';
+        apply = list: pkgs.buildEnv {
+          name = "system-path";
+          paths = list;
+
+          # Note: We need `/lib' to be among `pathsToLink' for NSS modules
+          # to work.
+          inherit (config.environment) pathsToLink;
+
+          ignoreCollisions = true;
+        };
+      };
+
+    };
+
+  };
+
+
+in
+
+{
+  require = [options];
+}

modules/services/audio/pulseaudio.nix

@@ -45,11 +45,7 @@ mkIf config.services.pulseaudio.enable {
   ];
 
   environment = {
-
-    extraPackages =
-      pkgs.lib.optional
-        (!config.environment.cleanStart)
-        pkgs.pulseaudio;
+    extraPackages = [pkgs.pulseaudio];
   };
 
   users = {

modules/services/misc/nix-daemon.nix

@@ -1,11 +1,25 @@
 {pkgs, config, ...}:
 
+with pkgs.lib;
+
 ###### interface
 let
-  inherit (pkgs.lib) mkOption mkIf;
 
   options = {
 
+    environment = {
+
+      nix = mkOption {
+        default = pkgs.nixUnstable;
+        example = pkgs.nixCustomFun /root/nix.tar.gz;
+        merge = mergeOneOption;
+        description = "
+          This option specifies the Nix package instance to use throughout the system.
+        ";
+      };
+
+    };
+
     nix = {
 
       maxJobs = mkOption {

modules/services/scheduling/cron.nix

@@ -58,7 +58,6 @@ in
     # ? # config.time.timeZone
     # ? # config.environment.etc
     # ? # config.environment.extraPackages
-    # ? # config.environment.cleanStart
     options
   ];
 
@@ -71,10 +70,7 @@ in
       }
     ];
 
-    extraPackages =
-      pkgs.lib.optional
-        (!config.environment.cleanStart)
-        pkgs.cron;
+    extraPackages = [pkgs.cron];
   };
 
   services = {

modules/services/scheduling/fcron.nix

@@ -107,10 +107,7 @@ in
       }
     ];
 
-    extraPackages = ifEnabled (
-      pkgs.lib.optional
-        (!config.environment.cleanStart)
-        pkgs.fcron);
+    extraPackages = ifEnabled [pkgs.fcron];
   };
 
   services = {

system/nixos-environment.nix

@@ -1,8 +1,6 @@
 {pkgs, config, ...}:
 
-let
-  inherit (pkgs.lib) mergeOneOption mkOption;
-in
+with pkgs.lib;
 
 {
   environment = {
@@ -13,51 +11,5 @@ in
         If all configuration options must be checked. Non-existing options fail build.
       ";
     };
-
-    nix = mkOption {
-      default = pkgs.nixUnstable;
-      example = pkgs.nixCustomFun /root/nix.tar.gz;
-      merge = mergeOneOption;
-      description = "
-        Use non-default Nix easily. Be careful, though, not to break everything.
-      ";
-    };
-
-    extraPackages = mkOption {
-      default = [];
-      example = [pkgs.firefox pkgs.thunderbird];
-      description = "
-        This option allows you to add additional packages to the system
-        path.  These packages are automatically available to all users,
-        and they are automatically updated every time you rebuild the
-        system configuration.  (The latter is the main difference with
-        installing them in the default profile,
-        <filename>/nix/var/nix/profiles/default</filename>.  The value
-        of this option must be a function that returns a list of
-        packages.  The function will be called with the Nix Packages
-        collection as its argument for convenience.
-      ";
-    };
-
-
-    pathsToLink = mkOption {
-      default = ["/bin" "/sbin" "/lib" "/share/man" "/share/info" "/man" "/info"];
-      example = ["/"];
-      description = "
-        Lists directories to be symlinked in `/var/run/current-system/sw'.
-      ";
-    };
-
-    cleanStart = mkOption {
-      default = false;
-      example = true;
-      description = "
-        There are some times when you want really small system for specific 
-        purpose and do not want default package list. Setting 
-        <varname>cleanStart</varname> to <literal>true</literal> allows you 
-        to create a system with empty path - only extraPackages will be 
-        included.
-      ";
-    };
   };
 }

system/options.nix

@@ -157,9 +157,10 @@ in
           inherit (pkgs) module_init_tools;
           inherit (config.system) modulesTree;
         };
-        description = "
-          Path to the modprobe binary used by the system.
-        ";
+        description = ''
+          Wrapper around modprobe that sets the path to the modules
+          tree.
+        '';
       };
 
       # !!! The mount option should not stay in /system/option.nix
@@ -178,8 +179,9 @@ in
           } + "/sbin";
         };
         description = "
-          Install a special version of mount to search mount tools in
-          unusual path.
+          A patched `mount' command that looks in a directory in the Nix
+          store instead of in /sbin for mount helpers (like mount.ntfs-3g or
+          mount.cifs).
         ";
       };
     };
@@ -447,6 +449,7 @@ in
     ../modules/system/upstart-events/ctrl-alt-delete.nix
     ../modules/system/upstart-events/halt.nix
     ../modules/system/upstart-events/maintenance-shell.nix
+    ../modules/config/system-path.nix
     ../system/assertion.nix
     ../system/nixos-environment.nix
     ../system/nixos-installer.nix

system/system-options.nix

@@ -34,31 +34,6 @@ let
           builtins.head list;
       };
 
-      overridePath = mkOption {
-        default = [];
-        description = ''
-          You should not redefine this option unless you have trouble with a
-          package define in <varname>path</varname>.
-        '';
-      };
-
-      path = mkOption {
-        default = [];
-        description = ''
-          The packages you want in the boot environment.
-        '';
-        apply = list: pkgs.buildEnv {
-          name = "system-path";
-          paths = config.system.overridePath ++ list;
-
-          # Note: We need `/lib' to be among `pathsToLink' for NSS modules
-          # to work.
-          inherit (config.environment) pathsToLink;
-
-          ignoreCollisions = true;
-        };
-      };
-
     };
   };
 in