diff --git a/nix/networks/list.nix b/nix/networks/list.nix index 87ed22f5..8095998f 100644 --- a/nix/networks/list.nix +++ b/nix/networks/list.nix @@ -85,6 +85,10 @@ in ssid = "R802"; randomizeMac = true; } + { + ssid = "R1108"; + randomizeMac = true; + } { ssid = "_SNCF_WIFI_INOUI"; } { ssid = "_WIFI_LYRIA"; } diff --git a/nix/networks/wpa_supplicant-compat.nix b/nix/networks/wpa_supplicant-compat.nix index 02c2c26c..a4db89a7 100644 --- a/nix/networks/wpa_supplicant-compat.nix +++ b/nix/networks/wpa_supplicant-compat.nix @@ -15,6 +15,8 @@ let hasPassword ? false, scanOnLowSignal ? false, randomizeMac ? false, + # TODO: adapt to the 25.11 interface + bssid ? null, ... }: { @@ -24,20 +26,18 @@ let "hasPassword" "scanOnLowSignal" "randomizeMac" + "bssid" ]) (lib.optionalAttrs hasPassword { pskRaw = "ext:${escapePwdKey ssid}"; }) - (lib.optionalAttrs scanOnLowSignal { + { extraConfig = '' - bgscan="simple:30:-70:3600" + ${lib.optionalString scanOnLowSignal "bgscan=\"simple:30:-70:3600\""} + ${lib.optionalString randomizeMac "mac_addr=1"} + ${lib.optionalString (bssid != null) "bssid=\"${bssid}\""} ''; - }) - (lib.optionalAttrs randomizeMac { - extraConfig = '' - mac_addr=1 - ''; - }) + } ]; }; in