From 5a796ef74fab69e3ff745c4bddbcf33cde0dd9c2 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Sat, 17 Sep 2022 21:26:56 +0200
Subject: [PATCH] Revert "Networkd ipv6"

This reverts commit 6e94647d8e8dceeceb33bda46bedd36212fe8d6f.
---
 machines/public-cof/networking.nix | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/machines/public-cof/networking.nix b/machines/public-cof/networking.nix
index 7dc4379..981eff0 100644
--- a/machines/public-cof/networking.nix
+++ b/machines/public-cof/networking.nix
@@ -5,26 +5,9 @@ let mkAddress = addr: let
   in
   { address = (elemAt 0); prefixLength = lib.toInt (elemAt 1); };
 in {
-  systemd.network = {
-    enable = true;
-    networks."ens18" = {
-      DHCP = "no";
-      addresses = [
-        { addressConfig.Address = "2001:470:1f13:187:c08e:feff:fe4d:f5f5"; }
-      ];
-    };
-  };
-
   networking = {
     hostName = "public-cof";
-    useNetworkd = true;
 
-    useDHCP = false;
-
-    firewall.allowedTCPPorts = [ 22 ];
-    firewall.enable = true;
-
-    /*
     # Default IPv4 exit route
     defaultGateway = {
       address = "";
@@ -32,6 +15,14 @@ in {
     };
     localCommands = "ip route add default dev ens20 metric 10";
 
+    useDHCP = false;
+    interfaces.ens18 = {
+      useDHCP = true;
+      ipv6.addresses = [{
+        address = "2001:470:1f13:187:c08e:feff:fe4d:f5f5";
+        prefixLength = 64;
+      }];
+    };
     interfaces.ens19 = {
       useDHCP = false;
       ipv4.addresses = [{
@@ -45,7 +36,9 @@ in {
       # 2nd is for IPv4 → IPv6 proxy in v6proxy/
       ipv4.addresses = map mkAddress [ "45.13.104.27/32" "45.13.104.29/32" ];
     };
-    */
+
+    firewall.allowedTCPPorts = [ 22 ];
+    firewall.enable = true;
   };
 
   services.nginx.defaultListenAddresses = [ "[::0]" "45.13.104.27" ];