From abad8b586e451853b244b6136b198f42384fa025 Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Sat, 22 Nov 2025 13:47:58 +0100
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/37a3d97f2873e0f68711117c34d04b7c7ead8f4e?narHash=sha256-t2U/GLLXHa2%2BkJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs%3D' (2025-11-10)
  → 'github:nix-community/home-manager/d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1?narHash=sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l%2BsP9Jgms%2BJU%3D' (2025-11-21)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b6a8526db03f735b89dd5ff348f53f752e7ddc8e?narHash=sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV%2B3DSADBX7/9YQ%3D' (2025-11-08)
  → 'github:nixos/nixpkgs/89c2b2330e733d6cdb5eae7b899326930c2c0648?narHash=sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw%3D' (2025-11-17)
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index ba20327..e8024c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762787259,
-        "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=",
+        "lastModified": 1763748372,
+        "narHash": "sha256-AUc78Qv3sWir0hvbmfXoZ7Jzq9VVL97l+sP9Jgms+JU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e",
+        "rev": "d10a9b16b2a3ee28433f3d1c603f4e9f1fecb8e1",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762596750,
-        "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
+        "lastModified": 1763421233,
+        "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
+        "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",
         "type": "github"
       },
       "original": {

From de1a4e71dcc2e2ee50abfce9bb6402d5dd90ef59 Mon Sep 17 00:00:00 2001
From: CDaut <git@cdaut.de>
Date: Sun, 23 Nov 2025 17:26:15 +0100
Subject: [PATCH 2/2] fix bad ssh jumphost

---
 configuration.nix |  1 +
 home.nix          | 45 ++++++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index e5b6c26..bccd19c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -339,6 +339,7 @@
       ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --sport 51820 -j RETURN || true
       ip46tables -t mangle -D nixos-fw-rpfilter -p udp -m udp --dport 51820 -j RETURN || true
     '';
+    allowedUDPPorts = [ 51820 ];
   };
 
 
diff --git a/home.nix b/home.nix
index bea884b..77c34ce 100644
--- a/home.nix
+++ b/home.nix
@@ -126,27 +126,30 @@ in
     enable = true;
     enableDefaultConfig = false;
     matchBlocks = {
-    "infra.cdaut.de" = {
-      hostname = "infra.cdaut.de";
-      user = "clara";
-      forwardAgent = true;
-    };
-    
-    "10.0.0.*" = {
-      proxyJump = "infra.cdaut.de";
-    };
-    "*" = {
-      forwardAgent = true;
-      addKeysToAgent = "no";
-      compression = false;
-      serverAliveInterval = 0;
-      serverAliveCountMax = 3;
-      hashKnownHosts = false;
-      userKnownHostsFile = "~/.ssh/known_hosts";
-      controlMaster = "no";
-      controlPath = "~/.ssh/master-%r@%n:%p";
-      controlPersist = "no";
-    };
+      "infra.cdaut.de" = {
+        hostname = "infra.cdaut.de";
+        user = "clara";
+        forwardAgent = true;
+      };
+
+      "10.0.0.*" = {
+        proxyJump = "netcup.infra.cdaut.de";
+      };
+      "10.10.*.*" = {
+        proxyJump = "cube.infra.cdaut.de";
+      };
+      "*" = {
+        forwardAgent = true;
+        addKeysToAgent = "no";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+      };
     };
   };