diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-08 12:19:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 12:19:14 +0000 |
| commit | 7261ffc18e28eeecc318db5f4e34e9a3b8cef438 (patch) | |
| tree | 06fcfe8c9570b1e56d8c1c4f3628b8675ad6db4b /nixos/modules | |
| parent | 84a51650b921fd62e0c3a2a01ac6691c4a6153d3 (diff) | |
| parent | 7658c90f216f923ebad675f90836370e31de1097 (diff) | |
| download | nixlib-7261ffc18e28eeecc318db5f4e34e9a3b8cef438.tar nixlib-7261ffc18e28eeecc318db5f4e34e9a3b8cef438.tar.gz nixlib-7261ffc18e28eeecc318db5f4e34e9a3b8cef438.tar.bz2 nixlib-7261ffc18e28eeecc318db5f4e34e9a3b8cef438.tar.lz nixlib-7261ffc18e28eeecc318db5f4e34e9a3b8cef438.tar.xz nixlib-7261ffc18e28eeecc318db5f4e34e9a3b8cef438.tar.zst nixlib-7261ffc18e28eeecc318db5f4e34e9a3b8cef438.zip | |
Merge pull request #60776 from alyssais/xerror
nixos/xserver: improve DM error message when X off
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 3ab4f26399f3..afa0cebbc527 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -189,6 +189,11 @@ in config = mkIf cfg.enable { assertions = [ + { assertion = xcfg.enable; + message = '' + LightDM requires services.xserver.enable to be true + ''; + } { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null; message = '' LightDM auto-login requires services.xserver.displayManager.lightdm.autoLogin.user to be set diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 05830e325d51..d1ed345ac579 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -195,6 +195,11 @@ in config = mkIf cfg.enable { assertions = [ + { assertion = xcfg.enable; + message = '' + SDDM requires services.xserver.enable to be true + ''; + } { assertion = cfg.autoLogin.enable -> cfg.autoLogin.user != null; message = '' SDDM auto-login requires services.xserver.displayManager.sddm.autoLogin.user to be set @@ -264,8 +269,8 @@ in }; environment.etc."sddm.conf".source = cfgFile; - environment.pathsToLink = [ - "/share/sddm" + environment.pathsToLink = [ + "/share/sddm" ]; users.groups.sddm.gid = config.ids.gids.sddm; |