diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix
index 3b8cffd..a6c31d8 100644
--- a/hosts/pinwheel/configuration.nix
+++ b/hosts/pinwheel/configuration.nix
@@ -31,29 +31,6 @@
     };
   };
 
-  services.connman = {
-    enable = true;
-
-    networkInterfaceBlacklist = [
-      "vmnet"
-      "vboxnet"
-      "virbr"
-      "ifb"
-      "ve"
-      "docker"
-      "br-"
-    ];
-  };
-
-  networking = {
-    hostName = "pinwheel";
-
-    nameservers = [
-      "1.1.1.1#one.one.one.one"
-      "1.0.0.1#one.one.one.one"
-    ];
-  };
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
diff --git a/hosts/pinwheel/modules/network/default.nix b/hosts/pinwheel/modules/network/default.nix
new file mode 100644
index 0000000..e65abf1
--- /dev/null
+++ b/hosts/pinwheel/modules/network/default.nix
@@ -0,0 +1,25 @@
+{ ... }:
+{
+  services.connman = {
+    enable = true;
+
+    networkInterfaceBlacklist = [
+      "vmnet"
+      "vboxnet"
+      "virbr"
+      "ifb"
+      "ve"
+      "docker"
+      "br-"
+    ];
+  };
+
+  networking = {
+    hostName = "pinwheel";
+
+    nameservers = [
+      "1.1.1.1#one.one.one.one"
+      "1.0.0.1#one.one.one.one"
+    ];
+  };
+}