Merge branch 'master' of github.com:qbit/dotconf

.kshrc

@@ -1,8 +1,9 @@
 GOT_AUTHOR="Aaron Bieber <aaron@bolddaemon.com>"
 BROWSER=$(which xdg-open 2>/dev/null)
 OHMYKSH_DIR=${HOME}/src/ohmyksh
+OHMYPATCHES=~/patches
 
-export GOT_AUTHOR BROWSER OHMYKSH_DIR
+export GOT_AUTHOR BROWSER OHMYKSH_DIR OHMYPATCHES
 
 . ${OHMYKSH_DIR}/ohmy.ksh
 
@@ -29,6 +30,8 @@ load_completion rc
 load_completion git
 load_completion got
 pgrep -q mpd && load_completion mpc
+load_completion ogvt
+load_completion man
 
 #[[ -s ~/.ssh/host_config ]] && read_ssh_config ~/.ssh/host_config
 #set -A complete_ssh -- ${HOST_LIST[*]}
@@ -40,6 +43,7 @@ alias vi=nvim
 alias got='env EDITOR=nvim got'
 alias lookman='man -k'
 alias gomuks='env GOMUKS_CACHE_HOME=~/.gomuks gomuks'
+alias jfd='doas /usr/sbin/sysupgrade'
 
 # the q prompt auto-loads the git-prompt extension
 set_prompt q

.xsession

@@ -47,7 +47,7 @@ case "$wmanager" in
 	/home/qbit/bin/juicebox)
 		xsetroot -solid black
 		;;
-	/usr/X11R6/bin/cwm)
+	/usr/X11R6/bin/cwm|/usr/local/bin/spectrwm)
 		xsetroot -solid black
 		while true; do ~/bin/bar; sleep 3; done | lemonbar-xft -d \
 			-f "$Go Mono:pixelsize=12" \

bin/bar

@@ -189,6 +189,6 @@ vmm() {
 	fi
 }
 
-printf "%%{l} %s | %s | %%{A:apm -A:}%%{A2:apm -L:}%%{A3:apm -H:}%s%%{A}%%{A}%%{A} | %s %%{r} | %s | %s | %s | %s | %s | @%s " \
-	"$(battery)" "$(temp)" "$(hz)" "$(mem)" \
+printf "%%{l} %s | %s | %%{A:apm -A:}%%{A2:apm -L:}%%{A3:apm -H:}%s%%{A}%%{A}%%{A} | %s | %s %%{r} | %s | %s | %s | %s | %s | @%s " \
+	"$(battery)" "$(temp)" "$(hz)" "$(mem)" "$(weather -color)" \
 	"$(now_playing)" "$(vmm)" "$(mail)" "$(wifi)" "$(date '+%Y-%m-%d %H:%M')" "$(beat)"