diff options
| author | K900 <me@0upti.me> | 2023-02-22 16:30:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-22 16:30:02 +0300 |
| commit | 8a678a16f88b898af457764648a6d407de6e8dfb (patch) | |
| tree | 2fcea8efb4cf194d8ef6d798a4d85a5ff3519453 /nixos | |
| parent | 6bc54154cdbf38a484dd631ff738c3e28af40817 (diff) | |
| parent | 45a6488f9c18c57e05c248a3cd5722be114e9952 (diff) | |
| download | nixpkgs-8a678a16f88b898af457764648a6d407de6e8dfb.tar nixpkgs-8a678a16f88b898af457764648a6d407de6e8dfb.tar.gz nixpkgs-8a678a16f88b898af457764648a6d407de6e8dfb.tar.bz2 nixpkgs-8a678a16f88b898af457764648a6d407de6e8dfb.tar.lz nixpkgs-8a678a16f88b898af457764648a6d407de6e8dfb.tar.xz nixpkgs-8a678a16f88b898af457764648a6d407de6e8dfb.tar.zst nixpkgs-8a678a16f88b898af457764648a6d407de6e8dfb.zip | |
Merge pull request #217578 from eduarrrd/pam
PAM service fixups for plasma5 and sddm
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/plasma5.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index ab666ba3949..73322696aea 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -379,12 +379,7 @@ in security.pam.services.kde = { allowNullPassword = true; }; - # Doing these one by one seems silly, but we currently lack a better - # construct for handling common pam configs. - security.pam.services.gdm.enableKwallet = true; - security.pam.services.kdm.enableKwallet = true; - security.pam.services.lightdm.enableKwallet = 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 a3f03d7a19a..0ddeac0f109 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 |