Commit 878c68da authored by Will Fancher's avatar Will Fancher
Browse files

nixos/xserver: Remove tty option 

Note about sddm: The MinimumVT option has been documented as unavailable since v0.20.
parent 570ae842

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

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ in 
    users.groups.gdm.gid = config.ids.gids.gdm;



    # GDM needs different xserverArgs, presumable because using wayland by default.

    services.xserver.tty = null;

    services.xserver.display = null;

    services.xserver.verbose = null;

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

+1 −2
Original line number Diff line number Diff line
@@ -70,8 +70,7 @@ in 
      # Required for wayland with setLoginUid = false;

      seatd.enable = true;

      xserver = {

        # To enable user switching, allow lemurs to allocate TTYs/displays dynamically.

        tty = null;

        # To enable user switching, allow lemurs to allocate displays dynamically.

        display = null;

      };

      displayManager = {

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

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ in 
      };



      xserver = {

        # To enable user switching, allow ly to allocate TTYs/displays dynamically.

        tty = null;

        # To enable user switching, allow ly to allocate displays dynamically.

        display = null;

      };

    };

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

+1 −3
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ let 
  }

  // optionalAttrs xcfg.enable {

    X11 = {

      MinimumVT = if xcfg.tty != null then xcfg.tty else 7;

      ServerPath = toString xserverWrapper;

      XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr";

      SessionCommand = toString dmcfg.sessionData.wrapper;
@@ -419,8 +418,7 @@ in 
    services = {

      dbus.packages = [ sddm ];

      xserver = {

        # To enable user switching, allow sddm to allocate TTYs/displays dynamically.

        tty = null;

        # To enable user switching, allow sddm to allocate displays dynamically.

        display = null;

      };

    };

nixos/modules/services/x11/display-managers/lightdm.nix

+0 −1
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ in 
    ];



    users.groups.lightdm.gid = config.ids.gids.lightdm;

    services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves..

    services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there

  };

}