summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers/lightdm.nix
diff options
context:
space:
mode:
authorobadz <obadz-git@obadz.com>2016-09-16 14:14:44 +0100
committerobadz <obadz-git@obadz.com>2016-09-16 15:03:45 +0100
commit29caa185a7e4aaa0d621a4f117f3e8f653261fda (patch)
tree3800fc799dd1f1c322856022f3574fa91f115f1b /nixos/modules/services/x11/display-managers/lightdm.nix
parenta20c2ce4b8eeb20376d4b88d7a3da68f82ff3212 (diff)
downloadnixpkgs-29caa185a7e4aaa0d621a4f117f3e8f653261fda.tar
nixpkgs-29caa185a7e4aaa0d621a4f117f3e8f653261fda.tar.gz
nixpkgs-29caa185a7e4aaa0d621a4f117f3e8f653261fda.tar.bz2
nixpkgs-29caa185a7e4aaa0d621a4f117f3e8f653261fda.tar.lz
nixpkgs-29caa185a7e4aaa0d621a4f117f3e8f653261fda.tar.xz
nixpkgs-29caa185a7e4aaa0d621a4f117f3e8f653261fda.tar.zst
nixpkgs-29caa185a7e4aaa0d621a4f117f3e8f653261fda.zip
lightdm: obbey services.xserver.{window/desktop}Manager.default
Diffstat (limited to 'nixos/modules/services/x11/display-managers/lightdm.nix')
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 47786f0a432..33cd51f37c6 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -46,13 +46,15 @@ let
       [Seat:*]
       xserver-command = ${xserverWrapper}
       session-wrapper = ${dmcfg.session.script}
+      ${optionalString (elem defaultSessionName dmcfg.session.names) ''
+        user-session = ${defaultSessionName}
+      ''}
       ${optionalString cfg.greeter.enable ''
         greeter-session = ${cfg.greeter.name}
       ''}
       ${optionalString cfg.autoLogin.enable ''
         autologin-user = ${cfg.autoLogin.user}
         autologin-user-timeout = ${toString cfg.autoLogin.timeout}
-        autologin-session = ${defaultSessionName}
       ''}
       ${cfg.extraSeatDefaults}
     '';