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

vanadium: refactor network

Browse source 
Another week yet another useless refactor.
I think it's remarkable that I managed to write nix like lisp.
Parentheses yum yum.
This commit is contained in:
Primrose 2025-09-21 12:04:19 +08:00
parent 525c5b8409
commit 6071c57007
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
1 changed files with 71 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

91
nix/configurations/vanadium/nixos/connectivity.nix
View file

@ -38,52 +38,41 @@
secretsFile = config.age.secrets.wpa_password.path; secretsFile = config.age.secrets.wpa_password.path;
scanOnLowSignal = false; scanOnLowSignal = false;
networks = let networks = let
properties = lib.flip lib.pipe;
networks = lib.flip lib.genAttrs (_: {});
# The higher the more preferred # The higher the more preferred
prio = i: lib.mapAttrs (_: conf: conf // {priority = i;}); setPrio = i: lib.mapAttrs (_: conf: conf // {priority = i;});
private = setPrio 10;
limited = setPrio (-10);
privatePrio = prio 10; extraConfig = value: conf: conf // {extraConfig = conf.extraConfig or "" + value;};
limitedDataPrio = prio (-10); randomizeMac = lib.mapAttrs (_: extraConfig "mac_addr=1\n");
roaming = lib.mapAttrs (_: extraConfig "bgscan=\"simple:30:-70:3600\"\n");
openNetworks = lib.flip lib.genAttrs (_: {}); hasPsk = let
pskNetworks = let
# wpa_supplicant uses `strchr` to seek to the first `=`, so the only forbidden character is `=`. # wpa_supplicant uses `strchr` to seek to the first `=`, so the only forbidden character is `=`.
escapePwdKey = lib.replaceStrings ["="] ["_"]; escapePwdKey = lib.replaceStrings ["="] ["_"];
in in
lib.flip lib.genAttrs (name: {pskRaw = "ext:${escapePwdKey name}";}); lib.mapAttrs (name: conf: conf // {pskRaw = "ext:${escapePwdKey conf.ssid or name}";});
in in
lib.mkMerge [ lib.mkMerge [
(privatePrio (pskNetworks [ (properties [private hasPsk]
(networks [
"HiddenParadize@Earth2077" "HiddenParadize@Earth2077"
"Pei’s Wifi" "Pei’s Wifi"
"girlypop-net" "girlypop-net"
]))
(properties [private roaming hasPsk]
(networks [
"annapurna" "annapurna"
"5526-1" "5526-1"
]))
"A-WAY"
"CAT.jpgcafe"
# TODO: Figure out how to configure networks of "same password, different ssid".
# #
# In the following documentation, bssid can be used to match # School
# Besides, is it possible to have duplicated SSID? #
# https://man.freebsd.org/cgi/man.cgi?wpa_supplicant.conf%285%29 (properties [private roaming]
"LOUISA" # 區公所
"LouisaCoffee" # 七張
"MetroTaipei x Louisa" # 大安
]))
(limitedDataPrio (pskNetworks [
"iPhone de Léana 江"
]))
(openNetworks [
"_SNCF_WIFI_INOUI"
"_WIFI_LYRIA"
"EurostarTrainsWiFi"
"SBB-FREE"
"AOT Airport Free Wi-Fi by NT"
])
# TODO: Delete this when my account is deactivated
{ {
eduroam = { eduroam = {
authProtocols = ["WPA-EAP"]; authProtocols = ["WPA-EAP"];
@ -99,15 +88,39 @@
anonymous_identity="anonymous@univ-rennes.fr" anonymous_identity="anonymous@univ-rennes.fr"
''; '';
}; };
} })
# Other per-network configuration #
# bgscan has performance penalty so we don't enable it globally # Cafés
{ #
"5526-1".extraConfig = '' (properties [private randomizeMac hasPsk]
bgscan="simple:30:-70:3600" (networks [
''; "A-WAY"
} "CAT.jpgcafe"
"LOUISA" # 區公所
"LouisaCoffee" # 七張
"MetroTaipei x Louisa" # 大安
]))
#
# Transport
#
(properties [randomizeMac]
(networks [
"_SNCF_WIFI_INOUI"
"_WIFI_LYRIA"
"EurostarTrainsWiFi"
"SBB-FREE"
"AOT Airport Free Wi-Fi by NT"
]))
#
# Phones
#
(properties [limited hasPsk]
(networks [
"iPhone de Léana 江"
]))
]; ];
}; };
}; };