about summary refs log tree commit diff
path: root/nixos/modules/services/x11/display-managers/lightdm-greeters
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-12-10 15:10:30 +0100
committerJan Tojnar <jtojnar@gmail.com>2019-12-15 04:16:20 +0100
commit8dc5ff7dcfd1c58c32004ffae25e6d31ed83d86c (patch)
treeefe04b82b4f7fbc455b63b002b4b4721b50a2b05 /nixos/modules/services/x11/display-managers/lightdm-greeters
parent53ef29c1380424e4e697725c4f3df30f9acacebc (diff)
nixos/displayManager: deprecate separate options for default wm/dm
The upstream session files display managers use have no concept of sessions being composed from
desktop manager and window manager. To be able to set upstream session files as default
session, we need a single option. Having two different ways to set default session would be confusing,
though, so we decided to deprecate the old method.

We also created separate script for each session, just like we already had a separate desktop
file for each one, and started using displayManager.sessionPackages mechanism to make the
session handling more uniform.
Diffstat (limited to 'nixos/modules/services/x11/display-managers/lightdm-greeters')
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
index fa9445af32e70..0025f9b36037d 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix
@@ -53,9 +53,8 @@ in
           Whether to enable lightdm-mini-greeter as the lightdm greeter.
 
           Note that this greeter starts only the default X session.
-          You can configure the default X session by
-          <option>services.xserver.desktopManager.default</option> and
-          <option>services.xserver.windowManager.default</option>.
+          You can configure the default X session using
+          <xref linkend="opt-services.xserver.displayManager.defaultSession"/>.
         '';
       };