Navigation improvements

.config/hypr/bindings.conf

@@ -60,57 +60,10 @@ bindd = SUPER, L, Move window focus right, movefocus, r
 bindd = SUPER, K, Move window focus up, movefocus, u
 bindd = SUPER, J, Move window focus down, movefocus, d
 
-# Switch workspaces with SUPER + [1-9; 0]
-bindd = SUPER, code:10, Switch to workspace 1, workspace, 1
-bindd = SUPER, code:11, Switch to workspace 2, workspace, 2
-bindd = SUPER, code:12, Switch to workspace 3, workspace, 3
-bindd = SUPER, code:13, Switch to workspace 4, workspace, 4
-bindd = SUPER, code:14, Switch to workspace 5, workspace, 5
-bindd = SUPER, code:15, Switch to workspace 6, workspace, 6
-bindd = SUPER, code:16, Switch to workspace 7, workspace, 7
-bindd = SUPER, code:17, Switch to workspace 8, workspace, 8
-bindd = SUPER, code:18, Switch to workspace 9, workspace, 9
-bindd = SUPER, code:19, Switch to workspace 10, workspace, 10
-
-# Move active window to a workspace with SUPER + SHIFT + [1-9; 0]
-bindd = SUPER SHIFT, code:10, Move window to workspace 1, movetoworkspace, 1
-bindd = SUPER SHIFT, code:11, Move window to workspace 2, movetoworkspace, 2
-bindd = SUPER SHIFT, code:12, Move window to workspace 3, movetoworkspace, 3
-bindd = SUPER SHIFT, code:13, Move window to workspace 4, movetoworkspace, 4
-bindd = SUPER SHIFT, code:14, Move window to workspace 5, movetoworkspace, 5
-bindd = SUPER SHIFT, code:15, Move window to workspace 6, movetoworkspace, 6
-bindd = SUPER SHIFT, code:16, Move window to workspace 7, movetoworkspace, 7
-bindd = SUPER SHIFT, code:17, Move window to workspace 8, movetoworkspace, 8
-bindd = SUPER SHIFT, code:18, Move window to workspace 9, movetoworkspace, 9
-bindd = SUPER SHIFT, code:19, Move window to workspace 10, movetoworkspace, 10
-
-# Move active window silently to a workspace with SUPER + SHIFT + ALT + [1-9; 0]
-bindd = SUPER SHIFT ALT, code:10, Move window silently to workspace 1, movetoworkspacesilent, 1
-bindd = SUPER SHIFT ALT, code:11, Move window silently to workspace 2, movetoworkspacesilent, 2
-bindd = SUPER SHIFT ALT, code:12, Move window silently to workspace 3, movetoworkspacesilent, 3
-bindd = SUPER SHIFT ALT, code:13, Move window silently to workspace 4, movetoworkspacesilent, 4
-bindd = SUPER SHIFT ALT, code:14, Move window silently to workspace 5, movetoworkspacesilent, 5
-bindd = SUPER SHIFT ALT, code:15, Move window silently to workspace 6, movetoworkspacesilent, 6
-bindd = SUPER SHIFT ALT, code:16, Move window silently to workspace 7, movetoworkspacesilent, 7
-bindd = SUPER SHIFT ALT, code:17, Move window silently to workspace 8, movetoworkspacesilent, 8
-bindd = SUPER SHIFT ALT, code:18, Move window silently to workspace 9, movetoworkspacesilent, 9
-bindd = SUPER SHIFT ALT, code:19, Move window silently to workspace 10, movetoworkspacesilent, 10
-
 # Control scratchpad
 bindd = SUPER, S, Toggle scratchpad, togglespecialworkspace, scratchpad
 bindd = SUPER ALT, S, Move window to scratchpad, movetoworkspacesilent, special:scratchpad
 
-# TAB between workspaces
-bindd = SUPER, TAB, Next workspace, workspace, e+1
-bindd = SUPER SHIFT, TAB, Previous workspace, workspace, e-1
-bindd = SUPER CTRL, TAB, Former workspace, workspace, previous
-
-# Move workspaces to other monitors
-bindd = SUPER SHIFT ALT, LEFT, Move workspace to left monitor, movecurrentworkspacetomonitor, l
-bindd = SUPER SHIFT ALT, RIGHT, Move workspace to right monitor, movecurrentworkspacetomonitor, r
-bindd = SUPER SHIFT ALT, UP, Move workspace to up monitor, movecurrentworkspacetomonitor, u
-bindd = SUPER SHIFT ALT, DOWN, Move workspace to down monitor, movecurrentworkspacetomonitor, d
-
 # Swap active window with the one next to it with SUPER + SHIFT + arrow keys
 bindd = SUPER SHIFT, LEFT, Swap window to the left, swapwindow, l
 bindd = SUPER SHIFT, RIGHT, Swap window to the right, swapwindow, r
@@ -118,10 +71,10 @@ bindd = SUPER SHIFT, UP, Swap window up, swapwindow, u
 bindd = SUPER SHIFT, DOWN, Swap window down, swapwindow, d
 
 # Cycle through applications on active workspace
-bindd = ALT, TAB, Cycle to next window, cyclenext
+bindd = SUPER, TAB, Cycle to next window, cyclenext, visible
-bindd = ALT SHIFT, TAB, Cycle to prev window, cyclenext, prev
+bindd = SUPER SHIFT, TAB, Cycle to prev window, cyclenext, visible prev
-bindd = ALT, TAB, Reveal active window on top, bringactivetotop
+bindd = SUPER, TAB, Reveal active window on top, bringactivetotop
-bindd = ALT SHIFT, TAB, Reveal active window on top, bringactivetotop
+bindd = SUPER SHIFT, TAB, Reveal active window on top, bringactivetotop
 
 # Resize active window
 bindd = SUPER, code:20, Expand window left, resizeactive, -100 0    # - key

.config/hypr/hyprland.conf

@@ -7,4 +7,4 @@ source = ~/.config/hypr/windows.conf
 source = ~/.config/hypr/monitors.conf
 source = ~/.config/hypr/looknfeel.conf
 source = ~/.config/hypr/autostart.conf
-# source = ~/.config/hypr/theme.conf
+source = ~/.config/hypr/workspaces.conf

.config/hypr/workspaces.conf

@@ -0,0 +1,33 @@
+workspace = 1, monitor:DP-1
+workspace = 2, monitor:DP-2
+workspace = 3, monitor:DP-1
+workspace = 4, monitor:DP-2
+workspace = 5, monitor:DP-1
+workspace = 6, monitor:DP-2
+workspace = 7, monitor:DP-1
+workspace = 8, monitor:DP-2
+workspace = 9, monitor:DP-1
+workspace = 10, monitor:DP-2
+
+bindd = SUPER, code:10, Switch to Home, workspace, 2
+bindd = SUPER, code:10, Switch to Home, workspace, 1
+bindd = SUPER, code:11, Switch to Dev, workspace, 4
+bindd = SUPER, code:11, Switch to Dev, workspace, 3
+bindd = SUPER, code:12, Switch to Art, workspace, 6
+bindd = SUPER, code:12, Switch to Art, workspace, 5
+bindd = SUPER, code:13, Switch to Gaming, workspace, 8
+bindd = SUPER, code:13, Switch to Gaming, workspace, 7
+bindd = SUPER, code:14, Switch to Writing, workspace, 10
+bindd = SUPER, code:14, Switch to Writing, workspace, 9
+
+# Move active window to a workspace with SUPER + SHIFT + [1-9; 0]
+bindd = SUPER SHIFT, code:10, Move window to workspace 1, exec, station-move-to-workspace 1
+bindd = SUPER SHIFT, code:11, Move window to workspace 1, exec, station-move-to-workspace 2
+bindd = SUPER SHIFT, code:12, Move window to workspace 1, exec, station-move-to-workspace 3
+bindd = SUPER SHIFT, code:13, Move window to workspace 1, exec, station-move-to-workspace 4
+bindd = SUPER SHIFT, code:14, Move window to workspace 1, exec, station-move-to-workspace 5
+
+bindd = SUPER SHIFT, L, Move window to right monitor, movewindow, r
+bindd = SUPER SHIFT, H, Move window to left monitor, movewindow, l
+bindd = SUPER SHIFT, J, Move window to right monitor, movewindow, d
+bindd = SUPER SHIFT, K, Move window to left monitor, movewindow, u

.config/waybar/config.jsonc

@@ -20,24 +20,19 @@
         "format-icons": {
             "default": "",
             "1": "",
-            "2": "",
+            "2": "",
-            "3": "",
+            "3": "",
-            "4": "",
+            "4": "",
-            "5": "",
+            "5": "",
-            "6": "󱚍",
+            "6": "",
-            "7": "",
+            "7": "",
-            "8": "8",
+            "8": "",
-            "9": "9",
+            "9": "󱚍",
-            "10": "0",
+            "10": "󱚍",
         },
         "persistent-workspaces": {
-            "1": [],
+            "DP-1": [1, 3, 5, 7, 9],
-            "2": [],
+            "DP-2": [2, 4, 6, 8, 10]
-            "3": [],
-            "4": [],
-            "5": [],
-            "6": [],
-            "7": []
         }
     },
     "custom/station": {

.local/bin/station-move-to-workspace

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Moves the active window to the relevant workspace
+
+workspace=$1
+
+active_window=$(hyprctl activewindow -j | jq -r ".address")
+active_workspace=$(hyprctl activeworkspace -j | jq -r ".id")
+
+new_workspace=$((($workspace*2)-($active_workspace%2)))
+
+hyprctl dispatch movetoworkspacesilent "$new_workspace,address:$active_window"