From e0f7dddf50d83a37f427029431c03623e46910fc Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Wed, 24 Sep 2025 11:04:43 -0500
Subject: [PATCH] home/ssh | upstream changes

---
 home/common/ssh.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/home/common/ssh.nix b/home/common/ssh.nix
index 0f79826..446afc3 100644
--- a/home/common/ssh.nix
+++ b/home/common/ssh.nix
@@ -1,28 +1,35 @@
-{ ... }: {
+{...}: {
   programs = {
     ssh = {
       enable = true;
-      compression = true;
-      addKeysToAgent = "yes";
-      serverAliveCountMax = 2;
-      serverAliveInterval = 10;
-      hashKnownHosts = true;
+      enableDefaultConfig = false;
       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"; };
+        "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";};
         "dreamhost" = {
           user = "duck";
           hostname = "wise.dreamhost.com";
         };
+        "*" = {user = "don";};
       };
       extraConfig = ''
         ConnectTimeout 5
+        AddKeysToAgent yes
+        Compression yes
+        ControlMaster no
+        ControlPath "~/.ssh/master-%r@%n:%p"
+        ControlPersist no
+        ForwardAgent no
+        HashKnownHosts yes
+        ServerAliveCountMax 2
+        ServerAliveInterval 10
+        UserKnownHostsFile "~/.ssh/known_hosts"
       '';
     };
   };