iron: fix connectivity issues

nix/configurations/iron/nixos/connectivity.nix

@@ -26,41 +26,12 @@
       userControlled.enable = true;
       secretsFile = config.age.secrets.wpa_password.path;
       scanOnLowSignal = false;
-      networks = let
-        # wpa_supplicant uses `strchr` to seek to the first `=`, so the only forbidden character is `=`.
-        escapePwdKey = lib.replaceStrings ["="] ["_"];
-
-        fromList = ns: let
-          go = networkArgs @ {
-            ssid,
-            # Custom fields wrapping nixpkgs module options
-            hasPassword ? false,
-            scanOnLowSignal ? false,
-            randomizeMac ? false,
-            ...
-          }: {
-            ${ssid} = lib.mkMerge [
-              (builtins.removeAttrs networkArgs ["ssid" "hasPassword" "scanOnLowSignal" "randomizeMac"])
-              (lib.optionalAttrs hasPassword {
-                pskRaw = "ext:${escapePwdKey ssid}";
-              })
-              (lib.optionalAttrs scanOnLowSignal {
-                extraConfig = ''
-                  bgscan="simple:30:-70:3600"
-                '';
-              })
-              (lib.optionalAttrs randomizeMac {
-                extraConfig = ''
-                  mac_addr=1
-                '';
-              })
-            ];
-          };
+      networks =
+        let
+          fromList = import ../../../networks/wpa_supplicant-compat.nix;
+          networks = import ../../../networks/list.nix;
         in
-          lib.mkMerge (map go ns);
-      in
-        # TODO: move this upward like identities
-        fromList (import ./connectivity/networks.nix);
+        fromList networks;
     };
   };