Merge branch 'dev' into logos

fix sxhkd bindings for floating st windows
cleanup scripts
add correction in zsh

.config/sxhkd/sxhkdrc

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

.config/zsh/.zshrc

@@ -19,6 +19,7 @@ bindkey '^[[6~' down-line-or-history 	# PageDown
 HISTSIZE=10000
 SAVEHIST=10000
 HISTFILE=~/.cache/zsh/history
+setopt hist_ignore_space                # Ignore commands preceeded by a space
 
 # Basic auto/tab complete:
 autoload -U compinit
@@ -27,6 +28,9 @@ zmodload zsh/complist
 compinit
 _comp_options+=(globdots)		# Include hidden files.
 
+# Command correction
+setopt correctall
+
 # vi mode
 bindkey -v
 export KEYTIMEOUT=1

.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() {
-notify() { for x in $displays; do
 	notify-send "neomutt" " $2 new mail(s) in \`$1\` account."
-done ;}
+}
-messageinfo() { for x in $displays; do
+messageinfo() {
-	export DISPLAY=$x
 	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...
+# Map the caps lock key to ctrl...
-setxkbmap -option caps:super
+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

.local/bin/sbacklight

@@ -20,8 +20,14 @@ step=$(expr $max / 20)
 [ "$1" = "dec" ] && new=$(expr $current - $step)
 [ "$1" = "inc" ] && new=$(expr $current + $step)
 [ "$1" = "set" ] && new=$(expr $2 \* $step)
+case "$1" in
+        "dec") new=$(expr $current - $step);;
+        "inc") new=$(expr $current + $step);;
+        "set") new=$(expr $2 \* $step);;
+        *) exit
+esac
 
-[ $new -gt 850 ] && new=850
+[ $new -gt $max ] && new=$max
 [ $new -lt 0 ] && new=0
 
 echo $new > /sys/class/backlight/intel_backlight/brightness

.local/bin/statusbar/sb-battery

@@ -50,4 +50,4 @@ do
 		esac
 	fi
 	printf " %s %3d%% " "$status" "$capacity";
-done && return 0
+done

.local/share/nvim/lsp/sumneko_lua

@@ -1 +1 @@
-Subproject commit 8bd3d0987af29c71f5e6bfa884936dc99aa58293
+Subproject commit db515753ac0c9811199453d3e4ce72a1c72f5e2e

.local/src/dwm

@@ -1 +1 @@
-Subproject commit 0e2075b0ec4282cb81dec8055332b5f71ede9e6c
+Subproject commit 7199d8d564c144bbf4d47641db72b071f39533c7

.xprofile

@@ -1 +1 @@
-.config/X11/xprofile
+~/.config/X11/xprofile