diff --git a/home/christoph/darwinix/default.nix b/home/christoph/darwinix/default.nix
index caf0a6f6..c9321f52 100644
--- a/home/christoph/darwinix/default.nix
+++ b/home/christoph/darwinix/default.nix
@@ -332,13 +332,6 @@
         enableFishIntegration = config.homemodules.fish.enable;
       };
 
-      keychain = {
-        enable = true;
-        enableFishIntegration = config.homemodules.fish.enable;
-        enableXsessionIntegration = false;
-        keys = ["id_ed25519"];
-      };
-
       navi = {
         enable = true;
         enableFishIntegration = config.homemodules.fish.enable;
@@ -351,7 +344,7 @@
         matchBlocks = {
           "*" = {
             forwardAgent = false;
-            addKeysToAgent = "no";
+            addKeysToAgent = "yes";
             compression = true;
             serverAliveInterval = 0;
             serverAliveCountMax = 3;