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/window-managers/default.nix | |
| parent | 6e8a13f7e5c0fb4d1791eb0f44fa013cb39a1035 (diff) | |
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/window-managers/default.nix')
| -rw-r--r-- | nixos/modules/services/x11/window-managers/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index bc420831ad83b..e617e55a7a57a 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -62,9 +62,7 @@ in example = "wmii"; description = "Default window manager loaded if none have been chosen."; apply = defaultWM: - if defaultWM == "none" && cfg.session != [] then - (head cfg.session).name - else if any (w: w.name == defaultWM) cfg.session then + if any (w: w.name == defaultWM) cfg.session then defaultWM else throw "Default window manager (${defaultWM}) not found."; |