diff options
Diffstat (limited to '')
-rwxr-xr-x | .local/bin/conky/net.sh | 23 | ||||
-rwxr-xr-x | .local/bin/conky/weather.sh | 13 |
2 files changed, 10 insertions, 26 deletions
diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh index 5287e44..1cf715a 100755 --- a/.local/bin/conky/net.sh +++ b/.local/bin/conky/net.sh @@ -28,22 +28,19 @@ if grep up "/sys/class/net/$if_main/operstate" >/dev/null 2>&1 && ! [ -z $(ifcon elif grep up "/sys/class/net/$if_alt/operstate" >/dev/null 2>&1 && ! [ -z $(ifconfig $if_alt 2>/dev/null | awk '/inet / {print $2}') ]; then if_main=$if_alt else - echo '${color1}${font1}NET ${hr}${font} + echo '${color1}NET ${hr}${font} ${color1}No network${font}' exit fi -echo '${color1}${font1}NET ${hr 2}${font} -${color1}Interface: ${font2}${color0}'$if_main'${font}' -[ -z $if_wg ] || echo '${color1}WireGuard: ${color0}${font2}ON${font}' +echo '${color1}NET ${hr 2}${font} +${color1}Interface: ${color0}'$if_main'${font}' +[ -z $if_wg ] || echo '${color1}WireGuard: ${color0}ON${font}' echo '${color1}--------- -${color1}LAN IP: ${font2}${color0}${addr '$if_main'}${font}' -[ -z $if_wg ] || echo '${color1}WG IP: ${color0}${font2}${addr '$if_wg'}${font}' -echo '${color1}DNS IP: ${font2}${color0}${nameserver 0}${font}' -echo '${color1}WAN IP: ${color0}${font2}${execi 15 curl -s https://ifconfig.me || echo No WAN}${font} +${color1}LAN IP: ${color0}${addr '$if_main'}${font}' +[ -z $if_wg ] || echo '${color1}WG IP: ${color0}${addr '$if_wg'}${font}' +echo '${color1}DNS IP: ${color0}${nameserver 0}${font}' +echo '${color1}WAN IP: ${color0}${execi 15 curl -s https://ifconfig.me || echo No WAN}${font} ${color1}--------- -${color1}D: ${color0}${font2}${downspeed '$if_main'}${font}${color1} -- Total: ${color0}${font2}${totaldown '$if_main'}${font} -${color1}U: ${color0}${font2}${upspeed '$if_main'}${font}${color1} -- Total: ${color0}${font2}${totalup '$if_main'}${font}' - - -# ${color1}VPN IP: ${font2}${color0}${addr proton0}${font} +${color1}D: ${color0}${downspeed '$if_main'}${font}${color1} -- Total: ${color0}${totaldown '$if_main'}${font} +${color1}U: ${color0}${upspeed '$if_main'}${font}${color1} -- Total: ${color0}${totalup '$if_main'}${font}' diff --git a/.local/bin/conky/weather.sh b/.local/bin/conky/weather.sh deleted file mode 100755 index b24f589..0000000 --- a/.local/bin/conky/weather.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -case "$(hostname -s)" in - mother | po-rbo) - ping -c1 -w1 9.9.9.9 >/dev/null 2>&1 || exit - ;; - mars) - ping -c1 -t1 9.9.9.9 >/dev/null 2>&1 || exit - ;; -esac - -echo '${color1}${font1}WEAT ${hr 2} -${font2}${color0}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}' |