Restructure SSH config similar to Git for personal/work separation

home/Monarch-tux.nix

@@ -6,8 +6,8 @@
     ./env/bat.nix
     ./env/direnv.nix
     ./env/keychain.nix
-    ./env/ssh.nix
     ./env/starship.nix
+    ./ssh/personal.nix
     ./terminal/wezterm.nix
     ./tui/neovim.nix
     ./tui/lazygit.nix

home/collections/common/desktop.nix

@@ -9,7 +9,6 @@
     ../../env/direnv.nix
     ../../env/keychain.nix
     ../../env/pypoetry.nix
-    ../../env/ssh.nix
     ../../env/starship.nix
     ../../terminal/wezterm.nix
     ../../tui/neovim.nix

home/collections/personal/default.nix

@@ -3,20 +3,8 @@
   imports = [
     ../common/desktop.nix
     ../../git/personal.nix
+    ../../ssh/personal.nix
   ];
-  programs.ssh.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;
-    };
-  };
   home.packages = with pkgs; [
     discord
     element-desktop

home/collections/work/default.nix

@@ -1,34 +1,10 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ../common/desktop.nix
     ../../git/work.nix
+    ../../ssh/work.nix
   ];
-  programs.ssh.matchBlocks = {
-    "batch" = {
-      user = "cxsbatch";
-      hostname = "heimdall115.jetdata.eu";
-    };
-    "jupyter" = {
-      hostname = "freia022.hpc.l";
-      localForwards = [
-        {
-          bind.port = 6702;
-          host.address = "localhost";
-          host.port = 6702;
-        }
-      ];
-    };
-    "freia" = {
-      hostname = "freia022.hpc.l";
-    };
-    "freia???" = lib.hm.dag.entryAfter [ "freia" ] {
-      hostname = "%h.hpc.l";
-    };
-    "freia* jupyter" = lib.hm.dag.entryAfter [ "freia" "freia???" "jupyter" ] {
-      user = "elitherl";
-    };
-  };
   home.packages = with pkgs; [
     libreoffice-fresh
     neovide

home/ssh/common.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   programs.ssh = {
     enable = true;
@@ -9,5 +9,4 @@
     controlPersist = "1s";
     matchBlocks."git.*".user = "git";
   };
-  home.packages = with pkgs; [ sshfs ];
 }

home/ssh/personal.nix

@@ -0,0 +1,17 @@
+{ ... }:
+{
+  imports = [ ./common.nix ];
+  programs.ssh.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;
+    };
+  };
+}

home/ssh/work.nix

@@ -0,0 +1,30 @@
+{ pkgs, lib, ... }:
+{
+  imports = [ ./common.nix ];
+  home.packages = with pkgs; [ sshfs ];
+  programs.ssh.matchBlocks = {
+    "batch" = {
+      user = "cxsbatch";
+      hostname = "heimdall115.jetdata.eu";
+    };
+    "jupyter" = {
+      hostname = "freia022.hpc.l";
+      localForwards = [
+        {
+          bind.port = 6702;
+          host.address = "localhost";
+          host.port = 6702;
+        }
+      ];
+    };
+    "freia" = {
+      hostname = "freia022.hpc.l";
+    };
+    "freia???" = lib.hm.dag.entryAfter [ "freia" ] {
+      hostname = "%h.hpc.l";
+    };
+    "freia* jupyter" = lib.hm.dag.entryAfter [ "freia" "freia???" "jupyter" ] {
+      user = "elitherl";
+    };
+  };
+}

ssh/config.d/git.conf

@@ -1,2 +0,0 @@
-Host git.ccfe.ac.uk
-    user git

ssh/config.d/ukaea.conf

@@ -1,14 +0,0 @@
-# vim: ft=sshconfig
-Host batch
-    User cxsbatch
-    HostName heimdall115.jetdata.eu
-
-Host freia
-    HostName freia022.hpc.l
-    LocalForward 6702 localhost:6702
-
-Host freia???
-    HostName %h.hpc.l
-
-Host freia*
-    User elitherl

ssh/config.d/xenia.conf

@@ -1,7 +0,0 @@
-# vim: ft=sshconfig
-
-Host legion xenia xenia.me.uk
-    User xenia
-    HostName xenia.me.uk
-    Port 30
-    ForwardAgent yes