diff --git a/home/home.nix b/home/home.nix
index 17b52e2..0c121a2 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -10,6 +10,7 @@ top @ { config
     inputs.spicetify-nix.homeManagerModules.default
     ./nixvim
     ./borgmatic.nix
+    ./ssh.nix
   ];
 
   home.username = username;
@@ -212,9 +213,5 @@ top @ { config
 
   services.hyprpolkitagent.enable = true;
 
-  services.ssh-agent = {
-    enable = true;
-    enableZshIntegration = true;
-  };
   home.stateVersion = "25.11";
 }
diff --git a/home/ssh.nix b/home/ssh.nix
new file mode 100644
index 0000000..7465559
--- /dev/null
+++ b/home/ssh.nix
@@ -0,0 +1,32 @@
+{ ... }: {
+  programs.ssh = {
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+      "*" = {
+        forwardAgent = false;
+        addKeysToAgent = "no";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+      };
+      "veltko.de" = {
+        user = "weckyy702";
+        port = 47213;
+      };
+      "duke.veltnet" = {
+        user = "konstantin";
+      };
+      #TODO: beastie
+    };
+  };
+  services.ssh-agent = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+}