diff --git a/home-manager/config.kdl b/home-manager/config.kdl
index 6b7f8a1..042e886 100644
--- a/home-manager/config.kdl
+++ b/home-manager/config.kdl
@@ -251,11 +251,9 @@ environment {
     DISPLAY ":0"
     ELECTRON_OZONE_PLATFORM_HINT "auto"
     // see keyring below
-    SSH_AUTH_SOCK "/run/user/1000/keyring/ssh" 
+    // SSH_AUTH_SOCK "/run/user/1000/keyring/ssh" 
 }
 
-spawn-at-startup "sh" "-c" "gnome-keyring-daemon -s --components=pkcs11,secrets,ssh -f"
-
 // Uncomment this line to ask the clients to omit their client-side decorations if possible.
 // If the client will specifically ask for CSD, the request will be honored.
 // Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 806afca..c5fe591 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -37,7 +37,6 @@ in
   programs.niri = {
     config = builtins.readFile ./config.kdl;
   };
-  services.gnome-keyring.enable = true;
 
   services.playerctld.enable = true;
 
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 36a2936..1d31898 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -179,6 +179,9 @@ in
   };
   services.displayManager.enable = true;
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gnome pkgs.gnome-keyring ];
+  services.gnome = {
+    gcr-ssh-agent.enable = true;
+  };
   programs.waybar.enable = true;
 
   programs.coolercontrol.enable = true;