From 81a1b9714f23bd6a37073cd686f44f08ddd64660 Mon Sep 17 00:00:00 2001
From: Alexander Heldt <me@alexanderheldt.se>
Date: Fri, 24 Jul 2026 14:41:32 +0200
Subject: [PATCH] pinwheel: Use `programs.ssh.settings`

---
 hosts/pinwheel/modules/ssh/default.nix | 54 +++++++++++++-------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/hosts/pinwheel/modules/ssh/default.nix b/hosts/pinwheel/modules/ssh/default.nix
index e0c12bf..1f75335 100644
--- a/hosts/pinwheel/modules/ssh/default.nix
+++ b/hosts/pinwheel/modules/ssh/default.nix
@@ -36,49 +36,49 @@
       enable = true;
       enableDefaultConfig = false;
 
-      matchBlocks = {
+      settings = {
         "manatee" = {
-          hostname = "manatee";
-          user = "alex";
-          identityFile = "/home/alex/.ssh/alex.pinwheel-manatee";
-          port = 1122;
+          HostName = "manatee";
+          User = "alex";
+          IdentityFile = "/home/alex/.ssh/alex.pinwheel-manatee";
+          Port = 1122;
         };
 
         "backwards" = {
-          hostname = "backwards";
-          user = "alex";
-          identityFile = "/home/alex/.ssh/alex.pinwheel-backwards";
-          port = 1122;
+          HostName = "backwards";
+          User = "alex";
+          IdentityFile = "/home/alex/.ssh/alex.pinwheel-backwards";
+          Port = 1122;
         };
 
         "tadpole" = {
-          hostname = "65.21.106.222";
-          user = "alex";
-          identityFile = "/home/alex/.ssh/alex.pinwheel-tadpole";
-          port = 1122;
+          HostName = "65.21.106.222";
+          User = "alex";
+          IdentityFile = "/home/alex/.ssh/alex.pinwheel-tadpole";
+          Port = 1122;
         };
 
         "github.com" = {
-          hostname = "github.com";
-          identityFile = "/home/alex/.ssh/alex.pinwheel-github.com";
+          HostName = "github.com";
+          IdentityFile = "/home/alex/.ssh/alex.pinwheel-github.com";
         };
 
         "git.ppp.pm" = {
-          hostname = "git.ppp.pm";
-          identityFile = "/home/alex/.ssh/alex.pinwheel-git.ppp.pm";
+          HostName = "git.ppp.pm";
+          IdentityFile = "/home/alex/.ssh/alex.pinwheel-git.ppp.pm";
         };
 
         "*" = {
-          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";
+          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";
         };
       };
     };