Merge branch 'dev' into gentoo

remove devug lines in player
remove unneed code in mailsync
fix sxhkd keybindings
change caps lock remapping

.config/sxhkd/sxhkdrc

@@ -52,13 +52,13 @@ super + shift + {h,j,k,l}
 		player {prev,stop,toggle,next}
 
 super + shift + m
-		$TERMINAL -g 128x32 -c "float" -e ncmpc
+		$TERMINAL -g 128x32 -c "floating" -e ncmpc
 
 super + shift + n
-		$TERMINAL -g 128x32 -c "float" -e neomutt
+		$TERMINAL -g 128x32 -c "floating" -e neomutt
 
 super + shift + t
-		$TERMINAL -g 128x32 -c "float" -e tremc
+		$TERMINAL -g 128x32 -c "floating" -e tremc
 
 super + shift + b
 		script="$(printf "bibinput\nbibshow" | dmenu -i -p "which script?")" && $script

.local/bin/mailsync

@@ -29,14 +29,12 @@ export GPG_TTY=$TTY
 # Config file location must be passed at execution, not as envrionment variable
 [ -n "$MBSYNCRC" ] && alias mbsync="mbsync -c $MBSYNCRC" || MBSYNCRC="$HOME/.mbsyncrc"
 
-displays="$(pgrep -a X\(org\|wayland\) | grep -wo "[0-9]*:[0-9]\+" | sort -u)"
-notify() { for x in $displays; do
+notify() {
 	notify-send "neomutt" " $2 new mail(s) in \`$1\` account."
-done ;}
-messageinfo() { for x in $displays; do
-	export DISPLAY=$x
+}
+messageinfo() {
 	notify-send " $from:" "$subject"
-done ;}
+}
 
 # Check account for new mail. Notify if there is new content.
 syncandnotify() {

.local/bin/player

@@ -17,7 +17,6 @@ if [ -z "$out" ]; then
 	exit
 else
 	path="$(mpc --format %file% | head -n1 | awk -F '/' '{ printf "music/%s/%s/cover.jpg\n", $1,$2 }')"
-	echo $path
 	dunstify -r 10010 -u "normal" -i "$HOME/$path" "MPD" "$out"
 fi
 

.local/bin/remaps

@@ -13,11 +13,11 @@
 # This script is called on startup to remap keys.
 # Increase key speed via a rate change
 xset r rate 300 50
-# Map the caps lock key to super...
-setxkbmap -option caps:super
+# Map the caps lock key to ctrl...
+setxkbmap -option ctrl:nocaps
 # But when it is pressed only once, treat it as escape.
-killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape'
+killall xcape 2>/dev/null ; xcape -e 'Control_L=Escape'
 # Map the menu button to right super as well.
-#xmodmap -e 'keycode 135 = Super_R'
+xmodmap -e 'keycode 107 = Super_R'
 # Turn off the caps lock if on since there is no longer a key for it.
 #xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock