From 614bf653dfb173b29f0ffce860e12d87381d564a Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 20 Nov 2023 23:55:55 +0100
Subject: [PATCH] can't canonicalize ifsr.de

---
 users/rouven/modules/ssh/default.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix
index ab9b21e..761ed0f 100644
--- a/users/rouven/modules/ssh/default.nix
+++ b/users/rouven/modules/ssh/default.nix
@@ -10,14 +10,15 @@ in
     controlPersist = "10m";
     extraConfig = ''
       CanonicalizeHostname yes
-      CanonicalDomains agdsn.network ifsr.de
+      CanonicalDomains agdsn.network
       PKCS11Provider /run/current-system/sw/lib/libtpm2_pkcs11.so
       IdentityFile ~/.ssh/id_ed25519
       VisualHostKey = yes
     '';
     matchBlocks = {
       # personal use
-      "github.com" = {
+      "git@github.com" = {
+        match = "Host github.com User git";
         identityFile = git;
       };
       "rfive.de" = {
@@ -29,7 +30,7 @@ in
         };
       };
       # used for nix remote building
-      falkenstein-1 = matchBlocks."rfive.de";
+      falkenstein = matchBlocks."rfive.de";
 
       "nuc" = {
         hostname = "192.168.42.2";
@@ -46,7 +47,20 @@ in
         hostname = "ifsr.de";
         user = "rouven.seifert";
       };
-      "*.ifsr.de" = {
+      "quitte" = {
+        hostname = "quitte.ifsr.de";
+        user = "root";
+      };
+      "durian" = {
+        hostname = "durian.ifsr.de";
+        user = "root";
+      };
+      "tomate" = {
+        hostname = "tomate.ifsr.de";
+        user = "root";
+      };
+      "kaki" = {
+        hostname = "kaki.ifsr.de";
         user = "root";
       };
       "git@ifsr.de" = {