Merge branch 'master' into master

This commit is contained in:
Luke Smith 2020-05-30 17:01:07 -04:00 committed by GitHub
commit c5ab20acac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 17 deletions

View File

@ -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 ;; 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 ;; audio/*) mpv --audio-display=no $f ;;
video/*) setsid -f mpv $f -quiet >/dev/null 2>&1 ;; 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;; *) for f in $fx; do setsid -f $OPENER $f >/dev/null 2>&1 done;;
esac esac
}} }}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 524 KiB

View File

@ -39,6 +39,6 @@ do
done < "$2" done < "$2"
# The last track must be done outside the loop. # The last track must be done outside the loop.
echo "From $start to the end: $title" 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 "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" echo "Tagging \"$title\"..." && tag -a "$author" -A "$booktitle" -t "$title" -n "$track" -N "$total" -d "$year" "$file"

View File

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

View File

@ -14,4 +14,4 @@ case $BLOCK_BUTTON in
6) "$TERMINAL" -e "$EDITOR" "$0" ;; 6) "$TERMINAL" -e "$EDITOR" "$0" ;;
esac 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)"

View File

@ -1,12 +1,17 @@
#!/bin/sh #!/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=" 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 sxiv (image viewer) https://www.youtube.com/watch?v=GYW9i_u5PYs
st (terminal) https://www.youtube.com/watch?v=9H75enWM22k st (terminal) https://www.youtube.com/watch?v=9H75enWM22k
i3 (window manager) https://www.youtube.com/watch?v=GKviflL9XeI i3 (old window manager) https://www.youtube.com/watch?v=GKviflL9XeI
pacman (installing/managing programs) https://www.youtube.com/watch?v=-dEuXTMzRKs neomutt (email) https://www.youtube.com/watch?v=2U3vRbF7v5A
mutt (email) https://www.youtube.com/watch?v=2U3vRbF7v5A
ncmpcpp (music player) https://www.youtube.com/watch?v=sZIEdI9TS2U ncmpcpp (music player) https://www.youtube.com/watch?v=sZIEdI9TS2U
newsboat (RSS reader) https://www.youtube.com/watch?v=dUFCRqs822w newsboat (RSS reader) https://www.youtube.com/watch?v=dUFCRqs822w
ranger (file manager) https://www.youtube.com/watch?v=L6Vu7WPkoJo ranger (file manager) https://www.youtube.com/watch?v=L6Vu7WPkoJo

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 394 KiB