1 files changed, 119 insertions, 67 deletions
diff --git a/nixos/routers/wifi-spt.nix b/nixos/routers/wifi-spt.nix
index 87cbd14..84527fd 100644
--- a/nixos/routers/wifi-spt.nix
+++ b/nixos/routers/wifi-spt.nix
@@ -13,6 +13,11 @@ with lib; let
       default = null;
       description = "Specify interface for ${card}";
     };
+    bssids = mkOption {
+      type = with types; listOf str;
+      default = [];
+      description = "BSSIDs for networks.";
+    };
     channel = mkOption {
       type = types.ints.positive;
       default = channelDefault;
@@ -31,83 +36,130 @@ in {
   config = mkIf cnf.enable {
     services.hostapd = {
       enable = true;
-      radios = {
-        "${cnf.ar9287.interface}" = mkIf (cnf.ar9287.interface != null) {
-          countryCode = "CZ";
-          inherit (cnf.ar9287) channel;
-          wifi4 = {
-            enable = true;
-            inherit (hostapd.qualcomAtherosAR9287.wifi4) capabilities;
-          };
-          networks = {
-            "${cnf.ar9287.interface}" = {
-              bssid = "02:f0:21:23:2b:00";
-              ssid = "TurrisRules";
-              authentication = {
-                mode = "wpa2-sha256";
-                wpaPasswordFile = "/run/secrets/hostapd-TurrisRules.pass";
-              };
+      radios =
+        mkIf (cnf.ar9287.interface != null) {
+          "${cnf.ar9287.interface}" = {
+            countryCode = "CZ";
+            inherit (cnf.ar9287) channel;
+            wifi4 = {
+              enable = true;
+              inherit (hostapd.qualcomAtherosAR9287.wifi4) capabilities;
             };
-            "${cnf.ar9287.interface}.guest" = {
-              bssid = "0a:f0:21:23:2b:00";
-              ssid = "Kocovi";
-              authentication = {
-                mode = "wpa2-sha256";
-                wpaPasswordFile = "/run/secrets/hostapd-Kocovi.pass";
+            networks = {
+              "${cnf.ar9287.interface}" = {
+                bssid = elemAt cnf.ar9287.bssids 0;
+                ssid = "TurrisRules";
+                authentication = {
+                  mode = "wpa2-sha256";
+                  wpaPasswordFile = "/run/secrets/hostapd-TurrisRules.pass";
+                };
+              };
+              "${cnf.ar9287.interface}.guest" = {
+                bssid = elemAt cnf.ar9287.bssids 1;
+                ssid = "Kocovi";
+                authentication = {
+                  mode = "wpa2-sha256";
+                  wpaPasswordFile = "/run/secrets/hostapd-Kocovi.pass";
+                };
               };
             };
           };
-        };
-        "${cnf.qca988x.interface}" = mkIf (cnf.qca988x.interface != null) {
-          countryCode = "CZ";
-          inherit (cnf.qca988x) channel;
-          band = "5g";
-          wifi4 = {
-            enable = true;
-            inherit (hostapd.qualcomAtherosQCA988x.wifi4) capabilities;
-          };
-          wifi5 = {
-            enable = true;
-            inherit (hostapd.qualcomAtherosQCA988x.wifi5) capabilities;
-          };
-          networks = {
-            "${cnf.qca988x.interface}" = {
-              bssid = "04:f0:21:24:24:d2";
-              ssid = "TurrisRules5";
-              authentication = {
-                mode = "wpa2-sha256";
-                wpaPasswordFile = "/run/secrets/hostapd-TurrisRules.pass";
-              };
+        }
+        // mkIf (cnf.qca988x.interface != null) {
+          "${cnf.qca988x.interface}" = let
+            is2g = cnf.qca988x.channel <= 14;
+          in {
+            countryCode = "CZ";
+            inherit (cnf.qca988x) channel;
+            band =
+              if is2g
+              then "2g"
+              else "5g";
+            wifi4 = {
+              enable = true;
+              inherit (hostapd.qualcomAtherosQCA988x.wifi4) capabilities;
+            };
+            wifi5 = {
+              enable = !is2g;
+              inherit (hostapd.qualcomAtherosQCA988x.wifi5) capabilities;
             };
-            "${cnf.qca988x.interface}.guest" = {
-              bssid = "0a:f0:21:24:24:d2";
-              ssid = "Kocovi";
-              authentication = {
-                mode = "wpa2-sha256";
-                wpaPasswordFile = "/run/secrets/hostapd-Kocovi.pass";
+            networks = {
+              "${cnf.qca988x.interface}" = {
+                bssid = elemAt cnf.qca988x.bssids 0;
+                ssid = "TurrisRules${
+                  if is2g
+                  then ""
+                  else "5"
+                }";
+                authentication = {
+                  mode = "wpa2-sha256";
+                  wpaPasswordFile = "/run/secrets/hostapd-TurrisRules.pass";
+                };
+              };
+              "${cnf.qca988x.interface}.guest" = {
+                bssid = elemAt cnf.qca988x.bssids 1;
+                ssid = "Kocovi";
+                authentication = {
+                  mode = "wpa2-sha256";
+                  wpaPasswordFile = "/run/secrets/hostapd-Kocovi.pass";
+                };
               };
             };
           };
         };
-      };
     };
-    systemd.network.networks = {
-      "lan-${cnf.ar9287.interface}" = {
-        matchConfig.Name = cnf.ar9287.interface;
-        networkConfig.Bridge = "brlan";
-      };
-      "lan-${cnf.ar9287.interface}.guest" = {
-        matchConfig.Name = "${cnf.ar9287.interface}.guest";
-        networkConfig.Bridge = "brguest";
-      };
-      "lan-${cnf.qca988x.interface}" = {
-        matchConfig.Name = cnf.qca988x.interface;
-        networkConfig.Bridge = "brlan";
-      };
-      "lan-${cnf.qca988x.interface}.guest" = {
-        matchConfig.Name = "${cnf.qca988x.interface}.guest";
-        networkConfig.Bridge = "brguest";
+    systemd.network.networks =
+      mkIf (cnf.ar9287.interface != null) {
+        "lan-${cnf.ar9287.interface}" = {
+          matchConfig.Name = cnf.ar9287.interface;
+          networkConfig.Bridge = "brlan";
+          bridgeVLANs = [
+            {
+              bridgeVLANConfig = {
+                EgressUntagged = 1;
+                PVID = 1;
+              };
+            }
+          ];
+        };
+        "lan-${cnf.ar9287.interface}-guest" = {
+          matchConfig.Name = "${cnf.ar9287.interface}.guest";
+          networkConfig.Bridge = "brlan";
+          bridgeVLANs = [
+            {
+              bridgeVLANConfig = {
+                EgressUntagged = 2;
+                PVID = 2;
+              };
+            }
+          ];
+        };
+      }
+      // mkIf (cnf.qca988x.interface != null) {
+        "lan-${cnf.qca988x.interface}" = {
+          matchConfig.Name = cnf.qca988x.interface;
+          networkConfig.Bridge = "brlan";
+          bridgeVLANs = [
+            {
+              bridgeVLANConfig = {
+                EgressUntagged = 1;
+                PVID = 1;
+              };
+            }
+          ];
+        };
+        "lan-${cnf.qca988x.interface}-guest" = {
+          matchConfig.Name = "${cnf.qca988x.interface}.guest";
+          networkConfig.Bridge = "brlan";
+          bridgeVLANs = [
+            {
+              bridgeVLANConfig = {
+                EgressUntagged = 2;
+                PVID = 2;
+              };
+            }
+          ];
+        };
       };
-    };
   };
 }