diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 09:19:50 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-19 09:19:50 +0100 |
commit | f79e10061f4e7a8988831e9734e131492e5b311f (patch) | |
tree | 8ae45d9a41e802f5339f46cd0d05b5f7cb31ffad /nixos/modules/services/x11/window-managers/default.nix | |
parent | bf2877b9ab69caa83daf4191b13d903bc82ab337 (diff) | |
parent | 7315dc071c901b83dfcacb5536f32699b2cb610a (diff) | |
download | nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.gz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.bz2 nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.lz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.xz nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.tar.zst nixpkgs-f79e10061f4e7a8988831e9734e131492e5b311f.zip |
Merge master into staging-next
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 c17f3830d0e..04a9fc46628 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. + ''; }; }; |