Merge branch 'master' of https://github.com/lukesmithxyz/voidrice into upstream

.config/vifm/vifmrc

@@ -301,7 +301,7 @@ fileviewer *.csv sed "s/,,,,/,,-,,/g;s/,,/ /g" %c | column -t | sed "s/ - /  /g"
 filetype *.wav,*.mp3,*.flac,*.m4a,*.wma,*.ape,*.ac3,*.og[agx],*.spx,*.opus mpv --no-audio-display --input-ipc-server=/tmp/mpvsoc$(date +%%s) %c
 filextype *.pdf,*.ps,*.eps,*.ps.gz,*.djvu,*.epub zathura %f 2>/dev/null &,
 fileviewer *.pdf pdftotext -l 1 -nopgbrk %c -
-fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.qt,*.divx,*.as[fx],*mp3,*.flac mediafile %c
+fileviewer *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.qt,*.divx,*.as[fx],*mp3,*.flac file
 filextype *.avi,*.mp4,*.wmv,*.dat,*.3gp,*.ogv,*.mkv,*.mpg,*.mpeg,*.vob,*.fl[icv],*.m2v,*.mov,*.webm,*.ts,*.mts,*.m4v,*.r[am],*.qt,*.divx,*.as[fx] mpv --input-ipc-server=/tmp/mpvsoc$(date +%%s) %f 2>/dev/null &,
 
 fileview *.zip,*.rar,*.tar.gz atool -l %f

.scripts/statusbar/mailbox

@@ -6,11 +6,11 @@
 
 case $BLOCK_BUTTON in
 	1) "$TERMINAL" -e neomutt ;;
-	2) setsid $HOME/.config/mutt/etc/mailsync.sh >/dev/null & ;;
+	2) setsid mailsync >/dev/null & ;;
 	3) pgrep -x dunst >/dev/null && notify-send "📬 Mail module" "\- Shows unread mail
 - Shows 🔃 if syncing mail
 - Left click opens neomutt
 - Middle click syncs mail" ;;
 esac
 
-echo "$(du -a ~/.local/share/mail/*/INBOX/new/* 2>/dev/null | sed -n '$=')$(cat /tmp/imapsyncicon 2>/dev/null)"
+echo "$(du -a ~/.local/share/mail/*/INBOX/new/* 2>/dev/null | sed -n '$=')$(cat /tmp/imapsyncicon_$USER 2>/dev/null)"

.scripts/statusbar/weather

@@ -1,5 +1,5 @@
 #!/bin/sh
-location="$1"; [ -z "$location" ] || location="$location+"
+location="$1"; [ -z "$location" ] || { location="$location+" && rm -f "$HOME/.local/share/weatherreport" ;}
 
 getforecast() { ping -q -c 1 1.1.1.1 >/dev/null || exit 1
 curl -s "wttr.in/$location" > "$HOME/.local/share/weatherreport" || exit 1 ;}
@@ -17,7 +17,7 @@ case $BLOCK_BUTTON in
 🌞: Daily high" ;;
 esac
 
-if [ "$(stat -c %y "$HOME/.local/share/weatherreport" | awk '{print $1}')" != "$(date '+%Y-%m-%d')" ]
+if [ "$(stat -c %y "$HOME/.local/share/weatherreport" >/dev/null 2>&1 | awk '{print $1}')" != "$(date '+%Y-%m-%d')" ]
 	then getforecast && showweather
 	else showweather
 fi

.scripts/tools/rotdir

@@ -1,8 +1,4 @@
 #!/bin/sh
 [ -z "$1" ] && echo "usage: rotdir regex 2>&1" && exit 1
-ed -s <<EOF
-r !find "$PWD" -maxdepth 1
-g/$1/m0
-,p
-Q
-EOF
+base="$(basename $1)"
+ ls "$PWD" | awk "BEGIN { lines = \"\"; m = 0; } /^$base$/ { m = 1; } { if (!m) { if (lines) { lines = lines\"\n\"; } lines = lines\"\"\$0; } else { print \$0; } } END { print lines; }"