diff options
| -rw-r--r-- | .config/aliasrc | 5 | ||||
| -rw-r--r-- | .config/i3blocks/config | 2 | ||||
| -rwxr-xr-x | .scripts/cron/getforecast | 6 | ||||
| -rwxr-xr-x | .scripts/statusbar/help | 11 | ||||
| -rwxr-xr-x | .scripts/statusbar/weather | 21 |
5 files changed, 24 insertions, 21 deletions
diff --git a/.config/aliasrc b/.config/aliasrc index 5982a54..241889a 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -1,11 +1,12 @@ #!/bin/sh alias ka="killall" \ + mkd="mkdir -pv" \ mpv="mpv --input-ipc-server=/tmp/mpvsoc$(date +%s)" \ calcurse="calcurse -D ~/.config/calcurse" \ - magit="nvim -c Magit" \ + magit="nvim -c MagitOnly" \ p="sudo pacman" \ SS="sudo systemctl" \ - f="vifm" \ + f="$FILE" \ g="git" \ trem="transmission-remote" \ e="$EDITOR" \ diff --git a/.config/i3blocks/config b/.config/i3blocks/config index 980d791..e984724 100644 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -27,7 +27,7 @@ interval=20 signal=7 [weather] -interval=3600 +interval=18000 signal=5 [mailbox] diff --git a/.scripts/cron/getforecast b/.scripts/cron/getforecast deleted file mode 100755 index 25386d4..0000000 --- a/.scripts/cron/getforecast +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# Updates weather forecast -ping -q -w 1 -c 1 "$(ip r | grep default | tail -1 | cut -d ' ' -f 3)" >/dev/null || exit -location="$1"; [ -z "$location" ] || location="$location+" -curl -s "wttr.in/$location" > /tmp/weatherreport -pkill -RTMIN+5 i3blocks && notify-send "🌞 Weather forecast updated." diff --git a/.scripts/statusbar/help b/.scripts/statusbar/help index 776e513..21c84ce 100755 --- a/.scripts/statusbar/help +++ b/.scripts/statusbar/help @@ -1,9 +1,8 @@ #!/bin/sh - case $BLOCK_BUTTON in - 1) groff -kejpt -mom ~/.local/share/larbs/readme.mom -Tpdf | zathura - ;; + 1) groff -mom ~/.readme.mom -Tpdf | zathura - ;; + 2) i3 restart ;; 3) pgrep -x dunst >/dev/null && notify-send "<b>❓ Help module:</b> -- Left click to open LARBS guide.";; -esac - -echo "❓" +- Left click to open LARBS guide. +- Middle click to refresh i3.";; +esac; echo "❓" diff --git a/.scripts/statusbar/weather b/.scripts/statusbar/weather index 54c2a43..9244dbc 100755 --- a/.scripts/statusbar/weather +++ b/.scripts/statusbar/weather @@ -1,15 +1,24 @@ #!/bin/sh -[ "$(stat -c %y /tmp/weatherreport | awk '{print $1}')" != "$(date '+%Y-%m-%d')" ] && getforecast +location="$1"; [ -z "$location" ] || location="$location+" + +getforecast() { ping -q -c 1 1.1.1.1 >/dev/null || exit 1 +curl -s "wttr.in/$location" > "$HOME/.local/share/weatherreport" || exit 1 ;} + +showweather() { printf "%s" "$(sed '16q;d' "$HOME/.local/share/weatherreport" | grep -wo "[0-9]*%" | sort -n | sed -e '$!d' | sed -e "s/^/☔ /g" | tr -d '\n')" +sed '13q;d' "$HOME/.local/share/weatherreport" | grep -o "m\\(-\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' ;} case $BLOCK_BUTTON in - 1) $TERMINAL -e less -S -R /tmp/weatherreport ;; + 1) $TERMINAL -e less -S "$HOME/.local/share/weatherreport" ;; + 2) getforecast && showweather ;; 3) pgrep -x dunst >/dev/null && notify-send "<b>🌈 Weather module:</b> -- Click for wttr.in forecast. +- Left click for full forecast. +- Middle click to update forecast. ☔: Chance of rain/snow ❄: Daily low 🌞: Daily high" ;; esac -printf "%s" "$(sed '16q;d' /tmp/weatherreport | grep -wo "[0-9]*%" | sort -n | sed -e '$!d' | sed -e "s/^/☔ /g" | tr -d '\n')" - -sed '13q;d' /tmp/weatherreport | grep -o "m\\(-\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' +if [ "$(stat -c %y "$HOME/.local/share/weatherreport" | awk '{print $1}')" != "$(date '+%Y-%m-%d')" ] + then getforecast && showweather + else showweather +fi |