From f99a16a65df5f19ca9f53d85272f6b19c7ce6960 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 4 May 2023 11:06:31 +0100
Subject: [PATCH] Add ssh config to nix properly

---
 nixos/home/env/config/ssh | 32 --------------------------------
 nixos/home/env/ssh.nix    | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 nixos/home/env/config/ssh

diff --git a/nixos/home/env/config/ssh b/nixos/home/env/config/ssh
deleted file mode 100644
index 2b68a1f6..00000000
--- a/nixos/home/env/config/ssh
+++ /dev/null
@@ -1,32 +0,0 @@
-# vim: ft=sshconfig
-
-Host legion xenia xenia.me.uk
-    User xenia
-    HostName xenia.me.uk
-    Port 30
-    ForwardAgent yes
-
-Host git.ccfe.ac.uk
-    user git
-
-Host heimdall
-    HostName heimdall003.jet.uk
-
-Host heimdall???
-    HostName %h.jet.uk
-
-Host batch
-    User cxsbatch
-    HostName heimdall115.jetdata.eu
-
-Host jdc
-    HostName 10.40.4.103
-
-Host freia
-    HostName freia022.hpc.l
-
-Host freia???
-    HostName %h.hpc.l
-
-Host heimdall* jdc* freia* batch
-    User elitherl
diff --git a/nixos/home/env/ssh.nix b/nixos/home/env/ssh.nix
index cf08de8a..49dc6e08 100644
--- a/nixos/home/env/ssh.nix
+++ b/nixos/home/env/ssh.nix
@@ -2,11 +2,24 @@
 {
   programs.ssh = {
     enable = true;
-    includes = [ "config.d/*" ];
     forwardAgent = true;
     serverAliveInterval = 15;
     serverAliveCountMax = 3;
     controlMaster = "auto";
     controlPersist = "1s";
+    matchBlocks = {
+      "legion xenia xenia.me.uk" = {
+        user = "xenia";
+        hostname = "xenia.me.uk";
+        port = 30;
+        forwardAgent = true;
+      };
+      "vanguard" = {
+        user = "xenia";
+        hostname = "192.168.1.166";
+        forwardAgent = true;
+      };
+      "git.ccfe.ac.uk".user = "git";
+    };
   };
 }