diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index 7fc1d476..9b3422e5 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -6,28 +6,6 @@
 }: {
   imports = [./randomWallpaper.nix ./redShift.nix];
 
-  options = {
-    alyraffauf.desktop.sway = {
-      enable =
-        lib.mkEnableOption "Enables sway with extra apps.";
-      autoSuspend = lib.mkOption {
-        description = "Whether to autosuspend on idle.";
-        default = config.alyraffauf.desktop.sway.enable;
-        type = lib.types.bool;
-      };
-      randomWallpaper = lib.mkOption {
-        description = "Whether to enable random wallpaper script.";
-        default = config.alyraffauf.desktop.sway.enable;
-        type = lib.types.bool;
-      };
-      redShift = lib.mkOption {
-        description = "Whether to redshift display colors at night.";
-        default = config.alyraffauf.desktop.sway.enable;
-        type = lib.types.bool;
-      };
-    };
-  };
-
   config = lib.mkIf config.alyraffauf.desktop.sway.enable {
     wayland.windowManager.sway = {
       enable = true;
diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index a063e6b4..17c529f8 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -234,6 +234,28 @@
             };
           };
         };
+        sway = {
+          enable = lib.mkOption {
+            description = "Sway with full desktop session components.";
+            default = osConfig.alyraffauf.desktop.sway.enable;
+            type = lib.types.bool;
+          };
+          autoSuspend = lib.mkOption {
+            description = "Whether to autosuspend on idle.";
+            default = config.alyraffauf.desktop.sway.enable;
+            type = lib.types.bool;
+          };
+          randomWallpaper = lib.mkOption {
+            description = "Whether to enable random wallpaper script.";
+            default = config.alyraffauf.desktop.sway.enable;
+            type = lib.types.bool;
+          };
+          redShift = lib.mkOption {
+            description = "Whether to redshift display colors at night.";
+            default = config.alyraffauf.desktop.sway.enable;
+            type = lib.types.bool;
+          };
+        };
         startupApps = lib.mkOption {
           description = "Apps to launch at startup";
           default = [];
diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix
index d3e3e409..934a43d4 100644
--- a/hosts/lavaridge/default.nix
+++ b/hosts/lavaridge/default.nix
@@ -40,7 +40,6 @@
         enable = true;
         password = "$y$j9T$NSS7QcEtN4yiigPyofwlI/$nxdgz0lpySa0heDMjGlHe1gX3BWf48jK6Tkfg4xMEs6";
       };
-      dustin.enable = false;
     };
     desktop = {
       enable = true;
@@ -53,7 +52,6 @@
         };
       };
       hyprland.enable = true;
-      sway.enable = true;
     };
     apps = {
       steam.enable = true;
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index ddf8c4f7..b71eda81 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -36,7 +36,6 @@
         enable = true;
         password = "$y$j9T$TitXX3J690cnK41XciNMg/$APKHM/os6FKd9H9aXGxaHaQ8zP5SenO9EO94VYafl43";
       };
-      dustin.enable = false;
     };
     desktop = {
       enable = true;
@@ -49,7 +48,6 @@
         };
       };
       hyprland.enable = true;
-      sway.enable = true;
     };
     apps = {
       steam.enable = true;
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index eb4930b8..58ff3e8d 100644
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@@ -36,7 +36,6 @@
         enable = true;
         password = "$y$j9T$VdtiEyMOegHpcUwgmCVFD0$K8Ne6.zk//VJNq2zxVQ0xE0Wg3LohvAQd3Xm9aXdM15";
       };
-      dustin.enable = false;
     };
     desktop = {
       enable = true;
@@ -48,12 +47,8 @@
           user = "aly";
         };
       };
-      sway.enable = false;
       hyprland.enable = true;
     };
-    apps = {
-      steam.enable = false;
-    };
     scripts = {
       hoenn.enable = true;
     };