diff --git a/hosts/pinwheel/configuration.nix b/hosts/pinwheel/configuration.nix
index 13bd45f..3b192d7 100644
--- a/hosts/pinwheel/configuration.nix
+++ b/hosts/pinwheel/configuration.nix
@@ -17,7 +17,10 @@
   users.users.alex = {
     isNormalUser = true;
     description = "alex";
-    extraGroups = [ "wheel" ];
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+    ];
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/pinwheel/modules/network/default.nix b/hosts/pinwheel/modules/network/default.nix
index 074945c..7cb08e7 100644
--- a/hosts/pinwheel/modules/network/default.nix
+++ b/hosts/pinwheel/modules/network/default.nix
@@ -1,21 +1,22 @@
+{ pkgs, ... }:
 {
-  services.connman = {
-    enable = true;
+  home-manager = {
+    users.alex = {
+      home.packages = [ pkgs.networkmanager ];
+    };
+  };
 
-    wifi = {
-      backend = "iwd";
+  networking = {
+    wireless.enable = false; # Wireless is managed by networkmanager
+
+    networkmanager = {
+      enable = true;
+
+      wifi = {
+        backend = "iwd";
+      };
     };
 
-    networkInterfaceBlacklist = [
-      "vmnet"
-      "vboxnet"
-      "virbr"
-      "ifb"
-      "ve"
-      "docker"
-      "br-"
-      "wg-"
-    ];
   };
 
   networking = {