diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-03-30 08:14:35 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-03-30 08:14:35 +0200 |
| commit | 9d2ff985718b9c04e51fefb1867f82fa0246db0f (patch) | |
| tree | 3d2aeafe69428756af5a18d8bba8d2b41f5af142 /nixos/modules/services/x11/xserver.nix | |
| parent | 01fb1af4f507a2249668d664575717d84b6c1d89 (diff) | |
| parent | a7af5d4f88f9e30bc9b401a84b7cb3cf036fccbb (diff) | |
| download | nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.gz nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.bz2 nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.lz nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.xz nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.tar.zst nixpkgs-9d2ff985718b9c04e51fefb1867f82fa0246db0f.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'nixos/modules/services/x11/xserver.nix')
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index a89d446187e..5f0a0f27845 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -161,15 +161,6 @@ in ''; }; - plainX = mkOption { - type = types.bool; - default = false; - description = '' - Whether the X11 session can be plain (without DM/WM) and - the Xsession script will be used as fallback or not. - ''; - }; - autorun = mkOption { type = types.bool; default = true; @@ -561,11 +552,6 @@ in + "${toString (length primaryHeads)} heads set to primary: " + 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`. " - + "The `default` value looks for enabled WMs/DMs and select the first one."; - } ]; environment.etc = |