hosts/carbon/net-gastnetz.nix

@@ -7,23 +7,18 @@
     id = 202;
     interface = "enp1s0";
   };
-  networking.bridges."net-gastnetz".interfaces = [
-    "enp1s0.202"
-  ];
-  networking.interfaces."net-gastnetz".ipv6.addresses = [
+  networking.interfaces."enp1s0.202".ipv6.addresses = [
     { address = "fd00:3214:9453:4920::1"; prefixLength = 64; }
+    { address = "2001:4cd8:100:1313::1"; prefixLength = 64; } # public IPs for local network
   ];
-  networking.interfaces."net-gastnetz".ipv4.addresses = [
+  networking.interfaces."enp1s0.202".ipv4.addresses = [
     { address = "192.168.32.1"; prefixLength = 24; }
   ];
 
   services.radvd.config = ''
-    interface net-gastnetz {
+    interface enp1s0.202 {
       AdvSendAdvert on;
-      prefix ::/64 {
-        AdvValidLifetime 60;
-        AdvPreferredLifetime 30;
-      };
+      prefix 2001:4cd8:100:1313::/64 {};
       RDNSS 2620:fe::fe 2620:fe::9 {}; # Quad 9
     };
   '';
@@ -31,7 +26,7 @@
   services.kea.dhcp4 = {
     settings = {
       interfaces-config = {
-        interfaces = [ "net-gastnetz" ];
+        interfaces = [ "enp1s0.202" ];
       };
       subnet4 = [
         # Gastnetz
@@ -60,9 +55,9 @@
 
   # net-gastnetz can only access internet
   clerie.firewall.extraForwardFilterCommands = ''
-    ip46tables -A forward-filter -i net-gastnetz -o ppp-dtagdsl -j ACCEPT
-    ip46tables -A forward-filter -i net-gastnetz -j DROP
-    ip46tables -A forward-filter -o net-gastnetz -j DROP
+    ip46tables -A forward-filter -i enp1s0.202 -o ppp-dtagdsl -j ACCEPT
+    ip46tables -A forward-filter -i enp1s0.202 -j DROP
+    ip46tables -A forward-filter -o enp1s0.202 -j DROP
   '';
 
 }

hosts/carbon/net-heimnetz.nix

@@ -14,6 +14,7 @@
   networking.interfaces."net-heimnetz".ipv6.addresses = [
     { address = "fe80::1"; prefixLength = 64; }
     { address = "fd00:152:152:4::1"; prefixLength = 64; }
+    { address = "2001:4cd8:100:1337::1"; prefixLength = 64; } # public IPs for local network
   ];
   networking.interfaces."net-heimnetz".ipv4.addresses = [
     { address = "10.152.4.1"; prefixLength = 24; }
@@ -22,10 +23,7 @@
   services.radvd.config = ''
     interface net-heimnetz {
       AdvSendAdvert on;
-      prefix ::/64 {
-        AdvValidLifetime 60;
-        AdvPreferredLifetime 30;
-      };
+      prefix 2001:4cd8:100:1337::/64 {};
       RDNSS fd00:152:152::1 {};
       DNSSL net.clerie.de {};
     };

hosts/carbon/net-iot.nix

@@ -23,10 +23,7 @@
   services.radvd.config = ''
     interface net-iot {
       AdvSendAdvert on;
-      prefix ::/64 {
-        AdvValidLifetime 60;
-        AdvPreferredLifetime 30;
-      };
+      prefix fd00:152:152:205::/64 {};
       RDNSS fd00:152:152::1 {};
       DNSSL iot.clerie.de {};
     };