From a4b74ad65fca86251fb7c209a4b8528b171059e6 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 18 Nov 2023 22:21:12 +0100
Subject: [PATCH] more proxyjump fixes

---
 profiles/remote-builders/default.nix | 27 ++++++++++++---------------
 users/pbsds/home/profiles/ssh.nix    | 10 +++++-----
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/profiles/remote-builders/default.nix b/profiles/remote-builders/default.nix
index 561ab48..812882c 100644
--- a/profiles/remote-builders/default.nix
+++ b/profiles/remote-builders/default.nix
@@ -7,6 +7,15 @@ let
   #  - "big-parallel" - is beefy, for stuff like llvm
 
   # find 'publicKey' with `ssh-keyscan`
+  proxyjump-ntnu = {
+    proxy.user = "pederbs";
+    #proxy.host = "isvegg.pvv.ntnu.no";
+    #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # isvegg
+    #proxy.host = "hildring.pvv.ntnu.no";
+    #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # hildring
+    proxy.host = "microbel.pvv.ntnu.no";
+    proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="; # microbel
+  };
 
   remotes = [
     /**/
@@ -20,11 +29,7 @@ let
       supportedFeatures  = [ "kvm" "big-parallel" "nixos-test" ];
       #mandatoryFeatures  = [ ];
       publicKey  = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILeOB/57N1fQPVorIUlkkJZaQduBo+4+km2Qbj4ebd/k";
-      proxy.user = "pederbs";
-      #proxy.host = "isvegg.pvv.ntnu.no";
-      #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # isvegg
-      proxy.host = "hildring.pvv.ntnu.no";
-      proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # hildring
+      inherit (proxyjump-ntnu) proxy;
     }
     /**/
     {
@@ -37,11 +42,7 @@ let
       supportedFeatures  = [ "kvm" "big-parallel" "nixos-test" ];
       #mandatoryFeatures  = [ ];
       publicKey  = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkcZ3cUAKk8uUvZPsX7PDBInkb3Eps3Xh+xVrhPY+sx";
-      proxy.user = "pederbs";
-      #proxy.host = "isvegg.pvv.ntnu.no";
-      #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # isvegg
-      proxy.host = "hildring.pvv.ntnu.no";
-      proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # hildring
+      inherit (proxyjump-ntnu) proxy;
     }
     /** /
     {
@@ -67,11 +68,7 @@ let
       supportedFeatures  = [ "kvm" "big-parallel" ];
       #mandatoryFeatures  = [ ];
       publicKey          = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDuWdqEQ5mmVjuKi6f/Q2PFxuqB3URpgTHid06Vw7we";
-      proxy.user         = "pederbs";
-      #proxy.host = "isvegg.pvv.ntnu.no";
-      #proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # isvegg
-      proxy.host = "hildring.pvv.ntnu.no";
-      proxy.publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGurF7rdnrDP/VgIK2Tx38of+bX/QGCGL+alrWnZ1Ca5llGneMulUt1RB9xZzNLHiaWIE+HOP0i4spEaeZhilfU="; # hildring
+      inherit (proxyjump-ntnu) proxy;
     }
     /** /
     {
diff --git a/users/pbsds/home/profiles/ssh.nix b/users/pbsds/home/profiles/ssh.nix
index bff8401..6bb9556 100644
--- a/users/pbsds/home/profiles/ssh.nix
+++ b/users/pbsds/home/profiles/ssh.nix
@@ -28,17 +28,17 @@
     "*.pbsds.net".forwardX11Trusted = true;
     "*.ntnu.no".user = "pederbs";
     "*.pvv.org".user = "pederbs";
-    "*.hpc.ntnu.no".proxyJump = "hildring.pvv.ntnu.no";
-    "*.idi.ntnu.no".proxyJump = "hildring.pvv.ntnu.no";
+    "*.hpc.ntnu.no".proxyJump = "microbel.pvv.ntnu.no";
+    "*.idi.ntnu.no".proxyJump = "microbel.pvv.ntnu.no";
 
     # me
-    "garp.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
-    "bolle.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
+    "garp.pbsds.net".proxyJump = "microbel.pvv.ntnu.no";
+    "bolle.pbsds.net".proxyJump = "microbel.pvv.ntnu.no";
     "knut.pbsds.net".port = 23;
     "nord.pbsds.net".port = 24;
     "sopp.pbsds.net".port = 26;
     "noximilien.pbsds.net" = {};
-    "rocm.pbsds.net".proxyJump = "hildring.pvv.ntnu.no";
+    "rocm.pbsds.net".proxyJump = "microbel.pvv.ntnu.no";
 
     # ntnu
     "stud.ntnu.no".hostname = "login.stud.ntnu.no";