diff --git a/home/common/ssh.nix b/home/common/ssh.nix
index ec6e235..0f79826 100644
--- a/home/common/ssh.nix
+++ b/home/common/ssh.nix
@@ -3,12 +3,16 @@
     ssh = {
       enable = true;
       compression = true;
+      addKeysToAgent = "yes";
+      serverAliveCountMax = 2;
+      serverAliveInterval = 10;
       hashKnownHosts = true;
       matchBlocks = {
         "git" = {
           port = 2020;
           identityFile = "/home/don/.ssh/git";
         };
+        "git.trex-halfbeak.ts.net" = { identityFile = "/home/don/.ssh/git"; };
         "github.com" = { identityFile = "/home/don/.ssh/git"; };
         "gitlab.com" = { identityFile = "/home/don/.ssh/git"; };
         "homeassistant.home.duckland.org" = { user = "root"; };
@@ -17,6 +21,9 @@
           hostname = "wise.dreamhost.com";
         };
       };
+      extraConfig = ''
+        ConnectTimeout 5
+      '';
     };
   };
 }