diff options
| author | Eduard Bachmakov <eduarrrd@users.noreply.github.com> | 2023-02-21 22:48:03 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-02-22 21:51:45 +0000 |
| commit | 449c6b90b739c4a285979549d3522d62273412cb (patch) | |
| tree | d3c1bcf09434d74abf46ffaa4f041900d2e691d7 | |
| parent | nixos/plasma5: remove non-existant/unused PAM service configs. (diff) | |
| download | nixpkgs-origin/backport-217578-to-release-22.11.tar.gz | |
nixos/sddm + nixos/plasma5: switch PAM service to `login`.origin/backport-217578-to-release-22.11
GDM and LightDM are already using this approach. It also allows us to
enable Kwallet integration more globally without generating stray PAM
services.
The default configuration of login service includes both options sddm
was setting explicitly.
(cherry picked from commit 45a6488f9c18c57e05c248a3cd5722be114e9952)
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 3d09f63cc6c6..aafda0357865 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -439,7 +439,7 @@ in security.pam.services.kde = { allowNullPassword = true; }; - security.pam.services.sddm.enableKwallet = true; + security.pam.services.login.enableKwallet = true; systemd.user.services = { plasma-early-setup = mkIf cfg.runUsingSystemd { diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index e86a18ff618e..884b61bed0f1 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -215,10 +215,12 @@ in }; security.pam.services = { - sddm = { - allowNullPassword = true; - startSession = true; - }; + sddm.text = '' + auth substack login + account include login + password substack login + session include login + ''; sddm-greeter.text = '' auth required pam_succeed_if.so audit quiet_success user = sddm |