From e3045cd378583b6e3f68dd658accf75b7d03293f Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sat, 22 Jun 2024 15:29:41 -0400
Subject: [PATCH] nixos: gnupg, kwallet, and gnomekeyring unlocking for sddm,
 lightdm, greetd, and gdm

---
 nixosModules/desktop/gnome/default.nix   | 6 +++++-
 nixosModules/desktop/greetd/default.nix  | 8 +++++---
 nixosModules/desktop/lightdm/default.nix | 7 ++++---
 nixosModules/desktop/plasma/default.nix  | 8 +++++++-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/nixosModules/desktop/gnome/default.nix b/nixosModules/desktop/gnome/default.nix
index bac6c286..fd2b685a 100644
--- a/nixosModules/desktop/gnome/default.nix
+++ b/nixosModules/desktop/gnome/default.nix
@@ -38,7 +38,11 @@ in {
       ++ [gnomeCsAdjuster];
 
     # Enable keyring support for KDE apps in GNOME.
-    security.pam.services.gdm.enableKwallet = true;
+    security.pam.services.gfm = {
+      enableGnomeKeyring = true;
+      gnupg.enable = true;
+      kwallet.enable = true;
+    };
 
     # Enable GNOME and GDM.
     services = {
diff --git a/nixosModules/desktop/greetd/default.nix b/nixosModules/desktop/greetd/default.nix
index 26e59a54..57d8ad08 100644
--- a/nixosModules/desktop/greetd/default.nix
+++ b/nixosModules/desktop/greetd/default.nix
@@ -5,10 +5,12 @@
   ...
 }: {
   config = lib.mkIf config.alyraffauf.desktop.greetd.enable {
-    security.pam.services = {
-      greetd.enableKwallet = lib.mkDefault true;
-      greetd.enableGnomeKeyring = lib.mkDefault true;
+    security.pam.services.greetd = {
+      enableGnomeKeyring = true;
+      gnupg.enable = true;
+      kwallet.enable = true;
     };
+    
     services = {
       greetd = {
         enable = true;
diff --git a/nixosModules/desktop/lightdm/default.nix b/nixosModules/desktop/lightdm/default.nix
index 9d1f9b83..39cb1471 100644
--- a/nixosModules/desktop/lightdm/default.nix
+++ b/nixosModules/desktop/lightdm/default.nix
@@ -1,13 +1,14 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  pkgs,
   ...
 }: {
   config = lib.mkIf config.alyraffauf.desktop.lightdm.enable {
     security.pam.services.lightdm = {
       enableGnomeKeyring = true;
-      enableKwallet = true;
+      gnupg.enable = true;
+      kwallet.enable = true;
     };
 
     services.xserver.displayManager.lightdm = {
diff --git a/nixosModules/desktop/plasma/default.nix b/nixosModules/desktop/plasma/default.nix
index 46ac6266..b732b419 100644
--- a/nixosModules/desktop/plasma/default.nix
+++ b/nixosModules/desktop/plasma/default.nix
@@ -28,7 +28,13 @@ in {
       ++ [plasmaCsAdjuster];
 
     programs.kdeconnect.enable = true;
-    security.pam.services.sddm.enableGnomeKeyring = true;
+
+    security.pam.services.sddm = {
+      enableGnomeKeyring = true;
+      gnupg.enable = true;
+      kwallet.enable = true;
+    };
+
     services = {
       desktopManager.plasma6.enable = true;
       displayManager.sddm = {