diff options
| -rw-r--r-- | config/networking/default.nix | 7 | ||||
| -rw-r--r-- | config/networking/services/ap.nix | 14 |
2 files changed, 12 insertions, 9 deletions
diff --git a/config/networking/default.nix b/config/networking/default.nix index d1546d2..409ce3b 100644 --- a/config/networking/default.nix +++ b/config/networking/default.nix @@ -65,11 +65,6 @@ in { machines.self.mac = "02:f0:21:b6:11:fc"; bridges = ["iot"]; }; - wlp5s0-iot = { - device = "wlp5s0"; - machines.self.mac = "02:f0:21:b2:61:09"; - bridges = ["iot"]; - }; wlp5s0-guest = { device = "wlp5s0"; machines.self.mac = "06:f0:21:b2:61:09"; @@ -86,7 +81,7 @@ in { machines.self.ip = "192.168.2.1"; }; iot = { - interfaces = ["wlp1s0-iot" "wlp5s0-iot"]; + interfaces = ["wlp1s0-iot"]; subnet = { prefix = "192.168.3"; prefixLength = 24; diff --git a/config/networking/services/ap.nix b/config/networking/services/ap.nix index 2248f5d..5771821 100644 --- a/config/networking/services/ap.nix +++ b/config/networking/services/ap.nix @@ -19,7 +19,7 @@ iface = radio + lib.optionalString (bridge != "wan") "-${bridge}"; in { "${iface}" = { - ssid = ssids."${bridge}" + lib.optionalString (radio == "wlp5s0" && bridge != "guest") " (n)"; + ssid = ssids."${bridge}" + lib.optionalString (radio == "wlp5s0" && bridge != "guest") " (2.4GHz)"; bssid = ifaces."${iface}".machines.self.mac; authentication.mode = "wpa3-sae"; @@ -104,7 +104,16 @@ in { networks = let perBridgeAC = perBridgeCfg "wlp1s0"; in - (perBridgeAC "wan") // (perBridgeAC "iot"); + lib.mkMerge [ + (perBridgeAC "wan") + (perBridgeAC "iot") + { + wlp1s0-iot.authentication = { + mode = lib.mkForce "wpa3-sae-transition"; + wpaPskFile = "/etc/hostapd/iot.psk"; + }; + } + ]; }; wlp5s0 = { inherit countryCode driver settings; @@ -120,7 +129,6 @@ in { perBridgeN = perBridgeCfg "wlp5s0"; in (perBridgeN "wan") - // (perBridgeN "iot") // (perBridgeN "guest"); }; }; |