Fixed SSH-Key for Git

homes/x86_64-linux/kb@Ohybke/ssh.nix

@@ -3,6 +3,9 @@
   # SSH Configuration
   services.ssh-agent.enable = true;
   programs.ssh.enable = true;
+  programs.ssh.extraConfig = ''
+    IdentitiesOnly=yes
+  '';
 
   # SSH Shell Connections
   programs.ssh.matchBlocks."master@pkpnafs-m1ni" = {
@@ -94,7 +97,7 @@
   programs.ssh.matchBlocks."kb01@kb-one-git" = {
     host = "git.kb-one.de";
     user = "git";
-    identityFile = "~/.ssh/kb01@kb-one-git";
+    identityFile = "~/.ssh/id_ed25519_sk_rk_kb-git@m1ni";
     port = 9522;
   };
   programs.ssh.matchBlocks."kb01@0x90-git" = {
@@ -125,4 +128,36 @@
     identityFile = "~/.ssh/id_ed25519_sk_rk_kb-ssh@lar3";
     port = 7299;
   };
+
+  # Nix Build Hosts
+  programs.ssh.matchBlocks."nix-builder@pkpnafs" = {
+    host = "pkpnafs";
+    hostname = "pkpnafs.kb-one.de";
+    user = "nix-builder";
+    identityFile = "~/.ssh/nix-builder@pkpnafs";
+    port = 3422;
+  };
+  programs.ssh.matchBlocks."nix-builder@senfnvp" = {
+    host = "senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "nix-builder";
+    identityFile = "~/.ssh/nix-builder@senfnvp";
+    port = 9553;
+  };
+
+  # Nix Caches
+  programs.ssh.matchBlocks."nix-ssh@pkpnafs" = {
+    host = "pkpnafs";
+    hostname = "pkpnafs.kb-one.de";
+    user = "nix-ssh";
+    identityFile = "~/.ssh/nix-ssh@pkpnafs";
+    port = 3422;
+  };
+  programs.ssh.matchBlocks."nix-ssh@senfnvp" = {
+    host = "senfnvp";
+    hostname = "senfnvp.kb-one.de";
+    user = "nix-ssh";
+    identityFile = "~/.ssh/nix-ssh@senfnvp";
+    port = 9553;
+  };
 }

systems/x86_64-linux/Ohybke/default.nix

@@ -10,6 +10,10 @@
   nix.settings = {
     experimental-features = [ "nix-command" "flakes" ];
   };
+  nix.extraOptions = ''
+    secret-key-files = /root/secrets/cache-Ohybke.sec
+    builders-use-substitutes = true
+  '';
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.permittedInsecurePackages = [
     "electron-27.3.11"
@@ -28,9 +32,6 @@
     }
   ];
   nix.distributedBuilds = true;
-  nix.extraOptions = ''
-    builders-use-substitutes = true
-  '';
 
   # Networking
   networking.hostName = "Ohybke";
@@ -123,7 +124,7 @@
 
   services.numen = {
     enable = true;
-    autoStart = true;
+    autoStart = false;
     phrasesPkg = pkgs.kb-one.numen-phrases.override {
       customWakeWords-en = [ "cyber" "writer" "activate" ];
       customWakeWords-de = [ "aktivier" "cyber" "schreiber" ];