diff --git a/modules/config/no-x-libs.nix b/modules/config/no-x-libs.nix
new file mode 100644
index 00000000000..3194eb9b324
--- /dev/null
+++ b/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;
+    };
+  };
+}
diff --git a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix b/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
index 152d1724b1e..30aa7e1c351 100644
--- a/modules/installer/cd-dvd/installation-cd-minimal-fresh-kernel.nix
+++ b/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;
-  services.dbus.enable = false; # depends on libX11
-  services.hal.enable = false; # depends on dbus
-  fonts.enableFontConfig = false;
-  fonts.enableCoreFonts = false;
+  environment.noXlibs = true;
+
+  # Most users will download it anyway
+  security.sudo.enable = true;
 
   # 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 
-
-    dmraid
-
-    cryptsetup ccrypt 
-
+    klibc 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 irssi elinks mcabber mutt openssh lftp 
-    openssl ncat socat
-    gnupg gnupg2
+    manpages openssh openssl ncat socat
+    fuse ntfs3g gnupg gnupg2
     patch which diffutils gcc binutils bc file
-    screen
-    bvi joe nvi 
-    subversion16 monotone git darcs mercurial bazaar cvs
-    unrar unzip zip lzma cabextract cpio 
-    dar p7zip xz lrzip rzip lzop
-    lsof
-    gcc gnused gnumake ncurses gnugrep findutils ed
+    gnused gnumake ncurses gnugrep findutils ed
+    screen bvi joe nvi dar xz lsof
+    unrar unzip zip lzma cpio 
     ];
 }
diff --git a/modules/module-list.nix b/modules/module-list.nix
index ca6bd0b3515..40c7e1c2f88 100644
--- a/modules/module-list.nix
+++ b/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