Unverified Commit 28ecfe6e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #312489 from Shawn8901/sddm-wayland-only 

nixos/sddm: dont generate X11 node if disabled
parents 52f4cce0 ef5142ec

nixos/modules/services/display-managers/sddm.nix

+8 −7
Original line number Diff line number Diff line
@@ -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;