From 88af6454b72fd50a88fe68d36a0037e917cd2d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 3 Dec 2025 23:11:01 +0800 Subject: [PATCH] networks: update wpa_supplicant-compat shim --- nix/networks/wpa_supplicant-compat.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nix/networks/wpa_supplicant-compat.nix b/nix/networks/wpa_supplicant-compat.nix index a4db89a7..65f130a0 100644 --- a/nix/networks/wpa_supplicant-compat.nix +++ b/nix/networks/wpa_supplicant-compat.nix @@ -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 {}).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}\""} ''; } ];