vanadium: refactor network configuration

nix/configurations/vanadium/nixos/connectivity.nix

@@ -31,33 +31,25 @@
       userControlled.enable = true;
       secretsFile = config.age.secrets.wpa_password.path;
       networks = let
-        ordered = nss:
+        orderedByGroups = networkGroups: let
-          lib.pipe nss [
+          groupsCount = builtins.length networkGroups;
-            lib.lists.reverseList
+          withPriority =
-            (lib.lists.imap0 (i: lib.mapAttrs (_: n: n // {priority = i;})))
+            lib.lists.imap0
-            lib.mergeAttrsList
+            (i: lib.mapAttrs (_: n: n // {priority = groupsCount - i;}))
-          ];
+            networkGroups;
+        in
+          lib.mkMerge withPriority;
       in
-        ordered [
+        orderedByGroups [
-          # first in list is tried first
-          {"HiddenParadize@Earth2077".pskRaw = "ext:HOME";}
           {
+            "HiddenParadize@Earth2077".pskRaw = "ext:HOME";
             "Pei’s Wifi".pskRaw = "ext:PEI";
-            "estrich".pskRaw = "ext:ESTRICH";
+            "girlypop-net".pskRaw = "ext:GIRLYPOP";
-            "girlypop-net".pskRaw = "ext:MEOW";
             "annapurna".pskRaw = "ext:ANNAPURNA";
-            "5526-1".pskRaw = "ext:TYLER";
+            "5526-1".pskRaw = "ext:5526-1";
-            "A-WAY".pskRaw = "ext:AWAYCAFE";
           }
           {
-            "_SNCF_WIFI_INOUI" = {};
+            "A-WAY".pskRaw = "ext:A-WAY";
-            "_WIFI_LYRIA" = {};
-            "EurostarTrainsWiFi" = {};
-            "SBB-FREE" = {};
-            "AOT Airport Free Wi-Fi by NT" = {};
-          }
-          {
-            gast-ost.pskRaw = "ext:GAST_OST";
             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";
+          }
         ];
     };
   };