diff --git a/.config/i3blocks/config b/.config/i3blocks/config index ddd049d5..d73c0d8b 100644 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -31,7 +31,7 @@ interval=20 signal=7 [weather] -interval=3600 +interval=18000 signal=5 [mailbox] diff --git a/.scripts/i3cmds/dmenumount b/.scripts/i3cmds/dmenumount index 4de7438f..615e94a2 100755 --- a/.scripts/i3cmds/dmenumount +++ b/.scripts/i3cmds/dmenumount @@ -18,7 +18,8 @@ getmount() { \ mountusb() { \ chosen="$(echo "$usbdrives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')" sudo -A mount "$chosen" && notify-send "$chosen mounted." && exit 0 - getmount "/mnt /media /mount /home -maxdepth 5 -type d" + alreadymounted=$(lsblk -nrpo "name,type,mountpoint" | awk '$2=="part"&&$3!~/\/boot|\/home$|SWAP/&&length($3)>1{printf "-not \( -path *%s -prune \) \ \n",$3}') + getmount "/mnt /media /mount /home -maxdepth 5 -type d $alreadymounted" partitiontype="$(lsblk -no "fstype" "$chosen")" case "$partitiontype" in "vfat") sudo -A mount -t vfat "$chosen" "$mp" -o rw,umask=0000;; diff --git a/.scripts/statusbar/help b/.scripts/statusbar/help index 776e5134..21c84ce2 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 "❓ Help module: -- 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 b47c5f22..9244dbc4 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 damietta +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 "🌈 Weather module: -- 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