1 files changed, 24 insertions, 25 deletions
diff --git a/dotfiles/hyprland/.local/bin/cycle-layout b/dotfiles/hyprland/.local/bin/cycle-layout
index a3b1b1a..ebfd2e0 100755
--- a/dotfiles/hyprland/.local/bin/cycle-layout
+++ b/dotfiles/hyprland/.local/bin/cycle-layout
@@ -1,30 +1,29 @@
 #!/bin/sh
 # Cycle through Hyprland layouts
+# Cycle: master -> hy3 (tab/monocle) -> scrolling -> floating -> master
 
 LAYOUT=$(hyprctl getoption general:layout -j | jq -r '.str')
-ORIENTATION=""
+FLOATING=$(hyprctl activewindow -j 2>/dev/null | jq -r '.floating // false')
 
-if [ "$LAYOUT" = "master" ]; then
-    ORIENTATION=$(hyprctl getoption master:orientation -j | jq -r '.str')
-fi
-
-# Cycle: master-left -> master-top -> master-center -> dwindle -> master-left
-if [ "$LAYOUT" = "dwindle" ]; then
-    hyprctl keyword general:layout master
-    hyprctl keyword master:orientation left
-elif [ "$LAYOUT" = "master" ]; then
-    case "$ORIENTATION" in
-        left)
-            hyprctl keyword master:orientation top
-            ;;
-        top)
-            hyprctl keyword master:orientation center
-            ;;
-        center)
-            hyprctl keyword general:layout dwindle
-            ;;
-        *)
-            hyprctl keyword master:orientation left
-            ;;
-    esac
-fi
+# Check if we're in "all floating" mode by checking layout
+case "$LAYOUT" in
+    master)
+        hyprctl keyword general:layout hy3
+        # Create tab group for monocle behavior
+        hyprctl dispatch hy3:changegroup tab
+        ;;
+    hy3)
+        hyprctl keyword general:layout scrolling
+        ;;
+    scrolling)
+        # Switch to master but float all windows
+        hyprctl keyword general:layout master
+        hyprctl dispatch workspaceopt allfloat
+        ;;
+    *)
+        # Return to master tiled
+        hyprctl dispatch workspaceopt allfloat
+        hyprctl keyword general:layout master
+        hyprctl keyword master:orientation left
+        ;;
+esac