From 88f3e8434a6eb2abc60ffaab1ae701d3ecc0df5c Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Tue, 23 Jul 2024 18:25:18 -0400
Subject: [PATCH] home/sway: simplify and normalize with hyprland

---
 homeManagerModules/desktop/sway/README.md    | 14 ++++++
 homeManagerModules/desktop/sway/settings.nix | 49 +++++++++++---------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/homeManagerModules/desktop/sway/README.md b/homeManagerModules/desktop/sway/README.md
index 6a93f9f8..92057dbd 100644
--- a/homeManagerModules/desktop/sway/README.md
+++ b/homeManagerModules/desktop/sway/README.md
@@ -46,6 +46,20 @@
 - SUPER + Period: Switch to next numbered workspace.
 - TOUCHPAD: 3 Finger Swipe Left/Right.
 
+#### Multi-Monitor Workspace Management
+
+- SUPER CTRL SHIFT + Down: Move current workspace to monitor below.
+- SUPER CTRL SHIFT + Up: Move current workspace to monitor above.
+- SUPER CTRL SHIFT + Left: Move current workspace to monitor left.
+- SUPER CTRL SHIFT + Right: Move current workspace to monitor right.
+
+______________________________________________________________________
+
+- SUPER CTRL SHIFT + J: Move current workspace to monitor below.
+- SUPER CTRL SHIFT + K: Move current workspace to monitor above.
+- SUPER CTRL SHIFT + H: Move current workspace to monitor left.
+- SUPER CTRL SHIFT + L: Move current workspace to monitor right.
+
 ### Window Management
 
 - SUPER + C: Kill focused window.
diff --git a/homeManagerModules/desktop/sway/settings.nix b/homeManagerModules/desktop/sway/settings.nix
index 56eedf87..2d82d88d 100644
--- a/homeManagerModules/desktop/sway/settings.nix
+++ b/homeManagerModules/desktop/sway/settings.nix
@@ -17,30 +17,33 @@ in {
   config = {
     bars = [{command = lib.getExe pkgs.waybar;}];
     modifier = modifier;
-    colors.background = "${cfg.theme.colors.primary}EE";
 
-    colors.focused = {
+    colors = {
       background = "${cfg.theme.colors.primary}EE";
-      border = "${cfg.theme.colors.primary}EE";
-      childBorder = "${cfg.theme.colors.primary}EE";
-      indicator = "${cfg.theme.colors.primary}EE";
-      text = "${cfg.theme.colors.text}";
-    };
 
-    colors.focusedInactive = {
-      background = "${cfg.theme.colors.inactive}AA";
-      border = "${cfg.theme.colors.inactive}AA";
-      childBorder = "${cfg.theme.colors.inactive}AA";
-      indicator = "${cfg.theme.colors.inactive}AA";
-      text = "${cfg.theme.colors.text}";
-    };
+      focused = {
+        background = "${cfg.theme.colors.primary}EE";
+        border = "${cfg.theme.colors.primary}EE";
+        childBorder = "${cfg.theme.colors.primary}EE";
+        indicator = "${cfg.theme.colors.primary}EE";
+        text = "${cfg.theme.colors.text}";
+      };
 
-    colors.unfocused = {
-      background = "${cfg.theme.colors.inactive}AA";
-      border = "${cfg.theme.colors.inactive}AA";
-      childBorder = "${cfg.theme.colors.inactive}AA";
-      indicator = "${cfg.theme.colors.inactive}AA";
-      text = "${cfg.theme.colors.text}";
+      focusedInactive = {
+        background = "${cfg.theme.colors.inactive}AA";
+        border = "${cfg.theme.colors.inactive}AA";
+        childBorder = "${cfg.theme.colors.inactive}AA";
+        indicator = "${cfg.theme.colors.inactive}AA";
+        text = "${cfg.theme.colors.text}";
+      };
+
+      unfocused = {
+        background = "${cfg.theme.colors.inactive}AA";
+        border = "${cfg.theme.colors.inactive}AA";
+        childBorder = "${cfg.theme.colors.inactive}AA";
+        indicator = "${cfg.theme.colors.inactive}AA";
+        text = "${cfg.theme.colors.text}";
+      };
     };
 
     defaultWorkspace = "workspace number 1";
@@ -56,8 +59,10 @@ in {
       size = config.gtk.font.size + 0.0;
     };
 
-    gaps.inner = 5;
-    gaps.outer = 5;
+    gaps = {
+      inner = 5;
+      outer = 5;
+    };
 
     input = {
       "type:touchpad" = {