From bca99b60b174bc287b9f396b3262417c4eec4ddc Mon Sep 17 00:00:00 2001 From: Alexei Syssoyev <34723727+AlexSyssoyev@users.noreply.github.com> Date: Sat, 30 May 2020 07:19:12 -0300 Subject: [PATCH 1/7] Fix sed to hide news when zero (#661) --- .local/bin/statusbar/news | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/bin/statusbar/news b/.local/bin/statusbar/news index 69d9bf32..cbd976ae 100755 --- a/.local/bin/statusbar/news +++ b/.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)" From 884dcbdc4792eed95e558af84491eb3100d314a2 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 30 May 2020 11:08:59 -0400 Subject: [PATCH 2/7] tutorial videos list updated --- .local/bin/tutorialvids | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.local/bin/tutorialvids b/.local/bin/tutorialvids index 5ca5c50f..2ed1542e 100755 --- a/.local/bin/tutorialvids +++ b/.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 From d8272650bd675011496b4825160510109e47bba5 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 30 May 2020 11:09:12 -0400 Subject: [PATCH 3/7] paste directly on files, excluding lo --- .local/bin/statusbar/nettraf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf index 9a81ad24..82305c36 100755 --- a/.local/bin/statusbar/nettraf +++ b/.local/bin/statusbar/nettraf @@ -13,8 +13,8 @@ esac logfile="${XDG_CACHE_HOME:-$HOME/.cache}/netlog" prevdata="$(cat "$logfile")" -rxcurrent="$(($(cat /sys/class/net/*/statistics/rx_bytes | paste -sd '+')))" -txcurrent="$(($(cat /sys/class/net/*/statistics/tx_bytes | paste -sd '+')))" +rxcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))" +txcurrent="$(($(paste -d '+' /sys/class/net/[^lo]*/statistics/tx_bytes)))" printf "🔻%sKiB 🔺%sKiB\\n" \ "$(((rxcurrent-${prevdata%% *})/1024))" \ From daf2829167571cec6b78a7a3abe511b90b40071d Mon Sep 17 00:00:00 2001 From: Hekuran <62762955+narukeh@users.noreply.github.com> Date: Sat, 30 May 2020 17:27:01 +0200 Subject: [PATCH 4/7] create netlog if empty it would not run without an existing nonempty log file --- .local/bin/statusbar/nettraf | 1 + 1 file changed, 1 insertion(+) diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf index 82305c36..a3c9f6f1 100755 --- a/.local/bin/statusbar/nettraf +++ b/.local/bin/statusbar/nettraf @@ -14,6 +14,7 @@ logfile="${XDG_CACHE_HOME:-$HOME/.cache}/netlog" prevdata="$(cat "$logfile")" rxcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))" +[ -f "$logfile" ] || echo "0 0" > $logfile txcurrent="$(($(paste -d '+' /sys/class/net/[^lo]*/statistics/tx_bytes)))" printf "🔻%sKiB 🔺%sKiB\\n" \ From 1d95b2210e4935c0dbf5a1ad04fbc9a4739de299 Mon Sep 17 00:00:00 2001 From: Hekuran <62762955+narukeh@users.noreply.github.com> Date: Sat, 30 May 2020 17:29:41 +0200 Subject: [PATCH 5/7] quotes --- .local/bin/statusbar/nettraf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf index a3c9f6f1..f6c5779e 100755 --- a/.local/bin/statusbar/nettraf +++ b/.local/bin/statusbar/nettraf @@ -14,7 +14,7 @@ logfile="${XDG_CACHE_HOME:-$HOME/.cache}/netlog" prevdata="$(cat "$logfile")" rxcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))" -[ -f "$logfile" ] || echo "0 0" > $logfile +[ -f "$logfile" ] || echo "0 0" > "$logfile" txcurrent="$(($(paste -d '+' /sys/class/net/[^lo]*/statistics/tx_bytes)))" printf "🔻%sKiB 🔺%sKiB\\n" \ From 7ea15612b4255b62725fc2819e6df05d7df3ff07 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 30 May 2020 11:41:29 -0400 Subject: [PATCH 6/7] save the file check every time --- .local/bin/statusbar/nettraf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf index f6c5779e..1de68014 100755 --- a/.local/bin/statusbar/nettraf +++ b/.local/bin/statusbar/nettraf @@ -11,10 +11,9 @@ case "$BLOCK_BUTTON" in esac logfile="${XDG_CACHE_HOME:-$HOME/.cache}/netlog" -prevdata="$(cat "$logfile")" +prevdata="$(cat "$logfile")" || echo "0 0" > "$logfile" rxcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))" -[ -f "$logfile" ] || echo "0 0" > "$logfile" txcurrent="$(($(paste -d '+' /sys/class/net/[^lo]*/statistics/tx_bytes)))" printf "🔻%sKiB 🔺%sKiB\\n" \ From 52d9140820d3e39446cb8414220c9bc5a052216c Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 30 May 2020 14:09:39 -0400 Subject: [PATCH 7/7] dumb fix --- .local/bin/statusbar/nettraf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.local/bin/statusbar/nettraf b/.local/bin/statusbar/nettraf index 1de68014..d9c2d8c3 100755 --- a/.local/bin/statusbar/nettraf +++ b/.local/bin/statusbar/nettraf @@ -14,7 +14,7 @@ logfile="${XDG_CACHE_HOME:-$HOME/.cache}/netlog" prevdata="$(cat "$logfile")" || echo "0 0" > "$logfile" rxcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/rx_bytes)))" -txcurrent="$(($(paste -d '+' /sys/class/net/[^lo]*/statistics/tx_bytes)))" +txcurrent="$(($(paste -d '+' /sys/class/net/[ew]*/statistics/tx_bytes)))" printf "🔻%sKiB 🔺%sKiB\\n" \ "$(((rxcurrent-${prevdata%% *})/1024))" \