diff --git a/home/common-linux.nix b/home/common-linux.nix
index dfb49e7..2e19faf 100644
--- a/home/common-linux.nix
+++ b/home/common-linux.nix
@@ -8,8 +8,7 @@ with lib; {
       components = [ "pkcs11" "secrets" "ssh" ];
     };
     services.gpg-agent.enable = true;
-    services.gpg-agent.enableSshSupport = true;
-    services.gpg-agent.pinentryFlavor = "gtk2";
+    services.gpg-agent.pinentryFlavor = "gnome3";
   });
 }
 
diff --git a/home/fish/fish.nix b/home/fish/fish.nix
index 37a5f57..258f117 100644
--- a/home/fish/fish.nix
+++ b/home/fish/fish.nix
@@ -30,6 +30,11 @@
       if test -e /opt/homebrew/bin/brew
         /opt/homebrew/bin/brew shellenv | source
       end
+
+      # Gnome-keyring startup
+      if type -q gnome-keyring-daemon
+        set -x (gnome-keyring-daemon --start | string split "=")
+      end
     '';
 
     interactiveShellInit = ''