diff options
| -rw-r--r-- | .config/conky/conkyrc | 2 | ||||
| -rwxr-xr-x | .local/bin/conky/net.sh | 2 | ||||
| -rwxr-xr-x | .local/bin/conky/weather.sh | 13 |
3 files changed, 7 insertions, 10 deletions
diff --git a/.config/conky/conkyrc b/.config/conky/conkyrc index 2b81154..deb40e9 100644 --- a/.config/conky/conkyrc +++ b/.config/conky/conkyrc @@ -62,7 +62,7 @@ ${goto 130}${mpd_elapsed}/${mpd_length} ${mpd_bar} ${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 0,150 -n}${font} ${endif}${execpi 1800 ~/.local/bin/conky/weather.sh} -CPU ${hr} +${font1}CPU ${hr} ${color #928374}CPU: ${font2}${color #ebdbb2} ${freq_g} GHz ${color #ebdbb2}${cpu}% ${cpugraph 50,380 ebdbb2 928374 -t} ${color #928374}1: ${color #ebdbb2}${cpubar cpu0}${color #ebdbb2} diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh index 1221d30..1cdc930 100755 --- a/.local/bin/conky/net.sh +++ b/.local/bin/conky/net.sh @@ -33,7 +33,7 @@ ${color #928374}Interface: ${font2}${color #ebdbb2}'$if_main'${font} ${color #928374}--------- ${color #928374}LAN IP: ${font2}${color #ebdbb2}${addr '$if_main'}${font} ${color #928374}DNS IP: ${font2}${color #ebdbb2}${nameserver 0}${font} -${color #928374}WAN IP: ${color #ebdbb2}${font2}${execi 300 curl -s https://ifconfig.me || echo No WAN}${font} +# ${color #928374}WAN IP: ${color #ebdbb2}${font2}${execi 300 curl -s https://ifconfig.me || echo No WAN}${font} ${color #928374}--------- ${color #928374}${font}Down: ${color #ebdbb2}${font2}${downspeed '$if_main'}${goto 195}${color #928374}${font}Up: ${color #ebdbb2}${font2}${upspeed '$if_main'}${font} ${color #928374}${font}Total: ${color #ebdbb2}${font2}${totaldown '$if_main'}${goto 195}${color #928374}${font}Total: ${color #ebdbb2}${font2}${totalup '$if_main'}${font}' diff --git a/.local/bin/conky/weather.sh b/.local/bin/conky/weather.sh index 273825c..b724fb6 100755 --- a/.local/bin/conky/weather.sh +++ b/.local/bin/conky/weather.sh @@ -2,17 +2,14 @@ os=$(cat /tmp/os) -case $os in - 1) +case "$(hostname -s)" in + mother | po-rbo) ping -c1 -w1 1.1.1.1 >/dev/null 2>&1 || exit ;; - 2) - ping -c1 -w1 1.1.1.1 >/dev/null 2>&1 || exit - ;; - 3) + fbsd-tp) ping -c1 -t1 1.1.1.1 >/dev/null 2>&1 || exit ;; esac -echo 'WEATHER ${hr} -${font2}${color #ebdbb2}${alignc}${exec curl wttr.in/Lyon?T0 --silent --max-time 3}${font}' +echo '${font1}WEATHER ${hr} +${font2}${color #ebdbb2}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}' |