Reduce size of iso-minimal-fresh-kernel and make it easier to install offline

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

modules/config/no-x-libs.nix

@@ -0,0 +1,24 @@
+{pkgs, config, ...}:
+
+{
+  options = {
+    environment.noXlibs = pkgs.lib.mkOption {
+      default = false;
+      example = true;
+      description = "Removing on-by-default X-dependent settings";
+    };
+  };
+  config = pkgs.lib.mkIf config.environment.noXlibs {
+    services = {
+      sshd = {
+        forwardX11 = false;
+      };
+      dbus.enable = false;
+      hal.enable = false;
+    };
+    fonts = {
+      enableCoreFonts = false;
+      enableFontConfig = false;
+    };
+  };
+}

modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix

@@ -9,11 +9,10 @@ rec {
   installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
 
   # Don't include X libraries.
-  services.sshd.forwardX11 = false;
+  environment.noXlibs = true;
-  services.dbus.enable = false; # depends on libX11
+
-  services.hal.enable = false; # depends on dbus
+  # Most users will download it anyway
-  fonts.enableFontConfig = false;
+  security.sudo.enable = true;
-  fonts.enableCoreFonts = false;
 
   # Use Linux 2.6.31-zen2 (with aufs2).
   boot.kernelPackages = pkgs.kernelPackages_2_6_31_zen2;
@@ -36,27 +35,16 @@ rec {
   boot.initrd.allowMissing = true;
 
   environment.systemPackages = with pkgs; [
-    klibc 
+    klibc dmraid cryptsetup ccrypt 
-
-    dmraid
-
-    cryptsetup ccrypt 
-
     utillinuxCurses ddrescue testdisk
-    pciutils sdparm hdparm hddtemp usbutils
+    pciutils sdparm hdparm usbutils
     btrfsProgs xfsProgs jfsUtils jfsrec
     wpa_supplicant iproute 
-    fuse ntfs3g smbfsFuse sshfsFuse
+    manpages openssh openssl ncat socat
-    manpages irssi elinks mcabber mutt openssh lftp 
+    fuse ntfs3g gnupg gnupg2
-    openssl ncat socat
-    gnupg gnupg2
     patch which diffutils gcc binutils bc file
-    screen
+    gnused gnumake ncurses gnugrep findutils ed
-    bvi joe nvi 
+    screen bvi joe nvi dar xz lsof
-    subversion16 monotone git darcs mercurial bazaar cvs
+    unrar unzip zip lzma cpio 
-    unrar unzip zip lzma cabextract cpio 
-    dar p7zip xz lrzip rzip lzop
-    lsof
-    gcc gnused gnumake ncurses gnugrep findutils ed
     ];
 }

modules/module-list.nix

@@ -2,6 +2,7 @@
   ./config/i18n.nix
   ./config/ldap.nix
   ./config/networking.nix
+  ./config/no-x-libs.nix
   ./config/nsswitch.nix
   ./config/system-path.nix
   ./config/timezone.nix