Merge branch 'master' into master

.config/lf/lfrc

@@ -21,7 +21,7 @@ cmd open ${{
 	image/*) rotdir $f | grep -i "\.\(png\|jpg\|jpeg\|gif\|webp\)\(_large\)*$" | setsid -f sxiv -aio 2>/dev/null | lf-select ;;
 	audio/*) mpv --audio-display=no $f ;;
 	video/*) setsid -f mpv $f -quiet >/dev/null 2>&1 ;;
-	application/pdf) setsid -f zathura $fx >/dev/null 2>&1 ;;
+	application/pdf|application/vnd*|application/epub*) setsid -f zathura $fx >/dev/null 2>&1 ;;
         *) for f in $fx; do setsid -f $OPENER $f >/dev/null 2>&1 done;;
     esac
 }}

.local/bin/booksplit

@@ -39,6 +39,6 @@ do
 done < "$2"
 # The last track must be done outside the loop.
 echo "From $start to the end: $title"
-file="$escbook/$track-$esctitle.$ext"
+file="$escbook/$(printf "%.2d" "$track")-$esctitle.$ext"
 echo "Splitting \"$title\"..." && ffmpeg -nostdin -y -loglevel -8 -i "$inputaudio" -ss "$start" -vn "$file" &&
 		echo "Tagging \"$title\"..." && tag -a "$author" -A "$booktitle" -t "$title" -n "$track" -N "$total" -d "$year" "$file"

.local/bin/statusbar/nettraf

@@ -10,16 +10,14 @@ case "$BLOCK_BUTTON" in
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
-rxfile="${XDG_CACHE_HOME:-$HOME/.cache}/rxlog"
-txfile="${XDG_CACHE_HOME:-$HOME/.cache}/txlog"
+logfile="${XDG_CACHE_HOME:-$HOME/.cache}/netlog"
+prevdata="$(cat "$logfile")" || echo "0 0" > "$logfile"
 
-rxcurrent="$(cat /sys/class/net/*/statistics/rx_bytes | paste -sd '+' | bc)"
-txcurrent="$(cat /sys/class/net/*/statistics/tx_bytes | paste -sd '+' | bc)"
+rxcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))"
+txcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/tx_bytes)))"
 
 printf "🔻%sKiB 🔺%sKiB\\n" \
-	"$(printf -- "(%s-%s)/1024\\n" "$rxcurrent" "$(cat "$rxfile")" | bc)" \
-	"$(printf -- "(%s-%s)/1024\\n" "$txcurrent" "$(cat "$txfile")" | bc)"
+	"$(((rxcurrent-${prevdata%% *})/1024))" \
+	"$(((txcurrent-${prevdata##* })/1024))"
 
-# Log the current values for next run.
-echo "$rxcurrent" > "$rxfile"
-echo "$txcurrent" > "$txfile"
+echo "$rxcurrent $txcurrent" > "$logfile"

.local/bin/statusbar/news

@@ -14,4 +14,4 @@ case $BLOCK_BUTTON in
 	6) "$TERMINAL" -e "$EDITOR" "$0" ;;
 esac
 
- cat /tmp/newsupdate 2>/dev/null || echo "$(newsboat -x print-unread | awk '{ print "📰" $1}' | sed 's/^📰 0$//g')$(cat ${XDG_CONFIG_HOME:-$HOME/.config}/newsboat/.update 2>/dev/null)"
+ cat /tmp/newsupdate 2>/dev/null || echo "$(newsboat -x print-unread | awk '{ print "📰" $1}' | sed 's/^📰0$//g')$(cat ${XDG_CONFIG_HOME:-$HOME/.config}/newsboat/.update 2>/dev/null)"

.local/bin/tutorialvids

@@ -1,12 +1,17 @@
 #!/bin/sh
 
+# This gives the user a list of videos they can select and watch without a
+# browser. If you want to check a tutorial video, it makes it easy. I'll
+# add/remove videos from this list as I go on.
+
 vidlist="
-status bar	https://www.youtube.com/watch?v=gKumet6b-WY
+dwm (window manager)	https://www.youtube.com/watch?v=xnREqY-oyzM
+pacman (installing/managing programs)	https://www.youtube.com/watch?v=-dEuXTMzRKs
+status bar	https://www.youtube.com/watch?v=UP2QpHmcgyk
 sxiv (image viewer)	https://www.youtube.com/watch?v=GYW9i_u5PYs
 st (terminal)	https://www.youtube.com/watch?v=9H75enWM22k
-i3 (window manager)		https://www.youtube.com/watch?v=GKviflL9XeI
-pacman (installing/managing programs)	https://www.youtube.com/watch?v=-dEuXTMzRKs
-mutt (email)		https://www.youtube.com/watch?v=2U3vRbF7v5A
+i3 (old window manager)	https://www.youtube.com/watch?v=GKviflL9XeI
+neomutt (email)		https://www.youtube.com/watch?v=2U3vRbF7v5A
 ncmpcpp (music player)		https://www.youtube.com/watch?v=sZIEdI9TS2U
 newsboat (RSS reader)	https://www.youtube.com/watch?v=dUFCRqs822w
 ranger (file manager)		https://www.youtube.com/watch?v=L6Vu7WPkoJo

.local/share/bg

@@ -1 +1 @@
-../../.config/wall.png
+thiemeyer_road_to_samarkand.jpg