diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 698a0d1..ceb930a 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -49,8 +49,6 @@ in {
     defaultLocale = "en_GB.UTF-8";
   };
 
-  networking.useDHCP = true;
-
   console = {
     useXkbConfig = true;
   };
@@ -92,8 +90,12 @@ in {
   };
 
   networking.firewall.trustedInterfaces = ["tailscale0"];
+  networking = {
+    networkmanager.enable = true;
+  };
 
   programs.zsh.enable = true;
+  programs.nm-applet.enable = true;
 
   services = {
     openssh.enable = true;
diff --git a/hosts/pingbox/configuration.nix b/hosts/pingbox/configuration.nix
index fd917ec..a93b66e 100644
--- a/hosts/pingbox/configuration.nix
+++ b/hosts/pingbox/configuration.nix
@@ -33,10 +33,6 @@
   networking = {
     hostName = "pingbox";
     interfaces.wlp170s0.useDHCP = true;
-    wireless = {
-      enable = true;
-      userControlled.enable = true;
-    };
   };
 
   services = {