X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/bfe0aa235f9f16ff545bd99a0183e566b0b57100..373851f8fdfb24770f903d2226d7469171b62d1c:/rc.org

diff --git a/rc.org b/rc.org
index 9c69f2b..ff1db79 100644
--- a/rc.org
+++ b/rc.org
@@ -3618,9 +3618,10 @@ insert_pass="Alt+n"
 #+begin_src conf
 exec xrdb .Xresources
 ### Variables
-#
-# Logo key. Use Mod1 for Alt.
+# super
 set $mod Mod4
+# alt
+set $mod2 Mod1
 set $left h
 set $down j
 set $up k
@@ -3698,11 +3699,17 @@ input "1:1:AT_Translated_Set_2_keyboard" {
     bindsym XF86MonBrightnessUp exec light -A 5    # increase screen brightness
     bindsym XF86MonBrightnessDown exec light -U 5  # decrease screen brightness
 
+    # bspwm-esque workspace switch and window move
     bindsym $mod+bracketleft exec sway-ws-util switch prev
     bindsym $mod+bracketright exec sway-ws-util switch next
-
     bindsym $mod+braceleft exec sway-ws-util move prev follow
     bindsym $mod+braceright exec sway-ws-util move next follow
+
+    # original sway workspace switch and window move
+    bindsym $mod2+bracketleft workspace prev
+    bindsym $mod2+bracketright workspace next
+    bindsym $mod2+braceleft move container to workspace prev
+    bindsym $mod2+braceright move container to workspace next
 #
 # Moving around:
 #
@@ -4848,8 +4855,8 @@ sway
 
 #+begin_src bash
 curr_ws=$(swaymsg -t get_workspaces | jq -r '.[] | select(.focused==true).name')
-prev_ws=$((curr_ws-1))
-next_ws=$((curr_ws+1))
+[[ $curr_ws -eq 1 ]] && prev_ws=10 || prev_ws=$((curr_ws-1))
+[[ $curr_ws -eq 10 ]] && next_ws=1 || next_ws=$((curr_ws+1))
 dest_ws=-1
 op=-1
 
@@ -4860,7 +4867,7 @@ if [ "$1" = "switch" ] || [ "$1" = "move" ]; then
   elif [ "$2" = "next" ]; then
     dest_ws="$next_ws"
   else
-    echo "Usage: $0 $1 {prev|next}"
+    echo "Usage: $0 $1 {prev|next} [follow]"
     exit 1
   fi
 else