primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2026-02-01 14:39:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

networks: fix ordering and add new network

Browse source
This commit is contained in:
Primrose 2025-12-13 21:40:39 +08:00
parent a1dd3560b7
commit 161a228bd5
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
3 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nix/networks/list.nix
View file

@ -81,6 +81,13 @@ in
hasPassword = true;
randomizeMac = true;
}
{
ssid = "LouisaCoffee";
bssid = "fa:92:bf:62:7c:19";
priority = privatePriority;
hasPassword = true;
randomizeMac = true;
}
{
ssid = "MetroTaipei x Louisa"; # 大安
priority = privatePriority;

46
nix/networks/wpa_supplicant-compat.nix
View file

@ -20,28 +20,32 @@ let
randomizeMac ? false,
...
}:
let
uniqueKey = "${ssid}${lib.optionalString (bssid != null) bssid}";
in
{
${uniqueKey} # we use a unique key here to make sure no "same ssid different bssid" networks collide in key.
=
lib.mkMerge [
(builtins.removeAttrs networkArgs [
"hasPassword"
"scanOnLowSignal"
"randomizeMac"
])
(lib.optionalAttrs hasPassword {
pskRaw = "ext:${escapePwdKey uniqueKey}"; # this implies changing the external password key if you set a bssid!
})
{
extraConfig = ''
${lib.optionalString scanOnLowSignal "bgscan=\"simple:30:-70:3600\""}
${lib.optionalString randomizeMac "mac_addr=1"}
'';
}
];
${
# We use a unique key here to make sure no "same ssid different bssid" networks collide in key.
# This is ordered, we still show "null" so that it would come after hex characters [a-z0-9].
# The serialization is based on string order.
"${ssid},${if bssid != null then bssid else "null"}"
} =
lib.mkMerge [
(builtins.removeAttrs networkArgs [
"hasPassword"
"scanOnLowSignal"
"randomizeMac"
])
(lib.optionalAttrs hasPassword {
pskRaw = "ext:${
# this implies changing the external password key if you set a bssid!
escapePwdKey (if bssid == null then ssid else "${ssid},${bssid}")
}";
})
{
extraConfig = ''
${lib.optionalString scanOnLowSignal "bgscan=\"simple:30:-70:3600\""}
${lib.optionalString randomizeMac "mac_addr=1"}
'';
}
];
};
in
ns: lib.mkMerge (map go ns)