about summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers/slim.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-15 17:22:30 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-15 17:24:33 +0200
commitbbe265e8c291d542f5f5a9ea0217e78b4ba6624e (patch)
tree8ab6e1080e5987c0f3ef30bc16420e1a11c08e48 /nixos/modules/services/x11/display-managers/slim.nix
parent0c0bc0857ed459a7e4b6b54fe768828fee9737cd (diff)
downloadnixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar
nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.gz
nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.bz2
nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.lz
nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.xz
nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.tar.zst
nixlib-bbe265e8c291d542f5f5a9ea0217e78b4ba6624e.zip
slim: Only enable if the X server is enabled
http://hydra.nixos.org/build/6494972

Disabling slim revealed that services.xserver.displayManager.job had
an incorrect type, so fixed that as well.
Diffstat (limited to 'nixos/modules/services/x11/display-managers/slim.nix')
-rw-r--r--nixos/modules/services/x11/display-managers/slim.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix
index 7b2c52ca3989..01c9fa96c8c8 100644
--- a/nixos/modules/services/x11/display-managers/slim.nix
+++ b/nixos/modules/services/x11/display-managers/slim.nix
@@ -45,7 +45,7 @@ in
     services.xserver.displayManager.slim = {
 
       enable = mkOption {
-        default = true;
+        default = config.services.xserver.enable;
         description = ''
           Whether to enable SLiM as the display manager.
         '';