From 88780795ed98f11648f980bf2fe083c87a2e3e4f Mon Sep 17 00:00:00 2001
From: Derek Taylor <derek@distrotube.com>
Date: Fri, 3 Mar 2023 18:03:52 -0600
Subject: [PATCH] Adding better keybindings for bspwm; adding underline
 decorations for occupied workspaces in bspwm/polybar.

---
 .config/polybar/config.ini | 24 +++++++++++++++++-------
 .config/sxhkd/sxhkdrc      | 17 ++++++++---------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 228a20f..8c7d836 100755
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -710,22 +710,32 @@ ws-icon-default = " "
 format = <label-state> <label-mode>
 
 label-focused = %icon%
-label-focused-background = ${colors.background}
-label-focused-underline= #6790eb
-label-focused-padding = 2
 label-focused-foreground = ${colors.foreground}
+label-focused-background = ${colors.background}
+label-focused-underline= ${colors.color5}
+label-focused-padding = 1
+label-focused-margin = 2
 
 label-occupied = %icon%
-label-occupied-padding = 2
+label-occupied-foreground = ${colors.foreground}
 label-occupied-background = ${colors.background}
+label-occupied-underline= ${colors.color2}
+label-occupied-padding = 1
+label-occupied-margin = 2
 
 label-urgent = %icon%
-label-urgent-padding = 2
+label-urgent-foreground = ${colors.foreground}
+label-urgent-background = ${colors.alert}
+label-urgent-underline = ${colors.alert}
+label-urgent-padding = 1
+label-urgent-margin = 2
 
 label-empty = %icon%
 label-empty-foreground = ${colors.foreground}
-label-empty-padding = 2
 label-empty-background = ${colors.background}
+label-empty-padding = 1
+label-empty-margin = 2
+
 label-monocle = "  "
 label-monocle-foreground = ${colors.foreground}
 label-tiled = "  "
@@ -751,6 +761,7 @@ label-private-foreground = ${colors.foreground}
 format-foreground = ${colors.foreground}
 format-background = ${colors.background}
 
+
 ###############################################################################
 ############                     MODULES ARROWS                    ############
 ###############################################################################
@@ -1055,7 +1066,6 @@ label-empty-margin = 2
 
 format-foreground = ${colors.foreground}
 format-background = ${colors.background}
-;;format-underline = ${colors.color14}
 
 [module/filesystem]
 ;https://github.com/jaagr/polybar/wiki/Module:-filesystem
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index f206e97..29059e3 100755
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -49,7 +49,6 @@ super + y
 super + m
 	bspc node -s biggest
 
-
 # STATE/FLAGS
 
 # set the window state
@@ -60,7 +59,6 @@ super + {t,shift + t,s,f}
 super + ctrl + {m,x,y,z}
 	bspc node -g {marked,locked,sticky,private}
 
-
 # FOCUS/SWAP
 
 # focus the node in the given direction
@@ -68,7 +66,7 @@ super + {_,shift + }{h,j,k,l}
 	bspc node -{f,s} {west,south,north,east}
 
 # focus the node for the given path jump
-super + {shift + p, shift + b,comma,period}
+super + {shift + p, shift + b, shift + comma, shift + period}
 	bspc node -f @{parent,brother,first,second}
 
 # focus the next/previous node in the current desktop
@@ -76,11 +74,15 @@ super + {_,shift + }n
 	bspc node -f {next,prev}.local
 
 # focus the next/previous desktop in the current monitor
-super + bracket{left,right}
-	bspc desktop -f {prev,next}.local
+super + {Left, Right}
+ 	bspc desktop -f {prev,next}.local
+
+# focus the next/previous monitor
+super + {comma, period}
+    bspc monitor --focus {prev,next}
 
 # focus the last node/desktop
-super + {grave,Tab}
+super + {shift + Tab,Tab}
 	bspc {node,desktop} -f last
 
 # focus the older or newer node in the focus history
@@ -93,7 +95,6 @@ super + {o,i}
 super + {_,shift + }{1-9,0}
 	bspc {desktop -f,node -d} focused:'^{1-9,10}'
 
-
 # PRESELECT
 
 # preselect the direction
@@ -112,7 +113,6 @@ super + ctrl + space
 super + ctrl + shift + space
 	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
 
-
 # MOVE/RESIZE
 
 # expand a window by moving one of its side outward
@@ -127,7 +127,6 @@ ctrl + alt + shift + {h,j,k,l}
 super + {Left,Down,Up,Right}
 	bspc node -v {-20 0,0 20,0 -20,20 0}
 
-
 # launch qutebrowser
 super + b
     qutebrowser "https://distro.tube"