From 6bb530e4046001ecd5f43dd227ca6b5eb0506fbf Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Sun, 28 Jul 2024 06:11:49 -0700
Subject: [PATCH] ssh: use ssh dir instead of homedir

---
 home/modules/ssh.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/home/modules/ssh.nix b/home/modules/ssh.nix
index a0557e6..02468bb 100644
--- a/home/modules/ssh.nix
+++ b/home/modules/ssh.nix
@@ -12,7 +12,7 @@ in
   };
 
   config =
-    let home = config.home.homeDirectory + "/.ssh";
+    let sshDir = config.home.homeDirectory + "/.ssh";
     in lib.mkIf cfg.enable {
       programs.ssh = {
         enable = true;
@@ -22,28 +22,29 @@ in
             hostname = "git.zynh.me";
             user = "git";
             port = 2221;
-            identityFile = "${home}/.ssh/personal_git";
+            identityFile = "${sshDir}/personal_git";
           };
           msiserver = {
             hostname = "scarlet.zynh.me";
             user = "zynh";
-            identityFile = "${home}/.ssh/msiserver";
+            identityFile = "${sshDir}/msiserver";
           };
           "msiserver.local" = lib.mkIf cfg.homeNetwork {
             hostname = "msiserver";
             user = "zynh";
-            identityFile = "${home}/.ssh/msiserver";
+            identityFile = "${sshDir}/msiserver";
           };
           caveserver = {
-            identityFile = "${home}/.ssh/caveserver";
+            identityFile = "${sshDir}/caveserver";
           };
         };
       };
 
-      sops.secrets = lib.mkIf sops {
-        "private_keys/msiserver".path = "${home}/.ssh/msiserver";
-        "private_keys/caveserver".path = "${home}/.ssh/caveserver";
-        "ssh_hosts/caveserver".path = "${home}/.ssh/conf.d/caveserver_config";
+      sops.secrets = ifSops {
+        "private_keys/msiserver" = { };
+        "private_keys/caveserver" = { };
+
+        "ssh_hosts/caveserver".path = "${sshDir}/conf.d/caveserver_config";
       };
     };
 }