public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Refactoring: graphical.nix no longer includes base.nix so that it 

just does what it says (enable a "graphical" configuration).
* Enable KDM in the graphical CD.  The "auto" display manager doesn't
  properly handle shutdowns etc.

svn path=/nixos/trunk/; revision=30331
This commit is contained in:
Eelco Dolstra 2011-11-08 16:17:37 +00:00
parent 1cfbae6ed4
commit 295dafed8a
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/installer/cd-dvd/installation-cd-graphical.nix
View File

@ -15,4 +15,7 @@
# KDE complains if power management is disabled (to be precise, if # KDE complains if power management is disabled (to be precise, if
# there is no power management backend such as upower). # there is no power management backend such as upower).
powerManagement.enable = true; powerManagement.enable = true;
# Don't start the X server by default.
services.xserver.autorun = mkForce false;
} }

3
modules/profiles/base.nix
View File

@ -1,3 +1,6 @@
# This module defines the software packages included in the "minimal"
# installation CD. It might be useful elsewhere.
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {

10
modules/profiles/graphical.nix
View File

@ -1,16 +1,12 @@
# This module defines a NixOS configuration that contains X11 and # This module defines a NixOS configuration that contains X11 and
# KDE 4. # KDE 4. It's used by the graphical installation CD.
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
require = [ ./base.nix ];
services.xserver = { services.xserver = {
enable = true; enable = true;
autorun = true; displayManager.kdm.enable = true;
defaultDepth = 24;
displayManager.auto.enable = true;
desktopManager.default = "kde4";
desktopManager.kde4.enable = true; desktopManager.kde4.enable = true;
}; };
} }

4
modules/profiles/installation-device.nix
View File

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