From f7c7672f6f1bbcc639e948554f2865b17339caf1 Mon Sep 17 00:00:00 2001 From: TomJansen Date: Sat, 30 Mar 2019 12:14:16 +0100 Subject: [PATCH 1/4] Prune existing mountpoints from find in dmenumount This speeds up the mounting process if you already have drives mounted containing a large number of folders. Since 2 drives cannot be mounted in the same folder anyway, these are now excluded from the the find command, speeding up the mounting process. --- .scripts/i3cmds/dmenumount | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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;; From 7fcd3c015f7174d6241dea368b5e78cc0909145c Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 31 Mar 2019 22:21:05 -0400 Subject: [PATCH 2/4] default weather time lengthened --- .config/i3blocks/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/i3blocks/config b/.config/i3blocks/config index 980d7910..e984724d 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] From ebd358d8349db903fd094183c0372541e17c9288 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 31 Mar 2019 22:22:06 -0400 Subject: [PATCH 3/4] middle click help to restart i3 --- .scripts/statusbar/help | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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 "❓" From d7f30682652374d43c2a43bda07cc3219269fbd3 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 31 Mar 2019 22:22:51 -0400 Subject: [PATCH 4/4] weather scripts integrated --- .scripts/cron/getforecast | 6 ------ .scripts/statusbar/weather | 21 +++++++++++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) delete mode 100755 .scripts/cron/getforecast diff --git a/.scripts/cron/getforecast b/.scripts/cron/getforecast deleted file mode 100755 index 25386d45..00000000 --- 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/weather b/.scripts/statusbar/weather index 54c2a438..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 +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