From 97b9a3ff1013d691a5fe15687fd6d5dfa79cbf39 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sun, 5 Feb 2023 11:45:06 +0800
Subject: [PATCH] hosts/plover: update networking setup

---
 .../modules/hardware/hetzner-cloud-cx21.nix   | 64 +++++--------------
 hosts/plover/modules/hardware/networks.nix    | 14 +---
 2 files changed, 18 insertions(+), 60 deletions(-)

diff --git a/hosts/plover/modules/hardware/hetzner-cloud-cx21.nix b/hosts/plover/modules/hardware/hetzner-cloud-cx21.nix
index 960a599b..d7e5b5c0 100644
--- a/hosts/plover/modules/hardware/hetzner-cloud-cx21.nix
+++ b/hosts/plover/modules/hardware/hetzner-cloud-cx21.nix
@@ -5,11 +5,11 @@
 # from nixos-generators.
 let
   inherit (builtins) toString;
-  inherit (import ./networks.nix) interfaces;
+  inherit (import ./networks.nix) interfaces privateIPv6Prefix;
 
   # This is just referring to the same interface just with alternative names.
-  mainEthernetInterfaceNames = [ "ens10" "enp0s10" ];
-  internalEthernetInterfaceNames = [ "ens11" "enp0s11" ];
+  mainEthernetInterfaceNames = [ "ens3" "enp0s3" ];
+  internalEthernetInterfaceNames = [ "ens10" "enp0s10" ];
 in
 {
   imports = [
@@ -58,63 +58,33 @@ in
     # For more information, you can look at Hetzner documentation from
     # https://docs.hetzner.com/robot/dedicated-server/ip/additional-ip-adresses/
     networks = {
-      "20-wan" = {
+      "10-wan" = with interfaces.main'; {
         matchConfig.Name = lib.concatStringsSep " " mainEthernetInterfaceNames;
 
-        # Setting the primary static IPs.
-        address = with interfaces; [
-          # The public IPs.
-          "${main'.IPv4.address}/32"
-          "${main'.IPv6.address}/128"
-        ];
+        # Setting up IPv6.
+        address = [ "${IPv6.address}/64" ];
+        gateway = [ IPv6.gateway ];
 
-        networkConfig.IPForward = true;
-
-        gateway = [
-          interfaces.main'.IPv4.gateway
-          interfaces.main'.IPv6.gateway
-        ];
-
-        routes = [
-          { routeConfig.Gateway = interfaces.main'.IPv6.gateway; }
-          { routeConfig.Destination = interfaces.main'.IPv4.address; }
-
-          {
-            routeConfig = {
-              Gateway = interfaces.main'.IPv4.gateway;
-              GatewayOnLink = true;
-            };
-          }
-        ];
+        networkConfig = {
+          DHCP = "yes";
+          IPForward = true;
+          IPMasquerade = "ipv4";
+        };
       };
 
+      # The internal server.
       "20-lan" = with interfaces.internal; {
         matchConfig.Name = lib.concatStringsSep " " internalEthernetInterfaceNames;
+
         address = [
-          "${IPv4.address}/16"
-          "${IPv6.address}/64"
+          "${IPv4.address}/32"
+          "${IPv6.address}/128"
         ];
+
         gateway = [
           IPv4.gateway
           IPv6.gateway
         ];
-
-        routes = [
-          { routeConfig.Gateway = IPv6.gateway; }
-          { routeConfig.Destination = IPv4.address; }
-
-          {
-            routeConfig = {
-              Gateway = IPv4.gateway;
-              GatewayOnLink = true;
-            };
-          }
-        ];
-      };
-
-      "60-internal" = {
-        matchConfig.Name = "ens*";
-        networkConfig.DHCP = "yes";
       };
     };
   };
diff --git a/hosts/plover/modules/hardware/networks.nix b/hosts/plover/modules/hardware/networks.nix
index 1986fd7f..0056ba9c 100644
--- a/hosts/plover/modules/hardware/networks.nix
+++ b/hosts/plover/modules/hardware/networks.nix
@@ -31,7 +31,7 @@ rec {
     };
 
     # /16 block for IPv4, /64 for IPv6.
-    main = {
+    internal = {
       IPv4 = {
         address = "172.27.0.1";
         gateway = ploverInternalNetworkGateway;
@@ -42,18 +42,6 @@ rec {
       };
     };
 
-    # /16 block for IPv4, /64 for IPv6.
-    internal = {
-      IPv4 = {
-        address = "172.27.0.2";
-        gateway = ploverInternalNetworkGateway;
-      };
-      IPv6 = {
-        address = "${privateIPv6Prefix}:2::";
-        gateway = ipv6Gateway;
-      };
-    };
-
     # /16 BLOCK for IPv4, /64 for IPv6.
     wireguard0 = {
       IPv4 = {