public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

services.xserver: fix apply of default DM/WM

Browse Source 
This is needed to pick the first enabled DM/WM
if the default is `none`
This commit is contained in:
Maximilian Bosch 2017-11-05 08:23:57 +01:00
parent 5b70c1855b
commit 410f0f0db2
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/default.nix
View File

@ -91,7 +91,7 @@ in
example = "plasma5"; example = "plasma5";
description = "Default desktop manager loaded if none have been chosen."; description = "Default desktop manager loaded if none have been chosen.";
apply = defaultDM: apply = defaultDM:
if defaultDM == "" && cfg.session.list != [] then if defaultDM == "none" && cfg.session.list != [] then
(head cfg.session.list).name (head cfg.session.list).name
else if any (w: w.name == defaultDM) cfg.session.list then else if any (w: w.name == defaultDM) cfg.session.list then
defaultDM defaultDM

4
nixos/modules/services/x11/window-managers/default.nix
View File

@ -61,7 +61,9 @@ in
example = "wmii"; example = "wmii";
description = "Default window manager loaded if none have been chosen."; description = "Default window manager loaded if none have been chosen.";
apply = defaultWM: apply = defaultWM:
if any (w: w.name == defaultWM) cfg.session then if defaultWM == "none" && cfg.session != [] then
(head cfg.session).name
else if any (w: w.name == defaultWM) cfg.session then
defaultWM defaultWM
else else
throw "Default window manager (${defaultWM}) not found."; throw "Default window manager (${defaultWM}) not found.";

4
nixos/modules/services/x11/xserver.nix
View File

@ -562,7 +562,9 @@ in
+ concatMapStringsSep ", " (x: x.output) primaryHeads; + concatMapStringsSep ", " (x: x.output) primaryHeads;
}) })
{ assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX; { assertion = cfg.desktopManager.default == "none" && cfg.windowManager.default == "none" -> cfg.plainX;
message = "Either the desktop manager or the window manager shouldn't be `none`! To explicitly allow this, you can also set `services.xserver.plainX` to `true`."; message = "Either the desktop manager or the window manager shouldn't be `none`! "
+ "To explicitly allow this, you can also set `services.xserver.plainX` to `true`. "
+ "The `default` value looks for enabled WMs/DMs and select the first one.";
} }
]; ];