about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorShawn8901 <shawn8901@googlemail.com>2024-05-14 21:48:45 +0200
committerShawn8901 <shawn8901@googlemail.com>2024-05-17 19:27:32 +0200
commitef5142ec5bf85037a16572da3f4d59085833aad0 (patch)
treeb81ab857cf3bf44f2b5c631182080758377d15f4 /nixos/modules
parent5233d62dcc2f4bb3f1747eb65b3ccd3b69e6c1f9 (diff)
nixos/sddm: dont generate X11 node if disabled
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/display-managers/sddm.nix15
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;