diff options
| author | obadz <obadz-git@obadz.com> | 2017-02-26 16:22:21 +0000 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2017-02-26 16:22:21 +0000 |
| commit | 4b6f021251e60af9f61311e116eef043a2ed0d5d (patch) | |
| tree | 1ba3c7ca4611eae9a93cf2886a69e2104e3bf1b2 /nixos/modules | |
| parent | 6c36d9fa208ac1b03966e4349f4850b2ec4301be (diff) | |
Revert "lightdm: obbey services.xserver.{window/desktop}Manager.default"
This reverts commit 29caa185a7e4aaa0d621a4f117f3e8f653261fda.
Not clear what the proper thing to do is. cf94cdb59b renders this
question mostly moot. Reverting before 17.03 branch to avoid a repeat
of #19054.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 4afef32aaa47..82b9a2fce5ab 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -46,15 +46,13 @@ 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} ''; |