From 18844d662ba3295c0d037e3df18f1ee08058294b Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@subzero.xyz>
Date: Thu, 13 Nov 2025 11:51:57 +0100
Subject: [PATCH] chore(nixbuild): add sshKey field and finalize fish init

- Added `sshKey` field for all builder configurations in `nixbuild.nix` to standardize access keys.
- Replaced `programs.fish.shellInit` with `environment.shellInit` and introduced `programs.fish.loginShellInit` for improved Nix path initialization.
---
 systems/nixbuild.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/systems/nixbuild.nix b/systems/nixbuild.nix
index 7d625ff..802e049 100644
--- a/systems/nixbuild.nix
+++ b/systems/nixbuild.nix
@@ -11,6 +11,7 @@ with lib.metacfg;
       maxJobs = 4;
       speedFactor = 3;
       sshUser = "harald";
+      sshKey = "/etc/ssh/nix-builder-key";
     }
     {
       hostName = "rialo";
@@ -18,6 +19,7 @@ with lib.metacfg;
       maxJobs = 4;
       speedFactor = 3;
       sshUser = "harald";
+      sshKey = "/etc/ssh/nix-builder-key";
     }
     {
       hostName = "sgx";
@@ -25,24 +27,31 @@ with lib.metacfg;
       maxJobs = 4;
       speedFactor = 1;
       sshUser = "harald";
+      sshKey = "/etc/ssh/nix-builder-key";
     }
   ];
 
   nix.settings = {
-    substituters = [
-      "https://cache.nixos.org"
-      "ssh-ng://harald@m4?ssh-key=/etc/ssh/nix-builder-key"
-      "ssh-ng://harald@rialo?ssh-key=/etc/ssh/nix-builder-key"
-      "ssh-ng://harald@sgx?ssh-key=/etc/ssh/nix-builder-key"
-    ];
-
+    /*
+      substituters = [
+        "https://cache.nixos.org"
+        "ssh-ng://harald@m4?ssh-key=/etc/ssh/nix-builder-key"
+        "ssh-ng://harald@rialo?ssh-key=/etc/ssh/nix-builder-key"
+        "ssh-ng://harald@sgx?ssh-key=/etc/ssh/nix-builder-key"
+      ];
+    */
     builders-use-substitutes = true;
   };
 
   # Ensure Nix is in PATH for SSH sessions
-  programs.fish.shellInit = ''
+  environment.shellInit = ''
     if [ -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]; then
       . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
     fi
   '';
+
+  programs.fish.loginShellInit = ''
+    set -gx PATH /nix/var/nix/profiles/default/bin $PATH
+    set -gx PATH /run/current-system/sw/bin $PATH
+  '';
 }