diff --git a/sets/laptop.nix b/sets/laptop.nix
index 7940fe9..78d9891 100644
--- a/sets/laptop.nix
+++ b/sets/laptop.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ./networkmanager.nix
+    ./wifi.nix
   ];
 
   services = {
diff --git a/sets/networkmanager.nix b/sets/networkmanager.nix
deleted file mode 100644
index 0898feb..0000000
--- a/sets/networkmanager.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ ... }:
-{
-  networking.networkmanager = {
-    enable = true;
-    ethernet.macAddress = "random";
-    wifi.macAddress = "random";
-  };
-  users.users.artemis.extraGroups = [ "networkmanager" ];
-}
diff --git a/sets/wifi.nix b/sets/wifi.nix
new file mode 100644
index 0000000..866c5d0
--- /dev/null
+++ b/sets/wifi.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+  networking.wireless.iwd.enable = true;
+  environment.etc."iwd/main.conf".text = ''
+    [General]
+    AddressRandomization=network
+  '';
+}
diff --git a/system/mistmane/default.nix b/system/mistmane/default.nix
index be4d478..e5e3d5b 100644
--- a/system/mistmane/default.nix
+++ b/system/mistmane/default.nix
@@ -7,7 +7,7 @@
     ../../externals/wip-pinebook-pro/pinebook_pro.nix
     ../../sets/neovim
     ../../sets/sway.nix
-    ../../sets/networkmanager.nix
+    ../../sets/wifi.nix
   ];
 
   networking.hostName = "mistmane";