c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nixos/xserver: Remove tty option

Browse source 
Note about sddm: The MinimumVT option has been documented as unavailable since v0.20.
This commit is contained in:
Will Fancher 2025-07-24 21:52:43 -04:00
commit 878c68dad3
6 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/display-managers/gdm.nix
View file

@ -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;

3
nixos/modules/services/display-managers/lemurs.nix
View file

@ -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 = {

3
nixos/modules/services/display-managers/ly.nix
View file

@ -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;
};
};

4
nixos/modules/services/display-managers/sddm.nix
View file

@ -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;
};
};

1
nixos/modules/services/x11/display-managers/lightdm.nix
View file

@ -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
};
}

12
nixos/modules/services/x11/xserver.nix
View file

@ -277,6 +277,11 @@ in
"dir"
];
})
(lib.mkRemovedOptionModule [
"services"
"xserver"
"tty"
] "'services.xserver.tty' was removed because it was ineffective.")
];
###### interface
@ -675,12 +680,6 @@ in
'';
};
tty = mkOption {
type = types.nullOr types.int;
default = 7;
description = "Virtual console for the X server.";
};
display = mkOption {
type = types.nullOr types.int;
default = 0;
@ -886,7 +885,6 @@ in
"${cfg.xkb.dir}"
]
++ optional (cfg.display != null) ":${toString cfg.display}"
++ optional (cfg.tty != null) "vt${toString cfg.tty}"
++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"
++ optional (cfg.logFile != null) "-logfile ${toString cfg.logFile}"
++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}"