From 91ee2cc15b1387ee4a3209e0f1f15032890615e6 Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 14 Dec 2025 21:36:39 +0100
Subject: [PATCH] hosts/carbon: Reduce overhead by not using network bridges

---
 hosts/carbon/ds-lite-ncfttb.nix |  2 +-
 hosts/carbon/net-dsl.nix        |  8 --------
 hosts/carbon/net-heimnetz.nix   | 16 ++++------------
 hosts/carbon/ppp-ncfttb.nix     |  2 +-
 4 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/hosts/carbon/ds-lite-ncfttb.nix b/hosts/carbon/ds-lite-ncfttb.nix
index ecd06dc..f82691a 100644
--- a/hosts/carbon/ds-lite-ncfttb.nix
+++ b/hosts/carbon/ds-lite-ncfttb.nix
@@ -8,7 +8,7 @@
     tunnelInterfaceName = "ds-lite-ncfttb";
     lanInterfaces = [
       {
-        name = "net-heimnetz";
+        name = "enp2s0";
         sla_id = 201;
         prefix_len = 64;
       }
diff --git a/hosts/carbon/net-dsl.nix b/hosts/carbon/net-dsl.nix
index dcd26a5..9c52cc3 100644
--- a/hosts/carbon/net-dsl.nix
+++ b/hosts/carbon/net-dsl.nix
@@ -3,17 +3,9 @@
 {
 
   ## DSL-Uplink
-  networking.vlans."enp1s0.10" = {
-    id = 10;
-    interface = "enp1s0";
-  };
   networking.vlans."enp3s0.10" = {
     id = 10;
     interface = "enp3s0";
   };
-  networking.bridges."net-dsl".interfaces = [
-    "enp1s0.10"
-    "enp3s0.10"
-  ];
 
 }
diff --git a/hosts/carbon/net-heimnetz.nix b/hosts/carbon/net-heimnetz.nix
index 40b8e05..55ed813 100644
--- a/hosts/carbon/net-heimnetz.nix
+++ b/hosts/carbon/net-heimnetz.nix
@@ -3,24 +3,16 @@
 {
 
   ## Heimnetz
-  networking.vlans."enp1s0.201" = {
-    id = 201;
-    interface = "enp1s0";
-  };
-  networking.bridges."net-heimnetz".interfaces = [
-    "enp1s0.201"
-    "enp2s0"
-  ];
-  networking.interfaces."net-heimnetz".ipv6.addresses = [
+  networking.interfaces."enp2s0".ipv6.addresses = [
     { address = "fe80::1"; prefixLength = 64; }
     { address = "fd00:152:152:4::1"; prefixLength = 64; }
   ];
-  networking.interfaces."net-heimnetz".ipv4.addresses = [
+  networking.interfaces."enp2s0".ipv4.addresses = [
     { address = "10.152.4.1"; prefixLength = 24; }
   ];
 
   services.radvd.config = ''
-    interface net-heimnetz {
+    interface enp2s0 {
       AdvSendAdvert on;
       MaxRtrAdvInterval 30;
       prefix ::/64 {
@@ -35,7 +27,7 @@
   services.kea.dhcp4 = {
     settings = {
       interfaces-config = {
-        interfaces = [ "net-heimnetz" ];
+        interfaces = [ "enp2s0" ];
       };
       subnet4 = [
         # Heimnetz
diff --git a/hosts/carbon/ppp-ncfttb.nix b/hosts/carbon/ppp-ncfttb.nix
index 38d882c..6733c43 100644
--- a/hosts/carbon/ppp-ncfttb.nix
+++ b/hosts/carbon/ppp-ncfttb.nix
@@ -6,7 +6,7 @@
     enable = true;
     peers.ncfttb = {
       config = ''
-        plugin pppoe.so net-dsl
+        plugin pppoe.so enp3s0.10
         user "''${PPPD_NETCOLOGNE_USERNAME}"
         ifname ppp-ncfttb
         persist