diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2018-03-17 20:34:10 +0100 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-03-28 20:34:05 +0200 |
| commit | 5caa22fe0a908ede1889d32fa773b9aef675a56e (patch) | |
| tree | c2a11f93c787dbd5f6fbecbe68742c35113a96c3 /nixos/modules/services/x11/desktop-managers | |
| parent | 6e8a13f7e5c0fb4d1791eb0f44fa013cb39a1035 (diff) | |
| download | nixlib-5caa22fe0a908ede1889d32fa773b9aef675a56e.tar nixlib-5caa22fe0a908ede1889d32fa773b9aef675a56e.tar.gz nixlib-5caa22fe0a908ede1889d32fa773b9aef675a56e.tar.bz2 nixlib-5caa22fe0a908ede1889d32fa773b9aef675a56e.tar.lz nixlib-5caa22fe0a908ede1889d32fa773b9aef675a56e.tar.xz nixlib-5caa22fe0a908ede1889d32fa773b9aef675a56e.tar.zst nixlib-5caa22fe0a908ede1889d32fa773b9aef675a56e.zip | |
Revert restrictive validation behavior for DM/WM defaults in the X module
The original idea behind this change (described in ticket #11064) was to improve the assertions to avoid that users of the X server accidentally forget to configure a DM or WM. However this caused several issues with setups that require X, but no DM or WM. The keymap testcases became instable as well as now disabling DMs needs to be done explicitly. (see https://github.com/NixOS/nixpkgs/pull/31268#issuecomment-347080036) In the end the idea behind the change and #11064 was obviously a mistake, so reverting it completely for now should be fine.
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 4622c7b760f0..f435e85f6b83 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -87,11 +87,11 @@ in default = mkOption { type = types.str; - default = "none"; - example = "plasma5"; + default = ""; + example = "none"; description = "Default desktop manager loaded if none have been chosen."; apply = defaultDM: - if defaultDM == "none" && cfg.session.list != [] then + if defaultDM == "" && cfg.session.list != [] then (head cfg.session.list).name else if any (w: w.name == defaultDM) cfg.session.list then defaultDM |