diff --git a/enviroments/client/default.nix b/enviroments/client/default.nix
index f1de375..56f5422 100644
--- a/enviroments/client/default.nix
+++ b/enviroments/client/default.nix
@@ -1,7 +1,5 @@
 {pkgs, ...}: {
-  imports = [
-    ../common
-  ];
+  imports = [];
 
   environment.systemPackages = with pkgs; [
     cachefilesd
diff --git a/enviroments/common/default.nix b/enviroments/common/default.nix
deleted file mode 100644
index d6d44ed..0000000
--- a/enviroments/common/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{...}: {
-  # Enable networking
-  networking.networkmanager.enable = true;
-}
diff --git a/enviroments/server/default.nix b/enviroments/server/default.nix
index 4cd45ff..8614e36 100644
--- a/enviroments/server/default.nix
+++ b/enviroments/server/default.nix
@@ -12,9 +12,7 @@
   httpsPort = 443;
   isDebug = false;
 in {
-  imports = [
-    ../common
-  ];
+  imports = [];
 
   options = {
     apps = {
diff --git a/hosts/defiant/hardware-configuration.nix b/hosts/defiant/hardware-configuration.nix
index c84a9b4..ce994d9 100644
--- a/hosts/defiant/hardware-configuration.nix
+++ b/hosts/defiant/hardware-configuration.nix
@@ -184,6 +184,8 @@
     };
   };
 
+  networking.networkmanager.enable = true;
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware = {
     # TODO: hardware graphics
diff --git a/hosts/horizon/hardware-configuration.nix b/hosts/horizon/hardware-configuration.nix
index ed6246a..9b4074d 100644
--- a/hosts/horizon/hardware-configuration.nix
+++ b/hosts/horizon/hardware-configuration.nix
@@ -87,6 +87,7 @@
   ];
 
   networking = {
+    networkmanager.enable = true;
     useDHCP = lib.mkDefault true;
     hostName = "horizon"; # Define your hostname.
   };
diff --git a/hosts/twilight/hardware-configuration.nix b/hosts/twilight/hardware-configuration.nix
index fe2353b..f1cd73f 100644
--- a/hosts/twilight/hardware-configuration.nix
+++ b/hosts/twilight/hardware-configuration.nix
@@ -69,6 +69,7 @@
   swapDevices = [];
 
   networking = {
+    networkmanager.enable = true;
     # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
     # (the default) this is the recommended approach. When using systemd-networkd it's
     # still possible to use this option, but it's recommended to use it in conjunction