Extract graphical and minimal profiles from the installation CDs.

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

modules/installer/cd-dvd/installation-cd-graphical.nix

@@ -4,15 +4,8 @@
 {config, pkgs, ...}:
 
 {
-  require = [./installation-cd-base.nix];
-
-  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-graphical.nix";
-
-  services.xserver = {
-    enable = true;
-    autorun = false;
-    defaultDepth = 16;
-    desktopManager.default = "kde4";
-    desktopManager.kde4.enable = true;
-  };
+  require = [
+    ./installation-cd-base.nix
+    ../../profiles/graphical.nix
+  ];
 }

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

@@ -4,14 +4,8 @@
 {config, pkgs, ...}:
 
 {
-  require = [./installation-cd-base.nix];
-
-  installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
-
-  # Don't include X libraries.
-  services.openssh.forwardX11 = false;
-  services.dbus.enable = false; # depends on libX11
-  services.hal.enable = false; # depends on dbus
-  fonts.enableFontConfig = false;
-  fonts.enableCoreFonts = false;
+  require = [
+    ./installation-cd-base.nix
+    ../../profiles/minimal.nix
+  ];
 }

modules/profiles/graphical.nix

@@ -0,0 +1,17 @@
+# This module defines a NixOS configuration that contains X11 and
+# KDE 4.
+{config, pkgs, ...}:
+
+{
+  require = [
+    ./base.nix
+  ];
+
+  services.xserver = {
+    enable = true;
+    autorun = true;
+    defaultDepth = 24;
+    desktopManager.default = "kde4";
+    desktopManager.kde4.enable = true;
+  };
+}

modules/profiles/installation-device.nix

@@ -130,6 +130,10 @@ in
        ''}
       '';
 
+    # Force the xserver autorun to false.
+    services.xserver.autorun = mkForce false;
+    services.xserver.defaultDepth = mkForce 16;
+
     # Some more help text.
     services.mingetty.helpLine =
       ''

modules/profiles/minimal.nix

@@ -0,0 +1,15 @@
+# This module defines a small NixOS configuration.  It does not
+# contain any graphical stuff.
+
+{config, pkgs, ...}:
+
+{
+  require = [ ./base.nix ];
+
+  # Don't include X libraries.
+  services.openssh.forwardX11 = false;
+  services.dbus.enable = false; # depends on libX11
+  services.hal.enable = false; # depends on dbus
+  fonts.enableFontConfig = false;
+  fonts.enableCoreFonts = false;
+}