summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-11-05 12:01:15 +0000
committerGitHub <noreply@github.com>2023-11-05 12:01:15 +0000
commit2ecaf2263988aa95bceb0d871b2006582f3130b5 (patch)
treeebf87b2d6e9b89734c4a380811be02fa1c51bcb7 /nixos
parent6607a943e1333f41a6f5b603ed9c7de7f028a3a0 (diff)
parentfa6f493ef0b3f6b6cbeb6948c30a8c3732bef03c (diff)
downloadnixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar
nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.gz
nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.bz2
nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.lz
nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.xz
nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.tar.zst
nixpkgs-2ecaf2263988aa95bceb0d871b2006582f3130b5.zip
Merge master into staging-next
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/display-managers/greetd.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix
index 3a0f59f62af..89cb81f3a78 100644
--- a/nixos/modules/services/display-managers/greetd.nix
+++ b/nixos/modules/services/display-managers/greetd.nix
@@ -59,6 +59,7 @@ in
     security.pam.services.greetd = {
       allowNullPassword = true;
       startSession = true;
+      enableGnomeKeyring = mkDefault config.services.gnome.gnome-keyring.enable;
     };
 
     # This prevents nixos-rebuild from killing greetd by activating getty again