networks: update wpa_supplicant-compat shim

This commit is contained in:
Primrose 2025-12-03 23:11:01 +08:00
parent 42b32be4a5
commit 88af6454b7
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA

View file

@ -1,6 +1,8 @@
#
# This loads the list of networks as a NixOS wpa_supplicant compatible attrset
#
# View the example config
# less $(nix-build --no-out-link -E '(import <nixpkgs> {}).wpa_supplicant')/share/doc/wpa_supplicant/wpa_supplicant.conf.example
let
sources = import ../../npins;
lib = import (sources.nixpkgs + "/lib");
@ -15,18 +17,16 @@ let
hasPassword ? false,
scanOnLowSignal ? false,
randomizeMac ? false,
# TODO: adapt to the 25.11 interface
bssid ? null,
...
}:
{
${ssid} = lib.mkMerge [
(builtins.removeAttrs networkArgs [
"ssid"
# We keep ssid, because it overrides the attrset name ssid
# "ssid"
"hasPassword"
"scanOnLowSignal"
"randomizeMac"
"bssid"
])
(lib.optionalAttrs hasPassword {
pskRaw = "ext:${escapePwdKey ssid}";
@ -35,7 +35,6 @@ let
extraConfig = ''
${lib.optionalString scanOnLowSignal "bgscan=\"simple:30:-70:3600\""}
${lib.optionalString randomizeMac "mac_addr=1"}
${lib.optionalString (bssid != null) "bssid=\"${bssid}\""}
'';
}
];