colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/sddm: move option from services.xserver.displayManager.sddm to services.displayManager.sddm

Browse Source 
Because it is not just X anymore
This commit is contained in:
Sandro Jäckel 2024-02-27 09:57:54 +01:00
parent 6be2bfcc32
commit 0d3ab0d4ec
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/module-list.nix
View File

@ -510,6 +510,7 @@
./services/development/zammad.nix ./services/development/zammad.nix
./services/display-managers/default.nix ./services/display-managers/default.nix
./services/display-managers/greetd.nix ./services/display-managers/greetd.nix
./services/display-managers/sddm.nix
./services/editors/emacs.nix ./services/editors/emacs.nix
./services/editors/haste.nix ./services/editors/haste.nix
./services/editors/infinoted.nix ./services/editors/infinoted.nix
@ -1445,7 +1446,6 @@
./services/x11/display-managers/default.nix ./services/x11/display-managers/default.nix
./services/x11/display-managers/gdm.nix ./services/x11/display-managers/gdm.nix
./services/x11/display-managers/lightdm.nix ./services/x11/display-managers/lightdm.nix
./services/x11/display-managers/sddm.nix
./services/x11/display-managers/slim.nix ./services/x11/display-managers/slim.nix
./services/x11/display-managers/startx.nix ./services/x11/display-managers/startx.nix
./services/x11/display-managers/sx.nix ./services/x11/display-managers/sx.nix

23
nixos/modules/services/x11/display-managers/sddm.nix → nixos/modules/services/display-managers/sddm.nix
View File

@ -3,7 +3,7 @@
let let
xcfg = config.services.xserver; xcfg = config.services.xserver;
dmcfg = xcfg.displayManager; dmcfg = xcfg.displayManager;
cfg = dmcfg.sddm; cfg = config.services.displayManager.sddm;
xEnv = config.systemd.services.display-manager.environment; xEnv = config.systemd.services.display-manager.environment;
sddm = cfg.package.override (old: { sddm = cfg.package.override (old: {
@ -128,6 +128,19 @@ let
in in
{ {
imports = [ imports = [
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoLogin" "minimumUid" ] [ "services" "displayManager" "sddm" "autoLogin" "minimumUid" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoLogin" "relogin" ] [ "services" "displayManager" "sddm" "autoLogin" "relogin" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "autoNumlock" ] [ "services" "displayManager" "sddm" "autoNumlock" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "enable" ] [ "services" "displayManager" "sddm" "enable" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "enableHidpi" ] [ "services" "displayManager" "sddm" "enableHidpi" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "extraPackages" ] [ "services" "displayManager" "sddm" "extraPackages" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "package" ] [ "services" "displayManager" "sddm" "package" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "settings" ] [ "services" "displayManager" "sddm" "settings" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "setupScript" ] [ "services" "displayManager" "sddm" "setupScript" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "stopScript" ] [ "services" "displayManager" "sddm" "stopScript" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "theme" ] [ "services" "displayManager" "sddm" "theme" ])
(mkRenamedOptionModule [ "services" "xserver" "displayManager" "sddm" "wayland" "enable" ] [ "services" "displayManager" "sddm" "wayland" "enable" ])
(mkRemovedOptionModule (mkRemovedOptionModule
[ "services" "displayManager" "sddm" "themes" ] [ "services" "displayManager" "sddm" "themes" ]
"Set the option `services.displayManager.sddm.package' instead.") "Set the option `services.displayManager.sddm.package' instead.")
@ -144,7 +157,7 @@ in
options = { options = {
services.xserver.displayManager.sddm = { services.displayManager.sddm = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -281,7 +294,10 @@ in
} }
]; ];
services.displayManager.execCmd = "exec /run/current-system/sw/bin/sddm"; services.displayManager = {
enable = true;
execCmd = "exec /run/current-system/sw/bin/sddm";
};
security.pam.services = { security.pam.services = {
sddm.text = '' sddm.text = ''
@ -340,7 +356,6 @@ in
services = { services = {
dbus.packages = [ sddm ]; dbus.packages = [ sddm ];
xserver = { xserver = {
displayManager.job.execCmd = "exec /run/current-system/sw/bin/sddm";
# To enable user switching, allow sddm to allocate TTYs/displays dynamically. # To enable user switching, allow sddm to allocate TTYs/displays dynamically.
tty = null; tty = null;
display = null; display = null;