From 6e226de54cc3b430b7d1af4e46c9cc763c88be06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Thu, 4 Sep 2025 14:23:37 +0800
Subject: [PATCH] vanadium: refactor network configuration

---
 .../vanadium/nixos/connectivity.nix           |  45 +++++++++---------
 nix/secrets/wpa_password.age                  | Bin 606 -> 660 bytes
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix
index 304aa6a9..a4293cdc 100644
--- a/nix/configurations/vanadium/nixos/connectivity.nix
+++ b/nix/configurations/vanadium/nixos/connectivity.nix
@@ -31,33 +31,25 @@
       userControlled.enable = true;
       secretsFile = config.age.secrets.wpa_password.path;
       networks = let
-        ordered = nss:
-          lib.pipe nss [
-            lib.lists.reverseList
-            (lib.lists.imap0 (i: lib.mapAttrs (_: n: n // {priority = i;})))
-            lib.mergeAttrsList
-          ];
+        orderedByGroups = networkGroups: let
+          groupsCount = builtins.length networkGroups;
+          withPriority =
+            lib.lists.imap0
+            (i: lib.mapAttrs (_: n: n // {priority = groupsCount - i;}))
+            networkGroups;
+        in
+          lib.mkMerge withPriority;
       in
-        ordered [
-          # first in list is tried first
-          {"HiddenParadize@Earth2077".pskRaw = "ext:HOME";}
+        orderedByGroups [
           {
+            "HiddenParadize@Earth2077".pskRaw = "ext:HOME";
             "Pei’s Wifi".pskRaw = "ext:PEI";
-            "estrich".pskRaw = "ext:ESTRICH";
-            "girlypop-net".pskRaw = "ext:MEOW";
+            "girlypop-net".pskRaw = "ext:GIRLYPOP";
             "annapurna".pskRaw = "ext:ANNAPURNA";
-            "5526-1".pskRaw = "ext:TYLER";
-            "A-WAY".pskRaw = "ext:AWAYCAFE";
+            "5526-1".pskRaw = "ext:5526-1";
           }
           {
-            "_SNCF_WIFI_INOUI" = {};
-            "_WIFI_LYRIA" = {};
-            "EurostarTrainsWiFi" = {};
-            "SBB-FREE" = {};
-            "AOT Airport Free Wi-Fi by NT" = {};
-          }
-          {
-            gast-ost.pskRaw = "ext:GAST_OST";
+            "A-WAY".pskRaw = "ext:A-WAY";
             eduroam = {
               authProtocols = ["WPA-EAP"];
               auth = ''
@@ -73,7 +65,16 @@
               '';
             };
           }
-          {"iPhone de Léana 江".pskRaw = "ext:PHONE";}
+          {
+            "_SNCF_WIFI_INOUI" = {};
+            "_WIFI_LYRIA" = {};
+            "EurostarTrainsWiFi" = {};
+            "SBB-FREE" = {};
+            "AOT Airport Free Wi-Fi by NT" = {};
+          }
+          {
+            "iPhone de Léana 江".pskRaw = "ext:PHONE";
+          }
         ];
     };
   };
diff --git a/nix/secrets/wpa_password.age b/nix/secrets/wpa_password.age
index 300acd3cd06b8c113756e529ab24ec7ff3b9e884..551966b0c1706da46f1d85cddd23b2c591df3d6d 100644
GIT binary patch
delta 627
zcmV-(0*w9M1e67kEPrP>P%myVY)DIVPia(nd2UEGYjibeF>O>dQcN^YdNWT_FK<v*
zYI<2~YYJ*fGet8qOL2KrV=pmLWJ^IgbVG7XFm-ooS}#X9G<s??Sut@%LUu%HO$seO
zAaiqQEoEdfH8n9gAbDpsHDW;^Xi#@pLuF<#aYu78OLj(TRew%+a(a1LcSlHYH%xF%
zW^70=LupB3P-;Xt3T|e0VnkLmWkzRXb7xmlNKZm{PenCmXl`s#OjJQRZZczdLsCja
zbZIm+3N1b$Z*@2=XL4m>b7cxST4ix)VMKLnZ#i~DO;veEd3tD2X=p`fVR|riF>z3C
zYA`}!ZfZ1QQh#}6PcmpwVP|qsF>OItaYc1zctmJp3S>D?W^qGedN*QNbuvU}NN!DL
zGDmlLLq|qqWl={jZ!czQc~C}WPjPETPIF^nMLA|ycy?xZWou4zR4{RJY6@pj3N0-y
zAWd&rctk{TS~W9cQ7}qtb68DqSVDPGVnZ-`T1HeyOMhcaYHUGANoZ<KRSGVxQrqY9
zY0BOQfjRYZiGZvWkTrk}(nRtQ!|%NH1&2-o$@sZ$>Ie-*LQlaWNdfw?8je_crj2rM
z`Q9$#wJr33$^c80DG_xd*6*Eg`C4(@n*25bog6f=RSMl{c2uBP1Yz*oya1QQnzG{M
zksV7ik8EF2xCOYj2!n`uPen%w`xClqLW~51k(vG6z(nc%LT0_=I?zhO(C@0a0NrE8
zitM+^ifzykt<stFe#wKtkpS_bUx>EL;;8$b<QaVj)H}VE3~UEOy+2)V9ZR_o`0#R%
NGld9+aPxPetZ`v~`MCf9

delta 573
zcmV-D0>b^21>OXZEPq00X=^rAVlPK)P;V<|Ohr^hcX~)NcVsbnWM)@$P<U)bFHcP|
zRyS68MG9(EYg%?RRcc{QacWpJcyVH8QBOo~LNhNlNHbYVa!+qEVN`iyIW$Nya|$g!
zAaiqQEoEdfH8n9gAbDpsHDW;^Yj9InMsYb#Q)+ibcR_e&Wq&h7Xkkx8Sv5p2a%@LA
zL{>^#IBQQ;Qh7*G3P*8GS2<R1F*r1FZ8&asaB65-Ry9&KT2whJNKZmAIZ#hdNKtYt
zNpod$3N1b$J0~w=EoX9NVRL05ayD}@eIO|;ISMsVY&k}HS3`A4SxjO#bvI6TFm+IF
zFHmzuWJ^dv3V$svEg&#&IA>LKK}~RTb5v(JYguzSb5As6Y(!8?Icsw^L}E~9baO^z
zY&b_oV+uDIJsz!`mijMMExiOYUw}gP+W6)=<7(ruR*iK^-ZPyKO9v$nrI-ENygP67
zE?pvVFX6w$x5)Lee7iuFN7*1M7hb49E%cfqQ}h|8mVbQAR8<&jSx5u#i5F~)bsa5g
zXHva&J}s2Csc;<M3|&6I`A+;;F0FyY%Nv5>iX{hH*Bp3tr!^9y`(0p6W$$mo+qg8#
zL6?yWPeZ<_-EEw#=N5ekWXfA4cZ5-51FchDb>%{Q@@r?zAm6X<Tit!kEXa3+Ixov1
zBbr<^!!`>Mc1MiczHQH9=@JqvaG1NUbmV@S9?V!cSmq7gwm{jqP_vq7t+-{9NGD2-
LLbUla#N<OX$N=DA