diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-02-27 21:28:05 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2024-04-08 21:56:38 +0200 |
commit | 476b8c276e2ae4c98efd1d8d759029e170c5ca98 (patch) | |
tree | cc5bcb19fd25ef4cfa33e2d3feb5b950b407fa51 /nixos/modules/services/display-managers | |
parent | 5598d81e949c37d5b8668182dea1a4418f209ed9 (diff) |
treewide: rename renamed sddm/displayManager settings
Diffstat (limited to 'nixos/modules/services/display-managers')
-rw-r--r-- | nixos/modules/services/display-managers/default.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/display-managers/sddm.nix | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index 93c4e481e530..7f5db9fbb509 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -121,7 +121,7 @@ in check = d: lib.assertMsg (d != null -> (lib.types.str.check d && lib.elem d config.services.displayManager.sessionData.sessionNames)) '' Default graphical session, '${d}', not found. - Valid names for 'services.xserver.displayManager.defaultSession' are: + Valid names for 'services.displayManager.defaultSession' are: ${lib.concatStringsSep "\n " cfg.displayManager.sessionData.sessionNames} ''; }; @@ -226,7 +226,7 @@ in systemd.services.display-manager.enable = let dmConf = config.services.xserver.displayManager; noDmUsed = !(dmConf.gdm.enable - || dmConf.sddm.enable + || cfg.sddm.enable || dmConf.xpra.enable || dmConf.lightdm.enable); in lib.mkIf noDmUsed (lib.mkDefault false); diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index 750b35ba72aa..d7bd26e779d9 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -2,7 +2,7 @@ let xcfg = config.services.xserver; - dmcfg = xcfg.displayManager; + dmcfg = config.services.displayManager; cfg = config.services.displayManager.sddm; xEnv = config.systemd.services.display-manager.environment; @@ -21,12 +21,12 @@ let xserverWrapper = pkgs.writeShellScript "xserver-wrapper" '' ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} - exec systemd-cat -t xserver-wrapper ${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} "$@" + exec systemd-cat -t xserver-wrapper ${xcfg.displayManager.xserverBin} ${toString xcfg.displayManager.xserverArgs} "$@" ''; Xsetup = pkgs.writeShellScript "Xsetup" '' ${cfg.setupScript} - ${dmcfg.setupCommands} + ${xcfg.displayManager.setupCommands} ''; Xstop = pkgs.writeShellScript "Xstop" '' @@ -40,7 +40,7 @@ let Numlock = if cfg.autoNumlock then "on" else "none"; # on, off none # Implementation is done via pkgs/applications/display-managers/sddm/sddm-default-session.patch - DefaultSession = optionalString (dmcfg.defaultSession != null) "${dmcfg.defaultSession}.desktop"; + DefaultSession = optionalString (config.services.displayManager.defaultSession != null) "${config.services.displayManager.defaultSession}.desktop"; DisplayServer = if cfg.wayland.enable then "wayland" else "x11"; } // optionalAttrs (cfg.wayland.compositor == "kwin") { @@ -283,13 +283,13 @@ in { assertion = xcfg.enable || cfg.wayland.enable; message = '' - SDDM requires either services.xserver.enable or services.xserver.displayManager.sddm.wayland.enable to be true + SDDM requires either services.xserver.enable or services.displayManager.sddm.wayland.enable to be true ''; } { - assertion = dmcfg.autoLogin.enable -> autoLoginSessionName != null; + assertion = config.services.displayManager.autoLogin.enable -> autoLoginSessionName != null; message = '' - SDDM auto-login requires that services.xserver.displayManager.defaultSession is set. + SDDM auto-login requires that services.displayManager.defaultSession is set. ''; } ]; |