diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2024-05-19 18:06:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-19 18:06:23 +0200 |
commit | 28ecfe6e7b426d7b0311ce7fcb72c1bf034e6a9e (patch) | |
tree | b3e0263ae06bdb88a8cc2a97c28dc8b6b3f1ce0d /nixos/modules | |
parent | 52f4cce0043c1099d17ec2c76051f493188157e5 (diff) | |
parent | ef5142ec5bf85037a16572da3f4d59085833aad0 (diff) |
Merge pull request #312489 from Shawn8901/sddm-wayland-only
nixos/sddm: dont generate X11 node if disabled
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/display-managers/sddm.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index a6bfa213fe380..54356f7bb6171 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -66,7 +66,14 @@ let HideShells = "/run/current-system/sw/bin/nologin"; }; - X11 = optionalAttrs xcfg.enable { + Wayland = { + EnableHiDPI = cfg.enableHidpi; + SessionDir = "${dmcfg.sessionData.desktops}/share/wayland-sessions"; + CompositorCommand = lib.optionalString cfg.wayland.enable cfg.wayland.compositorCommand; + }; + + } // optionalAttrs xcfg.enable { + X11 = { MinimumVT = if xcfg.tty != null then xcfg.tty else 7; ServerPath = toString xserverWrapper; XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr"; @@ -77,12 +84,6 @@ let DisplayStopCommand = toString Xstop; EnableHiDPI = cfg.enableHidpi; }; - - Wayland = { - EnableHiDPI = cfg.enableHidpi; - SessionDir = "${dmcfg.sessionData.desktops}/share/wayland-sessions"; - CompositorCommand = lib.optionalString cfg.wayland.enable cfg.wayland.compositorCommand; - }; } // optionalAttrs dmcfg.autoLogin.enable { Autologin = { User = dmcfg.autoLogin.user; |