diff --git a/default.nix b/default.nix
index 430ca72..e15912e 100644
--- a/default.nix
+++ b/default.nix
@@ -10,6 +10,7 @@ in {
     ./modules/dev-shell.nix
     ./modules/editor.nix
     ./modules/passwordless-sudo.nix
+    ./modules/wireless.nix
     ./modules/toolkits/development.nix
     ./modules/toolkits/files.nix
     ./modules/toolkits/infrastructure.nix
diff --git a/hosts/ava/default.nix b/hosts/ava/default.nix
index 64d67c5..a8872e9 100644
--- a/hosts/ava/default.nix
+++ b/hosts/ava/default.nix
@@ -13,11 +13,6 @@
   networking = {
     interfaces.wlp0s20f3.useDHCP = true;
     useDHCP = false; # Deprecated option - explicitly opt out.
-
-    wireless = {
-      enable = true;
-      interfaces = [ "wlp0s20f3" ];
-    };
   };
 
   # TODO: Manage background images more intelligently.
diff --git a/modules/wireless.nix b/modules/wireless.nix
new file mode 100644
index 0000000..d6b26d0
--- /dev/null
+++ b/modules/wireless.nix
@@ -0,0 +1,21 @@
+{ config, unstable, lib, ... }:
+
+let
+  df = config.dotfiles;
+  cfg = df.wireless;
+
+in {
+  options.dotfiles.wireless = with lib; {
+    enable = mkOption {
+      type = types.bool;
+      description = "Enable wireless networking utilities";
+      default = df.kitchen-sink.enable;
+    };
+  };
+
+  config = with lib; {
+    networking.networkmanager.enable = cfg.enable;
+    users.users.${df.user.account}.extraGroups =
+      mkIf cfg.enable [ "networkmanager" ];
+  };
+}