diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-10 15:10:30 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-15 04:16:20 +0100 |
commit | 8dc5ff7dcfd1c58c32004ffae25e6d31ed83d86c (patch) | |
tree | efe04b82b4f7fbc455b63b002b4b4721b50a2b05 /nixos/modules/services/x11/window-managers/default.nix | |
parent | 53ef29c1380424e4e697725c4f3df30f9acacebc (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/window-managers/default.nix')
-rw-r--r-- | nixos/modules/services/x11/window-managers/default.nix | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index c17f3830d0e9a..04a9fc46628cf 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -59,15 +59,14 @@ in }; default = mkOption { - type = types.str; - default = "none"; + type = types.nullOr types.str; + default = null; example = "wmii"; - description = "Default window manager loaded if none have been chosen."; - apply = defaultWM: - if any (w: w.name == defaultWM) cfg.session then - defaultWM - else - throw "Default window manager (${defaultWM}) not found."; + description = '' + <emphasis role="strong">Deprecated</emphasis>, please use <xref linkend="opt-services.xserver.displayManager.defaultSession"/> instead. + + Default window manager loaded if none have been chosen. + ''; }; }; |