VPN updates

.vscode/settings.json

@@ -1,4 +1,7 @@
 {
+  "[nix]": {
+    "editor.defaultFormatter": "jnoortheen.nix-ide"
+  },
   "nix.enableLanguageServer": true,
   "nix.serverPath": "nil",
   "nix.formatterPath": "alejandra",
@@ -6,10 +9,11 @@
     "nil": {
       "formatting": {
         "command": ["alejandra"]
+      },
+      "flake": {
+        "autoArchive": true,
+        "autoEvalInputs": true
       }
     }
-  },
-  "[nix]": {
-    "editor.defaultFormatter": "jnoortheen.nix-ide"
   }
 }

hosts/hurricane/vpn.nix

@@ -1,6 +1,6 @@
 {
   networking.wg-quick.interfaces = {
-    wg-hurricane = {
+    wg-felix-hurricane = {
       address = ["10.8.0.4/24"];
       dns = ["192.168.0.128"];
       privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/Felix-Hurricane-pk";
@@ -15,5 +15,44 @@
         }
       ];
     };
+
+    wg-csb-hurricane = {
+      address = ["192.168.108.17/22" "2a02:9a0:102:108::17/64"];
+      privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/CSB-Hurricane-pk";
+      peers = [
+        {
+          publicKey = "mTORKHkPcp9+c7VXqVfVseIOQZuJftoUYA0pBe87bDQ=";
+          allowedIPs = ["10.0.0.0/8" "172.18.0.0/16" "192.168.3.0/24" "192.168.10.0/24" "192.168.108.0/22" "2a02:9a0:102:108::/64" "2a02:9a0:ffff::/48"];
+          endpoint = "prod-net-vpn1.infra.brainmill.com:51819";
+          persistentKeepalive = 25;
+        }
+      ];
+    };
+
+    wg-fg-hurricane = {
+      address = ["10.255.11.11/24" "2a02:9a0:300:fff0:11::11/64"];
+      privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/FG-Hurricane-pk";
+      peers = [
+        {
+          publicKey = "h/BUyzXy0Xo4KJKS/U5V4C9rDJT3fWjjiZoy0I7P+H4=";
+          allowedIPs = ["10.0.0.0/8" "192.168.10.0/24" "2a02:9a0:300:fff0::/48"];
+          endpoint = "gw1.net.chsfg.se:51831";
+          persistentKeepalive = 25;
+        }
+      ];
+    };
+
+    wg-neanet-hurricane = {
+      address = ["192.168.108.25/32" "2a09:2681:204:1::27/64"];
+      privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/Neanet-Hurricane-pk";
+      peers = [
+        {
+          publicKey = "nz1m0crkdarW7y+/p6hKCGncMVHlVhbz0URA6Z71RmM=";
+          allowedIPs = ["2a09:2681:204:1::/64" "2a09:2681:ffff:13::/64" "2a09:2681:ffff:14::/64" "2a09:2681:ffff:15::/64" "2a09:2681:ffff:16::/64" "172.18.255.0/24"];
+          endpoint = "prod-jump-got1.infra.brainmill.com:51820";
+          persistentKeepalive = 25;
+        }
+      ];
+    };
   };
 }

hosts/wildfire/vpn.nix

@@ -1,10 +1,9 @@
 {
   networking.wg-quick.interfaces = {
-    wg-wildfire = {
+    wg-felix-wildfire = {
       address = ["10.8.0.5/24"];
       dns = ["192.168.0.128"];
       privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/Felix-Wildfire-pk";
-
       peers = [
         {
           publicKey = "a35ZSWhBNzPFkf1RCkg4E7cNnUdGGOr4CsA0EM65H0g=";
@@ -15,5 +14,44 @@
         }
       ];
     };
+
+    wg-csb-wildfire = {
+      address = ["192.168.108.27/22" "2a02:9a0:102:108::b/64"];
+      privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/CSB-Wildfire-pk";
+      peers = [
+        {
+          publicKey = "mTORKHkPcp9+c7VXqVfVseIOQZuJftoUYA0pBe87bDQ=";
+          allowedIPs = ["10.0.0.0/8" "172.18.0.0/16" "192.168.3.0/24" "192.168.10.0/24" "192.168.108.0/22" "2a02:9a0:102:108::/64" "2a02:9a0:ffff::/48"];
+          endpoint = "prod-net-vpn1.infra.brainmill.com:51819";
+          persistentKeepalive = 25;
+        }
+      ];
+    };
+
+    #    wg-fg-wildfire = {
+    #      address = ["10.255.11.11/24" "2a02:9a0:300:fff0:11::11/64"];
+    #      privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/FG-Wildfire-pk";
+    #      peers = [
+    #        {
+    #          publicKey = "h/BUyzXy0Xo4KJKS/U5V4C9rDJT3fWjjiZoy0I7P+H4=";
+    #          allowedIPs = ["10.0.0.0/8" "192.168.10.0/24" "2a02:9a0:300:fff0::/48"];
+    #          endpoint = "gw1.net.chsfg.se:51831";
+    #          persistentKeepalive = 25;
+    #        }
+    #      ];
+    #    };
+    #
+    #    wg-neanet-wildfire = {
+    #      address = ["192.168.108.25/32" "2a09:2681:204:1::27/64"];
+    #      privateKeyFile = "/home/schulze/Nextcloud/secrets/wireguard/Neanet-Wildfire-pk";
+    #      peers = [
+    #        {
+    #          publicKey = "nz1m0crkdarW7y+/p6hKCGncMVHlVhbz0URA6Z71RmM=";
+    #          allowedIPs = ["2a09:2681:204:1::/64" "2a09:2681:ffff:13::/64" "2a09:2681:ffff:14::/64" "2a09:2681:ffff:15::/64" "2a09:2681:ffff:16::/64" "172.18.255.0/24"];
+    #          endpoint = "prod-jump-got1.infra.brainmill.com:51820";
+    #          persistentKeepalive = 25;
+    #        }
+    #      ];
+    #    };
   };
 }

modules/hm/code-cursor.nix

@@ -45,21 +45,17 @@
       "editor.fontFamily" = "'Intel One Mono', 'Droid Sans Mono', 'monospace', monospace";
       "editor.tabSize" = 2;
       "editor.wordWrap" = "on";
-      "workbench.colorTheme" = "Gruvbox Dark Medium";
-      "workbench.iconTheme" = "vscode-icons";
-      "editor.defaultFormatter" = "esbenp.prettier-vscode";
       "editor.fontLigatures" = "'ss01'";
       "editor.formatOnSave" = true;
+      "editor.minimap.enabled" = true;
+      "editor.defaultFormatter" = "esbenp.prettier-vscode";
       "prettier.printWidth" = 120;
       "prettier.proseWrap" = "always";
+      "workbench.colorTheme" = "Gruvbox Dark Medium";
+      "workbench.iconTheme" = "vscode-icons";
       "vsicons.dontShowNewVersionMessage" = true;
-      "editor.minimap.enabled" = true;
       "cursor.cpp.enablePartialAccepts" = true;
       "cursor.diffs.useCharacterLevelDiffs" = true;
-      "nix.enableLanguageServer" = true;
-      "[nix]" = {
-        "editor.defaultFormatter" = "jnoortheen.nix-ide";
-      };
     };
   };
 }

modules/hm/ssh.nix

@@ -17,6 +17,32 @@
         forwardAgent = true;
         port = 22;
       };
+      "gw1.net.chsfg.se" = {
+        forwardAgent = true;
+        hostname = "2a02:9a0:fffe:4::3";
+      };
+      "gw2.net.chsfg.se" = {
+        forwardAgent = true;
+        hostname = "2a02:9a0:fffe:4::5";
+      };
+      "cv11-stor-gw.net.chsfg.se" = {
+        proxyCommand = "ssh prod-admin-jump1.infra.csbnet.se /bin/nc %h 22";
+        hostname = "176.10.244.136";
+        user = "root";
+        port = 8822;
+      };
+      "tp2-core1.net.chsfg.se" = {
+        hostname = "192.168.10.52";
+        user = "nvg";
+      };
+      "gw-shg9d-ctk.net.chsfg.se" = {
+        hostname = "83.218.70.146";
+        user = "admin";
+      };
+      "lp5-core1.net.chsfg.se" = {
+        hostname = "192.168.10.51";
+        user = "nvg";
+      };
       "sw-fys-kt11-serv1.net.chsfg.se" = {
         hostname = "10.2.13.10";
       };
@@ -48,32 +74,6 @@
       "192.168.10.50" = {
         hostname = "192.168.10.50";
       };
-      "gw1.net.chsfg.se" = {
-        forwardAgent = true;
-        hostname = "2a02:9a0:fffe:4::3";
-      };
-      "gw2.net.chsfg.se" = {
-        forwardAgent = true;
-        hostname = "2a02:9a0:fffe:4::5";
-      };
-      "cv11-stor-gw.net.chsfg.se" = {
-        proxyCommand = "ssh prod-admin-jump1.infra.csbnet.se /bin/nc %h 22";
-        hostname = "176.10.244.136";
-        user = "root";
-        port = 8822;
-      };
-      "tp2-core1.net.chsfg.se" = {
-        hostname = "192.168.10.52";
-        user = "nvg";
-      };
-      "gw-shg9d-ctk.net.chsfg.se" = {
-        hostname = "83.218.70.146";
-        user = "admin";
-      };
-      "lp5-core1.net.chsfg.se" = {
-        hostname = "192.168.10.51";
-        user = "nvg";
-      };
     };
   };
 }