From 622a7d3d4631b2e4d81b51b3331d4155b768947d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 8 Aug 2010 12:39:00 +0000
Subject: [PATCH] * 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;


svn path=/nixos/trunk/; revision=23033
---
 modules/services/x11/desktop-managers/default.nix | 2 ++
 modules/services/x11/display-managers/kdm.nix     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/services/x11/desktop-managers/default.nix b/modules/services/x11/desktop-managers/default.nix
index d8303d4680ae..8afe14b743db 100644
--- a/modules/services/x11/desktop-managers/default.nix
+++ b/modules/services/x11/desktop-managers/default.nix
@@ -19,6 +19,7 @@ in
   ];
 
   options = {
+  
     services.xserver.desktopManager = {
 
       session = mkOption {
@@ -63,6 +64,7 @@ in
       };
 
     };
+    
   };
 
   config = {
diff --git a/modules/services/x11/display-managers/kdm.nix b/modules/services/x11/display-managers/kdm.nix
index a88b34dc5ace..74b430e298c7 100644
--- a/modules/services/x11/display-managers/kdm.nix
+++ b/modules/services/x11/display-managers/kdm.nix
@@ -92,6 +92,8 @@ in
   ###### implementation
   
   config = mkIf cfg.enable {
+
+    services.xserver.displayManager.slim.enable = false;
   
     services.xserver.displayManager.job =
       { execCmd =