From 8eefa99ca89ec480639ae8c022c6445e6d388fd5 Mon Sep 17 00:00:00 2001
From: Alexander Heldt <me@alexanderheldt.se>
Date: Fri, 24 Jul 2026 14:47:42 +0200
Subject: [PATCH] tadpole: Use `programs.ssh.settings`

---
 hosts/tadpole/modules/ssh/default.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/hosts/tadpole/modules/ssh/default.nix b/hosts/tadpole/modules/ssh/default.nix
index dbaba29..59bdeda 100644
--- a/hosts/tadpole/modules/ssh/default.nix
+++ b/hosts/tadpole/modules/ssh/default.nix
@@ -21,24 +21,25 @@ in
     home-manager.users.alex = {
       programs.ssh = {
         enable = true;
+        enableDefaultConfig = false;
 
-        matchBlocks = {
+        settings = {
           "git.ppp.pm" = {
-            hostname = "git.ppp.pm";
-            identityFile = "/home/alex/.ssh/alex.tadpole-git.ppp.pm";
+            HostName = "git.ppp.pm";
+            IdentityFile = "/home/alex/.ssh/alex.tadpole-git.ppp.pm";
           };
 
           "*" = {
-            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";
+            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";
           };
         };
       };