3 files changed, 22 insertions, 24 deletions
diff --git a/.config/conky/conkyrc b/.config/conky/conkyrc
index fcb5053..950a70f 100644
--- a/.config/conky/conkyrc
+++ b/.config/conky/conkyrc
@@ -49,39 +49,37 @@ conky.config = {
 
 conky.text = [[
 ${color #928374}${alignc}${time %A %e %B %Y - %Hh%M}
-${color #ebdbb2}${font1}SYSTEM ${hr}${font}
+${color #ebdbb2}${font1}SYS ${hr 2}${font}
 ${color #928374}Terminal: ${font2}${color #ebdbb2}${nodename_short}${font}
 ${color #928374}OS:       ${font2}${color #ebdbb2}${sysname}${font}
 ${color #928374}Kernel:   ${font2}${color #ebdbb2}${kernel}${font}
 ${color #928374}Uptime:   ${font2}${color #ebdbb2}${uptime}${font}
-${if_mpd_playing}${font1}MPD ${hr}${font}
-
+${if_mpd_playing}${font1}MPD ${hr 2}${font}
 ${font2}${color #ebdbb2}${goto 130}${mpd_artist}
 ${goto 130}${scroll wait 30 3 1 ${mpd_title}}
 ${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 300 ~/.local/bin/conky/weather.sh}
-${font1}CPU ${hr}
-${color #928374}CPU: ${font2}${color #ebdbb2} ${freq_g} GHz ${color #ebdbb2}${cpu}%
+${font1}CPU ${hr 2}${font}
+${color #928374}Freq: ${font2}${color #ebdbb2}${freq_g} GHz ${color #ebdbb2}${font}${alignr}${if_match "${nodename_short}" == "po-rbo"}${color #928374}${font2}Temp: ${color #ebdbb2}${hwmon 4 temp 1}°C${endif}${font}
 ${cpugraph 50,380 ebdbb2 928374 -t}
-${color #928374}1: ${color #ebdbb2}${cpubar cpu0}${color #ebdbb2}
-${color #928374}2: ${color #ebdbb2}${cpubar cpu1}${color #ebdbb2}
-${color #928374}3: ${color #ebdbb2}${cpubar cpu2}${color #ebdbb2}
-${color #928374}4: ${color #ebdbb2}${cpubar cpu3}${color #ebdbb2}
-${color #928374}5: ${color #ebdbb2}${cpubar cpu4}${color #ebdbb2}
-${color #928374}6: ${color #ebdbb2}${cpubar cpu5}${color #ebdbb2}${if_match "${nodename_short}" == "mother"}
-${color #928374}7: ${color #ebdbb2}${cpubar cpu6}${color #ebdbb2}
-${color #928374}8: ${color #ebdbb2}${cpubar cpu7}${color #ebdbb2}${endif}${font}
-${font1}RAM ${hr}${font}
-${color #928374}RAM:  ${font2}${color #ebdbb2}${mem} / ${memmax} ${color #ebdbb2}${membar}${font}
+${voffset -25}${hr}
+${color #928374}1: ${color #ebdbb2}${cpubar cpu0 8,150}${color #ebdbb2}${color #928374}${alignr}2: ${color #ebdbb2}${cpubar cpu1 8,150}${color #ebdbb2}
+${color #928374}3: ${color #ebdbb2}${cpubar cpu2 8,150}${color #ebdbb2}${color #928374}${alignr}4: ${color #ebdbb2}${cpubar cpu3 8,150}${color #ebdbb2}
+${color #928374}5: ${color #ebdbb2}${cpubar cpu4 8,150}${color #ebdbb2}${color #928374}${alignr}6: ${color #ebdbb2}${cpubar cpu5 8,150}${color #ebdbb2}${if_match "${nodename_short}" == "mother"}
+${color #928374}7: ${color #ebdbb2}${cpubar cpu6 8,150}${color #ebdbb2}${color #928374}${alignr}8: ${color #ebdbb2}${cpubar cpu7 8,150}${color #ebdbb2}${endif}${font}
+${font1}MEMORY ${hr 2}${font}
+${color #928374}RAM:  ${font2}${color #ebdbb2}${mem} / ${memmax} ${color #ebdbb2}${membar 8}${font}
 ${memgraph 50,380 ebdbb2 928374 -t}
-${color #928374}SWAP: ${font2}${color #ebdbb2}${swap} / ${swapmax} ${color #ebdbb2}${swapbar}${font}
-${font1}DISK ${hr}${font}
-${color #928374}SSD: ${font2}${color #ebdbb2}${fs_bar /}${font}
-${color #928374}HDD: ${font2}${color #ebdbb2}${fs_bar /var/hdd}${font}
+${voffset -25}${hr}
+${color #928374}SWAP: ${font2}${color #ebdbb2}${swap} / ${swapmax} ${color #ebdbb2}${swapbar 8}${font}
+${font1}DISK ${hr 2}${font}
+${color #928374}SSD: ${font2}${color #ebdbb2}${fs_bar 8 /}${font}
+${color #928374}HDD: ${font2}${color #ebdbb2}${fs_bar 8 /var/hdd}${font}
 ${diskiograph nvme0n1 50,380 ebdbb2 928374 -t}
-${font1}PROC ${hr}${font}
+${voffset -25}${hr}
+${font1}PROC ${hr 2}${font}
 ${color #928374}Process:${color #928374}${alignr}PID     CPU   MEM
 ${font2}${color #ebdbb2}${top_mem name 1} ${alignr}${top_mem pid 1}  ${top_mem cpu 1}  ${top_mem mem_res 1}
 ${font2}${color #928374}${top_mem name 2} ${alignr}${top_mem pid 2}  ${top_mem cpu 2}  ${top_mem mem_res 2}
@@ -89,7 +87,7 @@ ${font2}${color #ebdbb2}${top_mem name 3} ${alignr}${top_mem pid 3}  ${top_mem c
 ${font2}${color #928374}${top_mem name 4} ${alignr}${top_mem pid 4}  ${top_mem cpu 4}  ${top_mem mem_res 4}${font}
 ${color #928374}---------
 ${color #928374}Processes: ${font2}${color #ebdbb2}${processes}${font}
-${execpi 5 ~/.local/bin/conky/net.sh}
+${execpi 15 ~/.local/bin/conky/net.sh}
 ${if_match "${nodename_short}" == "mother"}${color #ebdbb2}${downspeedgraph eth1 50,160 ebdbb2 928374 256000000 -t}${goto 195}${color #ebdbb2}${upspeedgraph eth1 50,185 ebdbb2 928374 256000000 -t}${endif}${if_match "${nodename_short}" == "po-rbo"}${color #ebdbb2}${downspeedgraph enx4ce1734c425a 50,160 ebdbb2 928374 128000000 -t}${goto 195}${color #ebdbb2}${upspeedgraph enx4ce1734c425a 50,185 ebdbb2 928374 128000000 -t}${endif}
 #${if_match "${nodename_short}" == "mother"}${color #ebdbb2}${downspeedgraph eth1 50,160 ebdbb2 928374 256000000 -t}${goto 195}${color #ebdbb2}${upspeedgraph eth1 50,185 ebdbb2 928374 256000000 -t}${endif}${if_match "${nodename_short}" == "po-rbo"}${color #ebdbb2}${downspeedgraph wlp1s0 50,160 ebdbb2 928374 128000000 -t}${goto 195}${color #ebdbb2}${upspeedgraph wlp1s0 50,185 ebdbb2 928374 128000000 -t}${endif}
 ]]
diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh
index efbb16f..903dd4a 100755
--- a/.local/bin/conky/net.sh
+++ b/.local/bin/conky/net.sh
@@ -26,12 +26,12 @@ ${color #928374}No network${font}'
 	exit
 fi
 
-echo '${font1}NETWORK ${hr}${font}
+echo '${font1}NET ${hr 2}${font}
 ${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 83df4f8..5490d9f 100755
--- a/.local/bin/conky/weather.sh
+++ b/.local/bin/conky/weather.sh
@@ -9,5 +9,5 @@ case "$(hostname -s)" in
 		;;
 esac
 
-echo '${font1}WEATHER ${hr}
+echo '${font1}WEAT ${hr 2}
 ${font2}${color #ebdbb2}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}'