diff --git a/flake.nix b/flake.nix
index 574e108..28e4c4c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -255,6 +255,7 @@
                   vim
                   gpg
                   ssh
+                  keychain
 
                   # Terminal
                   starship
diff --git a/users/profiles/gpg.nix b/users/profiles/gpg.nix
index 3242c4b..ac95666 100644
--- a/users/profiles/gpg.nix
+++ b/users/profiles/gpg.nix
@@ -6,7 +6,6 @@
 
   services.gpg-agent = {
     enable = true;
-    enableSshSupport = true;
     pinentryFlavor = (if main.services.xserver.enable then "qt" else "curses");
     extraConfig = ''
       allow-emacs-pinentry
diff --git a/users/profiles/keychain.nix b/users/profiles/keychain.nix
new file mode 100644
index 0000000..05d10ca
--- /dev/null
+++ b/users/profiles/keychain.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+{
+  programs.keychain = {
+    enable = true;
+    extraFlags = [ "--quiet" "--dir ${config.xdg.configHome}/keychain" ];
+
+    keys = [ "id_ed25519" ];
+  };
+}