From a5c9420c916b030bc7d976a4751861f148387965 Mon Sep 17 00:00:00 2001
From: fabio-garavini <info@fabiogaravini.dev>
Date: Thu, 30 Jan 2025 10:05:25 +0100
Subject: [PATCH 1/2] multi monitor navigation

---
 .config/hypr/hyprland/keybinds.conf | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.config/hypr/hyprland/keybinds.conf b/.config/hypr/hyprland/keybinds.conf
index c6b3c286d..b2ac6eca5 100644
--- a/.config/hypr/hyprland/keybinds.conf
+++ b/.config/hypr/hyprland/keybinds.conf
@@ -93,18 +93,18 @@ bind = Super, 9, exec, ~/.config/ags/scripts/hyprland/workspace_action.sh worksp
 bind = Super, 0, exec, ~/.config/ags/scripts/hyprland/workspace_action.sh workspace 10 # [hidden]
 
 #/# bind = Ctrl+Super, ←/→,, # Workspace: focus left/right
-bind = Ctrl+Super, Right, workspace, +1 # [hidden]
-bind = Ctrl+Super, Left, workspace, -1 # [hidden]
+bind = Ctrl+Super, Right, workspace, r+1 # [hidden]
+bind = Ctrl+Super, Left, workspace, r-1 # [hidden]
 #/# bind = Super, Scroll ↑/↓,, # Workspace: focus left/right
 bind = Super, mouse_up, workspace, +1 # [hidden]
 bind = Super, mouse_down, workspace, -1 # [hidden]
-bind = Ctrl+Super, mouse_up, workspace, +1 # [hidden]
-bind = Ctrl+Super, mouse_down, workspace, -1 # [hidden]
+bind = Ctrl+Super, mouse_up, workspace, r+1 # [hidden]
+bind = Ctrl+Super, mouse_down, workspace, r-1 # [hidden]
 #/# bind = Super, Page_↑/↓,, # Workspace: focus left/right
 bind = Super, Page_Down, workspace, +1 # [hidden]
 bind = Super, Page_Up, workspace, -1 # [hidden]
-bind = Ctrl+Super, Page_Down, workspace, +1 # [hidden]
-bind = Ctrl+Super, Page_Up, workspace, -1 # [hidden]
+bind = Ctrl+Super, Page_Down, workspace, r+1 # [hidden]
+bind = Ctrl+Super, Page_Up, workspace, r-1 # [hidden]
 ## Special
 bind = Super, S, togglespecialworkspace,
 bind = Super, mouse:275, togglespecialworkspace,
@@ -125,22 +125,22 @@ bind = Super+Alt, 0, exec, ~/.config/ags/scripts/hyprland/workspace_action.sh mo
 
 bind = Ctrl+Super+Shift, Up, movetoworkspacesilent, special # [hidden]
 
-bind = Ctrl+Super+Shift, Right, movetoworkspace, +1 # [hidden]
-bind = Ctrl+Super+Shift, Left, movetoworkspace, -1 # [hidden]
+bind = Ctrl+Super+Shift, Right, movetoworkspace, r+1 # [hidden]
+bind = Ctrl+Super+Shift, Left, movetoworkspace, r-1 # [hidden]
 bind = Ctrl+Super, BracketLeft, workspace, -1 # [hidden]
 bind = Ctrl+Super, BracketRight, workspace, +1 # [hidden]
-bind = Ctrl+Super, Up, workspace, -5 # [hidden]
-bind = Ctrl+Super, Down, workspace, +5 # [hidden]
+bind = Ctrl+Super, Up, workspace, r-5 # [hidden]
+bind = Ctrl+Super, Down, workspace, r+5 # [hidden]
 #/# bind = Super+Shift, Scroll ↑/↓,, # Window: move to workspace left/right
-bind = Super+Shift, mouse_down, movetoworkspace, -1 # [hidden]
-bind = Super+Shift, mouse_up, movetoworkspace, +1 # [hidden]
+bind = Super+Shift, mouse_down, movetoworkspace, r-1 # [hidden]
+bind = Super+Shift, mouse_up, movetoworkspace, r+1 # [hidden]
 bind = Super+Alt, mouse_down, movetoworkspace, -1 # [hidden]
 bind = Super+Alt, mouse_up, movetoworkspace, +1 # [hidden]
 #/# bind = Super+Shift, Page_↑/↓,, # Window: move to workspace left/right
 bind = Super+Alt, Page_Down, movetoworkspace, +1 # [hidden]
 bind = Super+Alt, Page_Up, movetoworkspace, -1 # [hidden]
-bind = Super+Shift, Page_Down, movetoworkspace, +1  # [hidden]
-bind = Super+Shift, Page_Up, movetoworkspace, -1  # [hidden]
+bind = Super+Shift, Page_Down, movetoworkspace, r+1  # [hidden]
+bind = Super+Shift, Page_Up, movetoworkspace, r-1  # [hidden]
 bind = Super+Alt, S, movetoworkspacesilent, special
 bind = Super, P, pin
 

From 0844e44a32d0a0b8c9c1c328a1a5498a31fd91d1 Mon Sep 17 00:00:00 2001
From: fabio-garavini <info@fabiogaravini.dev>
Date: Thu, 30 Jan 2025 12:09:51 +0100
Subject: [PATCH 2/2] mouse scroll on bar

---
 .config/ags/modules/bar/focus/workspaces_hyprland.js  | 4 ++--
 .config/ags/modules/bar/normal/system.js              | 2 +-
 .config/ags/modules/bar/normal/workspaces_hyprland.js | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.config/ags/modules/bar/focus/workspaces_hyprland.js b/.config/ags/modules/bar/focus/workspaces_hyprland.js
index 77fe47935..58ca462cb 100644
--- a/.config/ags/modules/bar/focus/workspaces_hyprland.js
+++ b/.config/ags/modules/bar/focus/workspaces_hyprland.js
@@ -170,8 +170,8 @@ const WorkspaceContents = (count = 10) => {
 }
 
 export default () => EventBox({
-    onScrollUp: () => Hyprland.messageAsync(`dispatch workspace -1`).catch(print),
-    onScrollDown: () => Hyprland.messageAsync(`dispatch workspace +1`).catch(print),
+    onScrollUp: () => Hyprland.messageAsync(`dispatch workspace r-1`).catch(print),
+    onScrollDown: () => Hyprland.messageAsync(`dispatch workspace r+1`).catch(print),
     onMiddleClick: () => toggleWindowOnAllMonitors('osk'),
     onSecondaryClick: () => App.toggleWindow('overview'),
     attribute: {
diff --git a/.config/ags/modules/bar/normal/system.js b/.config/ags/modules/bar/normal/system.js
index 6e4907eb2..8414c51d9 100644
--- a/.config/ags/modules/bar/normal/system.js
+++ b/.config/ags/modules/bar/normal/system.js
@@ -216,7 +216,7 @@ const BatteryModule = () => Stack({
 const switchToRelativeWorkspace = async (self, num) => {
     try {
         const Hyprland = (await import('resource:///com/github/Aylur/ags/service/hyprland.js')).default;
-        Hyprland.messageAsync(`dispatch workspace ${num > 0 ? '+' : ''}${num}`).catch(print);
+        Hyprland.messageAsync(`dispatch workspace r${num > 0 ? '+' : ''}${num}`).catch(print);
     } catch {
         execAsync([`${App.configDir}/scripts/sway/swayToRelativeWs.sh`, `${num}`]).catch(print);
     }
diff --git a/.config/ags/modules/bar/normal/workspaces_hyprland.js b/.config/ags/modules/bar/normal/workspaces_hyprland.js
index 2f9b373af..8e7e789bc 100644
--- a/.config/ags/modules/bar/normal/workspaces_hyprland.js
+++ b/.config/ags/modules/bar/normal/workspaces_hyprland.js
@@ -179,8 +179,8 @@ const WorkspaceContents = (count = 10) => {
 }
 
 export default () => EventBox({
-    onScrollUp: () => Hyprland.messageAsync(`dispatch workspace -1`).catch(print),
-    onScrollDown: () => Hyprland.messageAsync(`dispatch workspace +1`).catch(print),
+    onScrollUp: () => Hyprland.messageAsync(`dispatch workspace r-1`).catch(print),
+    onScrollDown: () => Hyprland.messageAsync(`dispatch workspace r+1`).catch(print),
     onMiddleClick: () => toggleWindowOnAllMonitors('osk'),
     onSecondaryClick: () => App.toggleWindow('overview'),
     attribute: {