Author: eelco
Date: Sun Aug 8 12:39:00 2010
New Revision: 23033
URL: https://svn.nixos.org/websvn/nix/?rev=23033&sc=1
Log:
* If kdm is enabled, disabled slim automatically. This is so that
users don't have to write
services.xserver.displayManager.kdm.enable = true;
services.xserver.displayManager.slim.enable = false;
to enable kdm, but just
services.xserver.displayManager.kdm.enable = true;
Modified:
nixos/trunk/modules/services/x11/desktop-managers/default.nix
nixos/trunk/modules/services/x11/display-managers/kdm.nix
Modified: nixos/trunk/modules/services/x11/desktop-managers/default.nix
==============================================================================
--- nixos/trunk/modules/services/x11/desktop-managers/default.nix Sat Aug
7 22:57:14 2010 (r23032)
+++ nixos/trunk/modules/services/x11/desktop-managers/default.nix Sun Aug
8 12:39:00 2010 (r23033)
@@ -19,6 +19,7 @@
];
options = {
+
services.xserver.desktopManager = {
session = mkOption {
@@ -63,6 +64,7 @@
};
};
+
};
config = {
Modified: nixos/trunk/modules/services/x11/display-managers/kdm.nix
==============================================================================
--- nixos/trunk/modules/services/x11/display-managers/kdm.nix Sat Aug 7
22:57:14 2010 (r23032)
+++ nixos/trunk/modules/services/x11/display-managers/kdm.nix Sun Aug 8
12:39:00 2010 (r23033)
@@ -92,6 +92,8 @@
###### implementation
config = mkIf cfg.enable {
+
+ services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.job =
{ execCmd =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
