diff --git a/hosts/samhain/home/sway.nix b/hosts/samhain/home/sway.nix
index 387e796e..ffb472ba 100644
--- a/hosts/samhain/home/sway.nix
+++ b/hosts/samhain/home/sway.nix
@@ -1,4 +1,53 @@
-{ config, pkgs, ... }: {
-  wayland.windowManager.sway.config.startup =
-    [{ command = "${pkgs.ckb-next}/bin/ckb-next -b"; }];
+{ config, pkgs, ... }:
+
+{
+  wayland.windowManager.sway = {
+    config = {
+      startup = [{ command = "${pkgs.ckb-next}/bin/ckb-next -b"; }];
+
+      output = let
+        left = {
+          res = "1920x1080";
+          pos = "0 0";
+          bg = "${../../../private/files/wallpapers/left.jpg} fill";
+        };
+        middle = {
+          res = "1920x1080";
+          pos = "1920 0";
+          bg = "${../../../private/files/wallpapers/main.png} fill";
+        };
+        right = {
+          res = "1920x1080";
+          pos = "3840 0";
+          bg = "${../../../private/files/wallpapers/right.jpg}  fill";
+        };
+      in {
+        "DP-1" = left;
+        "DVI-D-1" = right;
+        "HDMI-A-1" = middle;
+      };
+
+      input = {
+        "5824:1503:screenstub-tablet" = { events = "disabled"; };
+        "5824:1503:screenstub-mouse" = { events = "disabled"; };
+        "5824:1503:screenstub-kbd" = { events = "disabled"; };
+        "1386:215:Wacom_BambooPT_2FG_Small_Pen" = {
+          map_to_output = "HDMI-A-1";
+        };
+        "1386:215:Wacom_BambooPT_2FG_Small_Finger" = {
+          natural_scroll = "enabled";
+          middle_emulation = "enabled";
+          tap = "enabled";
+          dwt = "enabled";
+          accel_profile = "flat";
+          pointer_accel = "0.05";
+        };
+      };
+    };
+    extraConfig = ''
+      workspace "1" output "DP-1"
+      workspace "11:F1" output "HDMI-A-1"
+      workspace "12:F2" output "DVI-D-1"
+    '';
+  };
 }
diff --git a/hosts/yule/home/sway.nix b/hosts/yule/home/sway.nix
index c915eb0a..bf2cc104 100644
--- a/hosts/yule/home/sway.nix
+++ b/hosts/yule/home/sway.nix
@@ -1 +1,23 @@
-{ ... }: { }
+{ config, pkgs, ... }:
+
+{
+  wayland.windowManager.sway.config = {
+    output = let
+      laptop = {
+        res = "1920x1080";
+        pos = "0 0";
+        bg = "${../../../private/files/wallpapers/main.png} fill";
+      };
+    in { "eDP-1" = laptop; };
+
+    input = {
+      "1739:33362:Synaptics_TM3336-002" = {
+        dwt = "enabled";
+        tap = "enabled";
+        natural_scroll = "enabled";
+        middle_emulation = "enabled";
+        click_method = "clickfinger";
+      };
+    };
+  };
+}
diff --git a/profiles/sway/home/sway.nix b/profiles/sway/home/sway.nix
index 6e7fda7e..3431bde4 100644
--- a/profiles/sway/home/sway.nix
+++ b/profiles/sway/home/sway.nix
@@ -78,62 +78,7 @@
     in {
       bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
 
-      output = let
-        left = {
-          res = "1920x1080";
-          pos = "0 0";
-          bg = "${../../../private/files/wallpapers/left.jpg} fill";
-        };
-        middle = {
-          res = "1920x1080";
-          pos = "1920 0";
-          bg = "${../../../private/files/wallpapers/main.png} fill";
-        };
-        right = {
-          res = "1920x1080";
-          pos = "3840 0";
-          bg = "${../../../private/files/wallpapers/right.jpg}  fill";
-        };
-        laptop = {
-          res = "1920x1080";
-          pos = "0 0";
-          bg = "${../../../private/files/wallpapers/main.png} fill";
-        };
-        mbp = {
-          res = "1280x800";
-          pos = "0 0";
-          bg = "${../../../private/files/wallpapers/main.png} fill";
-        };
-      in {
-        "DP-1" = left;
-        "DVI-D-1" = right;
-        "HDMI-A-1" = middle;
-        "eDP-1" = laptop;
-        "LVDS-1" = mbp;
-      };
-
       input = {
-        "1739:33362:Synaptics_TM3336-002" = {
-          dwt = "enabled";
-          tap = "enabled";
-          natural_scroll = "enabled";
-          middle_emulation = "enabled";
-          click_method = "clickfinger";
-        };
-        "5824:1503:screenstub-tablet" = { events = "disabled"; };
-        "5824:1503:screenstub-mouse" = { events = "disabled"; };
-        "5824:1503:screenstub-kbd" = { events = "disabled"; };
-        "1386:215:Wacom_BambooPT_2FG_Small_Pen" = {
-          map_to_output = "HDMI-A-1";
-        };
-        "1386:215:Wacom_BambooPT_2FG_Small_Finger" = {
-          natural_scroll = "enabled";
-          middle_emulation = "enabled";
-          tap = "enabled";
-          dwt = "enabled";
-          accel_profile = "flat";
-          pointer_accel = "0.05";
-        };
         "*" = {
           xkb_layout = "gb";
           # xkb_variant = "nodeadkeys";
@@ -276,9 +221,6 @@
     wrapperFeatures.gtk = true;
     extraConfig = ''
       seat seat0 xcursor_theme breeze_cursors 20
-      workspace "1" output "DP-1"
-      workspace "11:F1" output "HDMI-A-1"
-      workspace "12:F2" output "DVI-D-1"
       workspace_auto_back_and_forth yes
       ${workspaceBindingsStr}
     '';