diff --git a/nixcfgs/modules/nixos/configuration.nix b/nixcfgs/modules/nixos/configuration.nix
index 044460a..140cb44 100644
--- a/nixcfgs/modules/nixos/configuration.nix
+++ b/nixcfgs/modules/nixos/configuration.nix
@@ -2,8 +2,7 @@
   config,
   pkgs,
   ...
-}:
-{
+}: {
   security.pam.services.login.enableGnomeKeyring = true;
 
   # Use latest kernel.
@@ -66,7 +65,7 @@
   # programs.mtr.enable = true;
   programs.gnupg.agent = {
     enable = true;
-    enableSSHSupport = true;
+    # enableSSHSupport = true;
   };
 
   # List services that you want to enable:
diff --git a/nixcfgs/modules/nixos/gnome-keyring.nix b/nixcfgs/modules/nixos/gnome-keyring.nix
index 45e1cbd..f4c7ab6 100644
--- a/nixcfgs/modules/nixos/gnome-keyring.nix
+++ b/nixcfgs/modules/nixos/gnome-keyring.nix
@@ -1,7 +1,13 @@
 {pkgs, ...}: {
+  programs.gnupg.agent.enableSSHSupport = false;
   services.gnome.gnome-keyring.enable = true;
   services.gnome.gcr-ssh-agent.enable = true;
+  programs.seahorse.enable = true;
   programs.ssh = {
     enableAskPassword = true;
+    askPassword = "${pkgs.seahorse}/libexec/seahorse/askpass";
   };
+  environment.systemPackages = with pkgs; [
+    seahorse
+  ];
 }