diff --git a/home/files/keepassxc-ini.nix b/home/files/keepassxc-ini.nix
index edb2da3..69e59d0 100644
--- a/home/files/keepassxc-ini.nix
+++ b/home/files/keepassxc-ini.nix
@@ -45,4 +45,8 @@
     LockDatabaseIdleSeconds = 120;
     Security_HideNotes = true;
   };
+
+  SSHAgent = {
+    Enabled = true;
+  };
 }
diff --git a/home/programs.nix b/home/programs.nix
index d998179..7c42cf0 100644
--- a/home/programs.nix
+++ b/home/programs.nix
@@ -40,10 +40,6 @@ in {
     inherit config pkgs;
   };
 
-  keychain = import ./programs/keychain.nix {
-    inherit config pkgs ownLib;
-  };
-
   gpg = import ./programs/gpg.nix {
     inherit config;
   };
diff --git a/home/programs/keychain.nix b/home/programs/keychain.nix
deleted file mode 100644
index 90ecb77..0000000
--- a/home/programs/keychain.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, ownLib }:
-
-{
-  enable = true;
-  keys = if ownLib.onHikari {} then ["id_ed25519"] else ["id_rsa" "id_ed25519"];
-  enableBashIntegration = false;
-  enableFishIntegration = false;
-  enableZshIntegration = true;
-  enableXsessionIntegration = false;
-}
diff --git a/home/programs/ssh-match-blocks.nix b/home/programs/ssh-match-blocks.nix
index 37e8a7b..55d9900 100644
Binary files a/home/programs/ssh-match-blocks.nix and b/home/programs/ssh-match-blocks.nix differ
diff --git a/home/programs/ssh.nix b/home/programs/ssh.nix
index e457779..d171fb1 100644
--- a/home/programs/ssh.nix
+++ b/home/programs/ssh.nix
@@ -1,10 +1,6 @@
 _:
 
-let
-  oldKey = "~/.ssh/id_rsa";
-  newKey = "~/.ssh/id_ed25519";
-
-in {
+{
   enable = true;
   matchBlocks = {
 
@@ -17,10 +13,7 @@ in {
     "github.com" = {
         user = "git";
         hostname = "github.com";
-        identityFile = "${newKey}";
     };
 
-  } // import ./ssh-match-blocks.nix {
-    inherit oldKey newKey;
-  };
+  } // import ./ssh-match-blocks.nix { };
 }