From d184d54b0759a96fb5ef26650201d94db9abdd9d Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Thu, 14 Nov 2024 18:40:25 -0800
Subject: [PATCH] fix(ssh): Enable and troubleshoot ssh

---
 home/programs/default.nix | 1 +
 home/programs/ssh.nix     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/home/programs/default.nix b/home/programs/default.nix
index 20c42c6..0348222 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -22,6 +22,7 @@
     ./neofetch.nix
     ./rbw.nix
     ./ripgrep.nix
+    ./ssh.nix
     ./starship.nix
     ./tmux.nix
     ./topgrade.nix
diff --git a/home/programs/ssh.nix b/home/programs/ssh.nix
index 8447dc3..bd3174c 100644
--- a/home/programs/ssh.nix
+++ b/home/programs/ssh.nix
@@ -3,19 +3,19 @@
   programs.ssh = {
     enable = true;
 
-    extraConfig = {
-      identityFile = "%r@%h";
-    };
-
     # Equivalent of ~/.ssh/config
+    #   %d - local user's home directory
+    #   %r - remote username
     matchBlocks = {
       "tty.marleycentre" = {
         hostname = "admin.punkfairie.net";
+        identityFile = "%d/.ssh/%r@marleycentre";
       };
 
       "tty.marleynet" = {
         hostname = "10.69.69.2";
         port = 222;
+        identityFile = "%d/.ssh/%r@marleynet";
       };
     };
   };