From a92e932bb4c49fe304b1ee7ebdfafd47b51ba330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 20 Feb 2023 10:44:47 +0100
Subject: nixos/routers: use bridges instead of hostapd's bridge

---
 nixos/routers/wifi-adm.nix | 16 +++++++++-------
 nixos/routers/wifi-spt.nix | 13 +++++++++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

(limited to 'nixos')

diff --git a/nixos/routers/wifi-adm.nix b/nixos/routers/wifi-adm.nix
index f77d9ad..f50e3f3 100644
--- a/nixos/routers/wifi-adm.nix
+++ b/nixos/routers/wifi-adm.nix
@@ -85,13 +85,15 @@ in {
         cnf.ar9287.interface
         cnf.qca988x.interface
       ];
-      brguest.interfaces = (optionals (cnf.ar9287.interface != null) [
-        "${cnf.ar9287.interface}.nela" 
-        "${cnf.ar9287.interface}.milan" 
-      ]) ++ (optionals (cnf.qca988x.interface != null) [
-        "${cnf.qca988x.interface}.nela" 
-        "${cnf.qca988x.interface}.milan" 
-      ]);
+      brguest.interfaces =
+        (optionals (cnf.ar9287.interface != null) [
+          "${cnf.ar9287.interface}.nela"
+          "${cnf.ar9287.interface}.milan"
+        ])
+        ++ (optionals (cnf.qca988x.interface != null) [
+          "${cnf.qca988x.interface}.nela"
+          "${cnf.qca988x.interface}.milan"
+        ]);
     };
   };
 }
diff --git a/nixos/routers/wifi-spt.nix b/nixos/routers/wifi-spt.nix
index 39740a1..3d70e18 100644
--- a/nixos/routers/wifi-spt.nix
+++ b/nixos/routers/wifi-spt.nix
@@ -72,5 +72,18 @@ in {
           };
         });
     };
+    networking.bridges = {
+      brlan.interfaces = filter (v: v != null) [
+        cnf.ar9287.interface
+        cnf.qca988x.interface
+      ];
+      brguest.interfaces =
+        (optionals (cnf.ar9287.interface != null) [
+          "${cnf.ar9287.interface}.guest"
+        ])
+        ++ (optionals (cnf.qca988x.interface != null) [
+          "${cnf.qca988x.interface}.guest"
+        ]);
+    };
   };
 }
-- 
cgit v1.2.3