From 0278f0a7bcab119a412ce421de77cf9e173606b3 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 27 Jun 2023 15:09:26 +0100
Subject: [PATCH] Hyprland keybinds now pull workspaces so no need to bind to
 specific outputs

---
 home/desktop/hyprland.nix | 17 ++++++++++-------
 users/elitherl/Ronin.nix  |  5 -----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index 80615792..2a32e703 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -127,15 +127,25 @@
     bind = SUPER SHIFT, J, movewindow, d
 
     # Switch workspaces with mainMod + [0-9]
+    bind = SUPER, 1, moveworkspacetomonitor, 1 current
     bind = SUPER, 1, workspace, 1
+    bind = SUPER, 2, moveworkspacetomonitor, 2 current
     bind = SUPER, 2, workspace, 2
+    bind = SUPER, 3, moveworkspacetomonitor, 3 current
     bind = SUPER, 3, workspace, 3
+    bind = SUPER, 4, moveworkspacetomonitor, 4 current
     bind = SUPER, 4, workspace, 4
+    bind = SUPER, 5, moveworkspacetomonitor, 5 current
     bind = SUPER, 5, workspace, 5
+    bind = SUPER, 6, moveworkspacetomonitor, 6 current
     bind = SUPER, 6, workspace, 6
+    bind = SUPER, 7, moveworkspacetomonitor, 7 current
     bind = SUPER, 7, workspace, 7
+    bind = SUPER, 8, moveworkspacetomonitor, 8 current
     bind = SUPER, 8, workspace, 8
+    bind = SUPER, 9, moveworkspacetomonitor, 9 current
     bind = SUPER, 9, workspace, 9
+    bind = SUPER, 0, moveworkspacetomonitor, 0 current
     bind = SUPER, 0, workspace, 10
 
     # Move active window to a workspace with mainMod + SHIFT + [0-9]
@@ -151,16 +161,9 @@
 
     bind = SUPER, period, workspace, m+1
     bind = SUPER, comma, workspace, m-1
-
-    bind = SUPER SHIFT, period, movetoworkspace, m+1
-    bind = SUPER SHIFT, comma, movetoworkspace, m-1
-
     bind = SUPER, bracketright, focusmonitor, +1
     bind = SUPER, bracketleft, focusmonitor, +1
 
-    bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1
-    bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, +1
-
     bind = SUPER, N, workspace, empty
     bind = SUPER SHIFT, N, movetoworkspace, empty
 
diff --git a/users/elitherl/Ronin.nix b/users/elitherl/Ronin.nix
index 87601ff4..e4f5c9af 100644
--- a/users/elitherl/Ronin.nix
+++ b/users/elitherl/Ronin.nix
@@ -25,11 +25,6 @@ in {
       bindl=,switch:Lid Switch,exec,check-laptop-lid-state
       exec = ${laptop-state}/bin/check-laptop-lid-state
 
-      workspace = DP-3,1
-      workspace = DP-3,2
-      workspace = DP-3,3
-      workspace = DP-3,4
-
       windowrule = workspace 3 silent, ^(teams-for-linux)$
       windowrule = workspace 4 silent, ^(Nxplayer.bin)$