From 77dcda448fea2eedbaaffccd76caf89ea6b1c1af Mon Sep 17 00:00:00 2001
From: MoritzBoehme <mail@moritzboeh.me>
Date: Mon, 22 Nov 2021 11:11:58 +0100
Subject: [PATCH] simplify sxhkd

---
 modules/desktop/bspwm/sxhkdrc | 166 +++++++++++-----------------------
 1 file changed, 54 insertions(+), 112 deletions(-)

diff --git a/modules/desktop/bspwm/sxhkdrc b/modules/desktop/bspwm/sxhkdrc
index 0559949..fb6b6e4 100755
--- a/modules/desktop/bspwm/sxhkdrc
+++ b/modules/desktop/bspwm/sxhkdrc
@@ -1,174 +1,116 @@
-#
-# wm independent hotkeys
-#
+# BSPWM
+# Uses modifier key ALT
 
-# terminal emulator
-super + Return
-	kitty
+# Desktop
+# View desktop
+alt + {1-9,0}
+  bspc desktop -f {1-9,10}
 
-# program launcher
-super + d
-	rofi -show combi
+# Move node to desktop
+alt + shift + {1-9,10}
+  bspc node -d {1-9,10}
 
-# make sxhkd reload its configuration files:
-alt + shift + c
-	pkill -USR1 -x sxhkd
-
-# Show help
-super + h
-	~/bin/sxhkd-help
-
-#
-# bspwm hotkeys
-#
 
+# WM
 # quit/restart bspwm
 alt + shift + {e,r}
 	bspc {quit,wm -r}
 
-# close and kill
+# close/kill node
 alt + {_,shift + }q
-	bspc node -{c,k}
+  bspc node -{c,k}
 
-# alternate between the tiled and monocle layout
-alt + m
-	bspc desktop -l next
+# make sxhkd reload its configuration files:
+alt + shift + c
+	pkill -USR1 -x sxhkd && dunstify 'sxhkd' 'Reloaded config!' 
 
-# send the newest marked node to the newest preselected node
-super + y
-	bspc node newest.marked.local -n newest.!automatic.local
-
-# swap the current node and the biggest node
-super + g
-	bspc node -s biggest
-
-# Rotate tree
-super + shift + {d,a}
-    bspc node @/ -C {forward,backward}
-
-#
-# state/flags
-#
 
+# State and Flags
 # set the window state
 alt + {t,shift + t,s,f}
 	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
 
 # set the node flags
-super + ctrl + {m,x,y,z}
+alt + ctrl + {m,l,s,p,}
 	bspc node -g {marked,locked,sticky,private}
 
-#
-# focus/swap
-#
 
+# Focus/Swap Nodes
 # focus the node in the given direction
 alt + {_,shift + }{h,j,k,l}
 	bspc node -{f,s} {west,south,north,east}
 
-# focus the node for the given path jump
-alt + {p,b,comma,period}
-	bspc node -f @{parent,brother,first,second}
+# Rotate tree
+alt + shift + {d,a}
+    bspc node @/ -C {forward,backward}
 
-# focus the next/previous node in the current desktop
-alt + {_,shift + }c
-	bspc node -f {next,prev}.local
-
-# focus the next/previous desktop in the current monitor
-alt + {w,q}
-	bspc desktop -f {prev,next}.local
-
-# focus the last node/desktop
-alt + {grave,Tab}
-	bspc {node,desktop} -f last
-
-# focus the older or newer node in the focus history
-super + {o,i}
-	bspc wm -h off; \
-	bspc node {older,newer} -f; \
-	bspc wm -h on
-
-# focus or send to the given desktop
-alt + {_,shift + }{1-9,0}
-	bspc {desktop -f,node -d} '{1-9,10}'
-
-#
-# preselect
-#
-
-# preselect the direction
-super + ctrl + {h,j,k,l}
-	bspc node -p {west,south,north,east}
-
-# preselect the ratio
-super + ctrl + {1-9}
-	bspc node -o 0.{1-9}
-
-# cancel the preselection for the focused node
-super + ctrl + space
-	bspc node -p cancel
-
-# cancel the preselection for the focused desktop
-super + ctrl + shift + space
-	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
-
-#
-# move/resize
-#
 
+# Resize Node
 # expand a window by moving one of its side outward
-alt +  ctrl + {h,j,k,l}
+alt + ctrl + {h,j,k,l}
 	bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
 
 # contract a window by moving one of its side inward
-super + alt + shift + {h,j,k,l}
+alt + shift + ctrl + {h,j,k,l}
 	bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
 
-# move a floating window
-alt + {Left,Down,Up,Right}
-	bspc node -v {-20 0,0 20,0 -20,20 0}
 
+# XF86 Keys
 XF86AudioRaiseVolume 
 	pamixer -i 5
 XF86AudioLowerVolume 
 	pamixer -d 5
 XF86AudioMute
 	pamixer -t
+
 XF86AudioPlay
 	[ $(playerctl -p "spotifyd,firefox" status) = "Playing" ] && playerctl -p "spotifyd,firefox" pause || playerctl -p "spotifyd,firefox" play
 XF86AudioNext
-	playerctl -p "spotify,spotifyd,firefox" next
+	playerctl -p "spotifyd,firefox" next
 XF86AudioPrev
-	playerctl -p "spotify,spotifyd,firefox" previous
+	playerctl -p "spotifyd,firefox" previous
 
 XF86MonBrightnessDown
 	brightnessctl s 10%-
 XF86MonBrightnessUp
 	brightnessctl s +10%
 
-# Take a screenshot
-Print
-	flameshot gui
 
-#
-# Favourite Progamms
-#
+# Programs
+# Uses modifier key SUPER
 
-# start firefox
-super + {_,shift} +f
-	firefox {_,--private-window}
-# start Networkmanager dmenu
+# Rofi
+# start rofi
+super + d
+	rofi -show combi
+
+# start Networkmanager rofi
 super + w
 	networkmanager_dmenu
-# start rofi-bluetooth
-super + b
-	rofi-bluetooth
+
 # start rofi-calc
 super + c
 	rofi -show calc -modi calc -no-show-match -no-sort | xclip -selection clipboard
+
+# Show help
+super + h
+	~/bin/sxhkd-help
+
+# Apps
+# start firefox
+super + {_,shift} +f
+	firefox {_,--private-window}
+
+# terminal emulator
+super + Return
+	kitty
+
+
+# Emacs
 # start emacs
 super  + e
 	emacsclient -c -a emacs
+# emacs everywhere
 super + shift + e
 	bspc rule -a 'Emacs' -o state=floating sticky=on; \
 	emacsclient --eval "(emacs-everywhere)"