up

2 files changed, 11 insertions, 23 deletions

diff --git a/.config/conky/conkyrc b/.config/conky/conkyrc
index b00cb39..8eaf06d 100644
--- a/.config/conky/conkyrc
+++ b/.config/conky/conkyrc
@@ -83,23 +83,20 @@ ${color0}${offset 5}${top_mem name 1} ${alignr 10}${offset -13}${top_mem cpu 1}$
 ${color0}${offset 5}${top_mem name 2} ${alignr 10}${offset -13}${top_mem cpu 2}${offset 15}${top_mem mem 2}
 ${color0}${offset 5}${top_mem name 3} ${alignr 10}${offset -13}${top_mem cpu 3}${offset 15}${top_mem mem 3}
 ${color0}${offset 5}${top_mem name 4} ${alignr 10}${offset -13}${top_mem cpu 4}${offset 15}${top_mem mem 4}
-${color0}${offset 5}${top_mem name 5} ${alignr 10}${offset -13}${top_mem cpu 5}${offset 15}${top_mem mem 5}
-${color0}${hr}${font}${if_match "${nodename_short}" == "mother"}
+${color0}${offset 5}${top_mem name 5} ${alignr 10}${offset -13}${top_mem cpu 5}${offset 15}${top_mem mem 5}${if_match "${nodename_short}" == "mother"}
+${color0}${hr}${font}
 ${color0}${font ConkySymbols:size=18}n${font :bold:}${voffset -5} GPU${font}${goto 50}${voffset -6}${nvidia modelname} @ ${nvidia gpufreq}MHz${alignr}${font :bold:}${nvidia gpuutil}%${font}
 ${color tomato}${nvidiabar gpuutil}
-${color tomato}${offset 3}${nvidiagraph gpuutil 30,190 000000 FF6347} ${nvidiagraph mem 30,190 000000 FF6347} ${voffset 13} ${goto 25}${color0}GPU Usage: ${nvidia gpuutil}${goto 215}VRAM Usage: ${nvidia memutil}%${endif}${if_match "${nodename_short}" == "po-rbo"}
-${color0}${font ConkySymbols:size=18}n${font :bold:}${voffset -5} GPU${font}${goto 140}AMD Renoir @ ${exec awk 'NR==2{print $2}' /sys/class/drm/card0/device/pp_dpm_sclk}${alignr}${font :bold:}${execi 5 radeontop -d- -l1 | grep -o 'gpu [0-9]\{1,3\}' | cut -c 5-10}%${font}
-${color tomato}${execbar "radeontop -d- -l1 | grep -o 'gpu [0-9]\{1,3\}' | cut -c 5-10"}
-${color tomato}${offset 3}${execgraph "radeontop -d- -l1 | grep -o 'gpu [0-9]\{1,3\}' | cut -c 5-10" 30,190 000000 FF6347} ${execgraph "radeontop -d- -l1 | grep -o 'vram [0-9]\{1,3\}' | cut -c 5-10 | awk '{print $1 - 99}'" 30,190 000000 FF6347} ${voffset 13} ${goto 25}${color0}GPU Usage: ${execi 5 radeontop -d- -l1 | grep -o 'gpu [0-9]\{1,3\}' | cut -c 5-10}%${voffset -30}${goto 215}VRAM Usage: ${execi 5 radeontop -d- -l1 | grep -o 'vram [0-9]\{1,3\}' | cut -c 5-10 | awk '{print $1 - 99}'}%${endif}
+${color tomato}${offset 3}${nvidiagraph gpuutil 30,190 000000 FF6347} ${nvidiagraph mem 30,190 000000 FF6347} ${voffset 13} ${goto 25}${color0}GPU Usage: ${nvidia gpuutil}${goto 215}VRAM Usage: ${nvidia memutil}%${endif}
 ${color0}${hr}${font}
 ${color0}${font ConkySymbols:size=18}k${font :Bold:}${voffset -5} FILE SYSTEMS${alignr}NVMe ${fs_used_perc /}%${if_match "${nodename_short}" == "mother"} | HDD ${fs_used_perc /var/hdd}%${endif}${font}
-${color0}NVMe ${goto 60}${color darkcyan}${fs_bar 8,210 /} ${color0}${alignr}${fs_free /} / ${fs_size /}${if_match "${nodename_short}" == "mother"}
+${voffset 5}${color0}NVMe ${goto 60}${color darkcyan}${fs_bar 8,210 /} ${color0}${alignr}${fs_free /} / ${fs_size /}${if_match "${nodename_short}" == "mother"}
 ${color0}HDD  ${goto 60}${color darkcyan}${fs_bar 8,210 /var/hdd} ${color0}${alignr} ${fs_free /var/hdd} / ${fs_size /var/hdd}${if_existing /home/jozan/exthdd}
 ${color0}EXT  ${goto 60}${color darkcyan}${fs_bar 8,210 /home/jozan/exthdd} ${color0}${alignr}${fs_free /home/jozan/exthdd} / ${fs_size /home/jozan/exthdd}${endif}${endif}
 ${color darkcyan}${offset 3}${diskiograph_read nvme0n1 30,190 000000 008B8B} ${diskiograph_write nvme0n1 30,190 000000 008B8B} ${voffset 13} ${goto 25}${color0}NVMe R: ${diskio_read nvme0n1}${goto 215}NVMe W: ${diskio_write nvme0n1}${font}${if_match "${nodename_short}" == "mother"}
 ${color darkcyan}${offset 10}${diskiograph_read sda1 30,182 000000 008B8B} ${diskiograph_write sda1 30,182 000000 008B8B} ${voffset 13} ${goto 25}${color0}HDD R: ${diskio_read sda1}${goto 215}HDD W: ${diskio_write sda1}${font}${endif}
 ${color0}${hr}${font}
-${color0}${font ConkySymbols:size=18}i${font :Bold:} ${voffset -5}NETWORK${font} LAN IP: ${if_match "${nodename_short}" == "mother"}${addr eth1}${endif}${if_match "${nodename_short}" == "po-rbo"}${addr enx34298f762de7}${endif} ${if_up wg0} | WG IP: ${addr wg0}${endif}${if_match "${nodename_short}" == "mother"}
+${color0}${font ConkySymbols:size=18}i${font :Bold:} ${voffset -5}NETWORK${alignr}${execpi 5 ~/.local/bin/conky/net.sh}${if_match "${nodename_short}" == "mother"}
 ${color 81B562}${offset 3}${downspeedgraph eth1 50,190 000000 81B562 128000000}${goto 205}${color SteelBlue}${upspeedgraph eth1 50,190 000000 4682B4 128000000}
 ${color0}${voffset -55}${offset 10}Download${goto 210}Upload${offset 10}
 ${offset 10} ${downspeed eth1} ${goto 210}${upspeed eth1}${endif}${if_match "${nodename_short}" == "po-rbo"}
diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh
index 863cfb7..2f5ab88 100755
--- a/.local/bin/conky/net.sh
+++ b/.local/bin/conky/net.sh
@@ -28,21 +28,12 @@ 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}NET ${hr}${font}
-${color1}No network${font}'
-	exit
+	:
 fi
-echo -n $if_main
-exit
 
-echo '${color1}NET ${hr 2}${font}
-${color1}Interface: ${color0}'$if_main'${font}'
+echo $if_main'${font}'
 [ -z $if_wg ] || echo '${color1}WireGuard: ${color0}ON${font}'
-echo '${color1}---------
-${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}${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}'
+[ -z $if_wg ] || echo '${color1}WG  IP:   ${color0}${goto 70}${addr '$if_wg'}${font}'
+echo '${voffset 3}${color1}LAN IP:   ${color0}${goto 70}${addr '$if_main'}${font}'
+echo '${color1}DNS IP:  ${color0}${goto 70}${nameserver 0}${font}'
+echo '${color1}WAN IP: ${color0}${goto 70}${execi 15 curl -s https://ifconfig.me || echo No WAN}${font}'