diff --git a/nix/system/linux.nix b/nix/system/linux.nix
index e8a2218..78d96ee 100644
--- a/nix/system/linux.nix
+++ b/nix/system/linux.nix
@@ -5,6 +5,11 @@
   ];
 
   programs = {
+    xwayland.enable = true;
+    sway = {
+      enable = true;
+      package = pkgs.swayfx;
+    };
     zsh.enable = true;
   };
 
diff --git a/nix/system/linux_aarch.nix b/nix/system/linux_aarch.nix
index 710e2ac..9789c21 100644
--- a/nix/system/linux_aarch.nix
+++ b/nix/system/linux_aarch.nix
@@ -4,13 +4,6 @@
     apple-silicon-support.nixosModules.apple-silicon-support
   ];
 
-  programs = {
-    sway = {
-      enable = true;
-      package = pkgs.swayfx;
-    };
-  };
-
   boot = {
     kernelParams = [ "apple_dcp.show_notch=0" ];
     loader.efi.canTouchEfiVariables = false;
diff --git a/nix/system/linux_x86.nix b/nix/system/linux_x86.nix
index 998ccec..88ad3e3 100644
--- a/nix/system/linux_x86.nix
+++ b/nix/system/linux_x86.nix
@@ -15,14 +15,9 @@
   networking.hostName = "walnut-nixos";
 
   programs = {
-    xwayland.enable = true;
-    sway = {
-      enable = true;
-      package = pkgs.swayfx;
-      extraOptions = [
-        "--unsupported-gpu"
-      ];
-    };
+    sway.extraOptions = [
+      "--unsupported-gpu"
+    ];
     steam.enable = true;
   };
 }