summary refs log tree commit diff
path: root/nixos/modules/services/x11/xserver.nix
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2017-11-05 08:23:57 +0100
committerMaximilian Bosch <maximilian@mbosch.me>2017-11-07 12:18:24 +0100
commit410f0f0db213e3d99119208e3497002caf1f9ade (patch)
tree3c5922ad9c5377204283a357ea74ab44ce1a3113 /nixos/modules/services/x11/xserver.nix
parent5b70c1855b9681cbbe3e7625350ce322a63572b3 (diff)
downloadnixlib-410f0f0db213e3d99119208e3497002caf1f9ade.tar
nixlib-410f0f0db213e3d99119208e3497002caf1f9ade.tar.gz
nixlib-410f0f0db213e3d99119208e3497002caf1f9ade.tar.bz2
nixlib-410f0f0db213e3d99119208e3497002caf1f9ade.tar.lz
nixlib-410f0f0db213e3d99119208e3497002caf1f9ade.tar.xz
nixlib-410f0f0db213e3d99119208e3497002caf1f9ade.tar.zst
nixlib-410f0f0db213e3d99119208e3497002caf1f9ade.zip
services.xserver: fix `apply` of default DM/WM
This is needed to pick the first enabled DM/WM
if the default is `none`
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
-rw-r--r--nixos/modules/services/x11/xserver.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 58dc75bcb4e6..7d544e153e9a 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -562,7 +562,9 @@ in
                 + concatMapStringsSep ", " (x: x.output) primaryHeads;
       })
       { 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.";
       }
     ];