all repos — nixfiles @ dbe8b208adac4ff68aa97e4958a351ee0c4ac968

System and user configuration, managed by nix and home-manager

r5: move bridge configuration to networking.bridges

Alin
commit

dbe8b208adac4ff68aa97e4958a351ee0c4ac968

parent

4a39087e6e67e517f254b817bfa049a2b3599871

1 file changed, 13 insertions(+), 40 deletions(-)

changed files
M system/hosts/r5.nix → system/hosts/r5.nix
@@ -47,6 +47,14 @@ nat = {
       externalInterface = wan;
       internalInterfaces = [ bridge ];
     };
+    bridges = {
+      br0 = {
+        interfaces = [
+          "lan1"
+          "lan2"
+        ];
+      };
+    };
   };
 
   services.dnsmasq.settings.cname = [

@@ -77,46 +85,11 @@ '';
     };
   };
 
-  systemd.network = {
-    netdevs = {
-      "20-${bridge}" = {
-        netdevConfig = {
-          Kind = "bridge";
-          Name = "${bridge}";
-        };
-      };
-    };
-    networks = {
-      "30-lan1" = {
-        matchConfig.Path = "platform-3c0000000.pcie-*";
-        networkConfig.Bridge = bridge;
-        linkConfig.RequiredForOnline = "no-carrier:enslaved";
-      };
-      "30-lan2" = {
-        matchConfig.Path = "platform-3c0400000.pcie-*";
-        networkConfig.Bridge = bridge;
-        linkConfig.RequiredForOnline = "no-carrier:enslaved";
-      };
-      "40-${bridge}" = {
-        matchConfig.Name = bridge;
-        bridgeConfig = { };
-        linkConfig = {
-          RequiredForOnline = "routable";
-          RequiredFamilyForOnline = "both";
-        };
-        networkConfig = {
-          ConfigureWithoutCarrier = true;
-          BindCarrier = [
-            "lan1"
-            "lan2"
-          ];
-        };
-      };
-      "40-${wan}" = {
-        matchConfig.Name = wan;
-        linkConfig = {
-          RequiredFamilyForOnline = "both";
-        };
+  systemd.network.networks = {
+    "40-${wan}" = {
+      matchConfig.Name = wan;
+      linkConfig = {
+        RequiredFamilyForOnline = "both";
       };
     };
   };