diff --git a/nix/configurations/vanadium/nixos/connectivity.nix b/nix/configurations/vanadium/nixos/connectivity.nix
index 7c54f9ce..2e8e5e29 100644
--- a/nix/configurations/vanadium/nixos/connectivity.nix
+++ b/nix/configurations/vanadium/nixos/connectivity.nix
@@ -41,9 +41,6 @@
         # wpa_supplicant uses `strchr` to seek to the first `=`, so the only forbidden character is `=`.
         escapePwdKey = lib.replaceStrings ["="] ["_"];
 
-        privatePriority = 10;
-        limitedPriority = -10;
-
         fromList = ns: let
           go = networkArgs @ {
             ssid,
@@ -73,100 +70,7 @@
         in
           lib.mkMerge (map go ns);
       in
-        fromList [
-          {
-            ssid = "~";
-            priority = privatePriority;
-            hasPassword = true;
-          }
-          {
-            ssid = "Pei’s Wifi";
-            priority = privatePriority;
-            hasPassword = true;
-          }
-          {
-            ssid = "girlypop-net";
-            priority = privatePriority;
-            hasPassword = true;
-          }
-
-          {
-            ssid = "annapurna";
-            priority = privatePriority;
-            hasPassword = true;
-            scanOnLowSignal = true;
-          }
-          {
-            ssid = "5526-1"; # TODO: set bssid preference ?
-            priority = privatePriority;
-            hasPassword = true;
-            scanOnLowSignal = true;
-          }
-
-          {
-            ssid = "eduroam";
-            priority = privatePriority;
-            scanOnLowSignal = true;
-
-            authProtocols = ["WPA-EAP"];
-            auth = ''
-              pairwise=CCMP
-              group=CCMP TKIP
-              eap=PEAP
-              ca_cert="${./certs/universite_de_rennes.pem}"
-              identity="ychiang@etudiant.univ-rennes.fr"
-              altsubject_match="DNS:radius.univ-rennes1.fr;DNS:radius1.univ-rennes1.fr;DNS:radius2.univ-rennes1.fr;DNS:vmradius-psf1.univ-rennes1.fr;DNS:vmradius-psf2.univ-rennes1.fr"
-              phase2="auth=MSCHAPV2"
-              password=ext:EDUROAM
-              anonymous_identity="anonymous@univ-rennes.fr"
-            '';
-          }
-
-          {
-            ssid = "A-WAY";
-            priority = privatePriority;
-            hasPassword = true;
-            randomizeMac = true;
-          }
-          {
-            ssid = "CAT.jpgcafe";
-            priority = privatePriority;
-            hasPassword = true;
-            randomizeMac = true;
-          }
-          {
-            ssid = "LOUISA"; # 區公所
-            priority = privatePriority;
-            hasPassword = true;
-            randomizeMac = true;
-          }
-          {
-            ssid = "LouisaCoffee"; # 七張
-            priority = privatePriority;
-            hasPassword = true;
-            randomizeMac = true;
-          }
-          {
-            ssid = "MetroTaipei x Louisa"; # 大安
-            priority = privatePriority;
-            hasPassword = true;
-            randomizeMac = true;
-          }
-
-          {ssid = "_SNCF_WIFI_INOUI";}
-          {ssid = "_WIFI_LYRIA";}
-          {ssid = "EurostarTrainsWiFi";}
-          {ssid = "SBB-FREE";}
-          {ssid = "AOT Airport Free Wi-Fi by NT";}
-          {ssid = "NewTaipei";}
-          {ssid = "Fami-WiFi";}
-
-          {
-            ssid = "iPhone de Léana 江";
-            priority = limitedPriority;
-            hasPassword = true;
-          }
-        ];
+        fromList (import ./connectivity/networks.nix);
     };
   };
 
@@ -216,13 +120,13 @@
             (builtins.map (x: builtins.elemAt (lib.splitString " " x) 1)) # remove 0.0.0.0
           ];
 
-          hategroup-list = lib.pipe (builtins.readFile "${sources.hategroup-blocklist}/blocklist.txt") [
+          hategroup_list = lib.pipe (builtins.readFile "${sources.hategroup-blocklist}/blocklist.txt") [
             (lib.replaceStrings ["\r\n"] ["\n"]) # convert to unix ending just in case
             (lib.splitString "\n")
             (builtins.filter (x: ! (x == "" || lib.hasPrefix "#" x)))
           ];
 
-          combined_lists = ai_list ++ hategroup-list;
+          combined_lists = ai_list ++ hategroup_list;
         in
           pkgs.writeText "dnsblocklist" (builtins.concatStringsSep "\n" combined_lists);
       };
diff --git a/nix/configurations/vanadium/nixos/connectivity/networks.nix b/nix/configurations/vanadium/nixos/connectivity/networks.nix
new file mode 100644
index 00000000..e603f0e2
--- /dev/null
+++ b/nix/configurations/vanadium/nixos/connectivity/networks.nix
@@ -0,0 +1,97 @@
+let
+  privatePriority = 10;
+  limitedPriority = -10;
+in [
+  {
+    ssid = "~";
+    priority = privatePriority;
+    hasPassword = true;
+  }
+  {
+    ssid = "Pei’s Wifi";
+    priority = privatePriority;
+    hasPassword = true;
+  }
+  {
+    ssid = "girlypop-net";
+    priority = privatePriority;
+    hasPassword = true;
+  }
+
+  {
+    ssid = "annapurna";
+    priority = privatePriority;
+    hasPassword = true;
+    scanOnLowSignal = true;
+  }
+  {
+    ssid = "5526-1"; # TODO: set bssid preference ?
+    priority = privatePriority;
+    hasPassword = true;
+    scanOnLowSignal = true;
+  }
+
+  {
+    ssid = "eduroam";
+    priority = privatePriority;
+    scanOnLowSignal = true;
+
+    authProtocols = ["WPA-EAP"];
+    auth = ''
+      pairwise=CCMP
+      group=CCMP TKIP
+      eap=PEAP
+      ca_cert="${./universite_de_rennes.pem}"
+      identity="ychiang@etudiant.univ-rennes.fr"
+      altsubject_match="DNS:radius.univ-rennes1.fr;DNS:radius1.univ-rennes1.fr;DNS:radius2.univ-rennes1.fr;DNS:vmradius-psf1.univ-rennes1.fr;DNS:vmradius-psf2.univ-rennes1.fr"
+      phase2="auth=MSCHAPV2"
+      password=ext:EDUROAM
+      anonymous_identity="anonymous@univ-rennes.fr"
+    '';
+  }
+
+  {
+    ssid = "A-WAY";
+    priority = privatePriority;
+    hasPassword = true;
+    randomizeMac = true;
+  }
+  {
+    ssid = "CAT.jpgcafe";
+    priority = privatePriority;
+    hasPassword = true;
+    randomizeMac = true;
+  }
+  {
+    ssid = "LOUISA"; # 區公所
+    priority = privatePriority;
+    hasPassword = true;
+    randomizeMac = true;
+  }
+  {
+    ssid = "LouisaCoffee"; # 七張
+    priority = privatePriority;
+    hasPassword = true;
+    randomizeMac = true;
+  }
+  {
+    ssid = "MetroTaipei x Louisa"; # 大安
+    priority = privatePriority;
+    hasPassword = true;
+    randomizeMac = true;
+  }
+
+  {ssid = "_SNCF_WIFI_INOUI";}
+  {ssid = "_WIFI_LYRIA";}
+  {ssid = "EurostarTrainsWiFi";}
+  {ssid = "SBB-FREE";}
+  {ssid = "AOT Airport Free Wi-Fi by NT";}
+  {ssid = "NewTaipei";}
+  {ssid = "Fami-WiFi";}
+
+  {
+    ssid = "iPhone de Léana 江";
+    priority = limitedPriority;
+    hasPassword = true;
+  }
+]
diff --git a/nix/configurations/vanadium/nixos/certs/universite_de_rennes.pem b/nix/configurations/vanadium/nixos/connectivity/universite_de_rennes.pem
similarity index 100%
rename from nix/configurations/vanadium/nixos/certs/universite_de_rennes.pem
rename to nix/configurations/vanadium/nixos/connectivity/universite_de_rennes.pem