From de4d969a0e0ccb1413221abd8645709896ea48ac Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Tue, 30 May 2023 13:45:51 +0200
Subject: [PATCH] Revert "better ipv6 config"

This reverts commit 1999030ee2098b7d719d25a2c95867c052735c7c.
---
 hosts/falkenstein-1/modules/networks/default.nix | 13 +++----------
 hosts/falkenstein-1/modules/nginx/default.nix    |  2 +-
 hosts/thinkpad/modules/networks/default.nix      |  4 +---
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/hosts/falkenstein-1/modules/networks/default.nix b/hosts/falkenstein-1/modules/networks/default.nix
index eede8f1..2ea9447 100644
--- a/hosts/falkenstein-1/modules/networks/default.nix
+++ b/hosts/falkenstein-1/modules/networks/default.nix
@@ -1,14 +1,5 @@
 { ... }:
 {
-  services.radvd = {
-    enable = true;
-    config = ''
-      interface ens3 {
-        AdvSendAdvert on;
-        prefix 2a01:4f8:c012:49de::/64 {};
-      };
-    '';
-  };
   networking = {
     hostName = "falkenstein-1";
     useNetworkd = true;
@@ -23,8 +14,10 @@
     networks."10-wired" = {
       matchConfig.Name = "ens3";
       networkConfig = {
-        DHCP = "yes";
+        DHCP = "ipv4";
         IPv6AcceptRA = "yes";
+        Address = "2a01:4f8:c012:49de::1/64";
+        Gateway = "fe80::1";
       };
     };
   };
diff --git a/hosts/falkenstein-1/modules/nginx/default.nix b/hosts/falkenstein-1/modules/nginx/default.nix
index 7874a85..8dcd514 100644
--- a/hosts/falkenstein-1/modules/nginx/default.nix
+++ b/hosts/falkenstein-1/modules/nginx/default.nix
@@ -7,7 +7,7 @@
     recommendedProxySettings = true;
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
-
+    
     virtualHosts."rfive.de" = {
       enableACME = true;
       forceSSL = true;
diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix
index 3e44e61..c14ef68 100644
--- a/hosts/thinkpad/modules/networks/default.nix
+++ b/hosts/thinkpad/modules/networks/default.nix
@@ -46,8 +46,6 @@
       linkConfig.RequiredForOnline = false;
       networkConfig = {
         DHCP = "yes";
-        IPv6AcceptRA = "yes";
-        IPv6PrivacyExtensions = "yes";
       };
       dhcpV4Config = {
         RouteMetric = 10;
@@ -77,7 +75,7 @@
         DHCP = "yes";
         IgnoreCarrierLoss = "3s";
         IPv6AcceptRA = "yes";
-        IPv6PrivacyExtensions = "yes";
+        #IPv6PrefixDelegation = "dhcpv6";
       };
       dhcpV4Config = {
         RouteMetric = 20;