diff --git a/common.nix b/common.nix
index 2681406c..f5c64b1c 100644
--- a/common.nix
+++ b/common.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
    imports = [
@@ -52,6 +52,8 @@
       };
    };
 
+  networking.networkmanager.enable = true;
+
    hardware.pulseaudio.enable = false;
 
    security.rtkit.enable = true;
diff --git a/gpg.nix b/gpg.nix
index 0edd476d..17f0d61f 100644
--- a/gpg.nix
+++ b/gpg.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }:
 
 {
    programs = {
diff --git a/hosts/Mirkwood/configuration.nix b/hosts/Mirkwood/configuration.nix
index 4757cd8c..977a5f66 100644
--- a/hosts/Mirkwood/configuration.nix
+++ b/hosts/Mirkwood/configuration.nix
@@ -1,16 +1,12 @@
-{ config, pkgs, ... }:
+{ ... }:
 
 {
-  imports = [ ./hardware-configuration.nix ];
+  imports = [
+     ./hardware-configuration.nix
+     ../../wifi.nix
+  ];
 
-  networking = {
-     hostName = "Mirkwood";
-     networkmanager = {
-        enable = true;
-        wifi.backend = "iwd";
-     };
-     wireless.iwd.enable = true;
-  };
+  networking.hostName = "Mirkwood";
 
   boot.initrd.luks.devices."luks-cf2ca44e-d8d1-4ec8-a072-921f29ed693d".device = "/dev/disk/by-uuid/cf2ca44e-d8d1-4ec8-a072-921f29ed693d";
 }
diff --git a/wifi.nix b/wifi.nix
new file mode 100644
index 00000000..4bcd8183
--- /dev/null
+++ b/wifi.nix
@@ -0,0 +1,8 @@
+{...}:
+
+{
+  networking = {
+     networkmanager.wifi.backend = "iwd";
+     wireless.iwd.enable = true;
+  };
+}