diff --git a/archachatina.nix b/archachatina.nix
index 026dcda..4284150 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -16,6 +16,7 @@
       ./huion.nix
       ./rtl8761b.nix
       ./unstable-nix.nix
+      ./nm-restart.nix
     ];
 
   environment.etc."lvm/lvm.conf".text = ''
diff --git a/decoysnail.nix b/decoysnail.nix
index ee91b62..f0d4683 100644
--- a/decoysnail.nix
+++ b/decoysnail.nix
@@ -12,6 +12,7 @@
       ./v4l2loopback.nix
       ./huion.nix
       ./nvim05.nix
+      ./nm-restart.nix
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
@@ -112,6 +113,4 @@
     subpixel.rgba = "none";
   };
 
-  systemd.services.NetworkManager.restartIfChanged = false;
-  systemd.services.NetworkManager-dispatcher.restartIfChanged = false;
 }
diff --git a/flammea.nix b/flammea.nix
index dc32589..0e33a34 100644
--- a/flammea.nix
+++ b/flammea.nix
@@ -15,6 +15,7 @@
       ./huion.nix
       ./spacenav.nix
       ./nvim05.nix
+      ./nm-restart.nix
     ];
 
   hardware.enableRedistributableFirmware = true;
diff --git a/nm-restart.nix b/nm-restart.nix
new file mode 100644
index 0000000..b8b1102
--- /dev/null
+++ b/nm-restart.nix
@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  systemd.services.NetworkManager.restartIfChanged = false;
+  systemd.services.NetworkManager-dispatcher.restartIfChanged = false;
+  systemd.services.NetworkManager-wait-online.restartIfChanged = false;
+  systemd.services.wpa_supplicant.restartIfChanged = false;
+}
diff --git a/petalius.nix b/petalius.nix
index 5d41b4e..0a0af70 100644
--- a/petalius.nix
+++ b/petalius.nix
@@ -13,6 +13,7 @@
       ./v4l2loopback.nix
       ./huion.nix
       ./nvim05.nix
+      ./nm-restart.nix
     ];
 
   hardware.enableRedistributableFirmware = true;
@@ -155,8 +156,4 @@
 
   services.fwupd.enable = true;
 
-  systemd.services.NetworkManager.restartIfChanged = false;
-  systemd.services.NetworkManager-dispatcher.restartIfChanged = false;
-  systemd.services.wpa_supplicant.restartIfChanged = false;
-
 }