diff --git a/users/jordan/common/ssh.nix b/users/jordan/common/ssh.nix
index 6862ac5..2800de8 100644
--- a/users/jordan/common/ssh.nix
+++ b/users/jordan/common/ssh.nix
@@ -5,6 +5,24 @@
 {
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
+    matchBlocks."*" = {
+      forwardAgent = false;
+      addKeysToAgent = "yes";
+      compression = false;
+      serverAliveInterval = 0;
+      serverAliveCountMax = 3;
+      hashKnownHosts = false;
+      userKnownHostsFile = "~/.ssh/known_hosts";
+      controlMaster = "no";
+      controlPath = "~/.ssh/master-%r@%n:%p";
+      controlPersist = "no";
+    };
+  };
+
+  services.ssh-agent = {
+    enable = true;
+    enableZshIntegration = true;
   };
 
   home.persistence."/state".files = [