Feat: improve network reportingHEADmaster

1 files changed, 22 insertions, 16 deletions

diff --git a/conkyrc.dot.link b/conkyrc.dot.link
index c9a2822..06fddd5 100644
--- a/conkyrc.dot.link
+++ b/conkyrc.dot.link
@@ -227,22 +227,28 @@ ${color grey}Disk I/O:$color $diskio
 ${color grey}${diskiograph 000000 7f8ed3}
 $color$stippled_hr
 ${color grey}Networking:
-${if_up eth0}${color grey} eth0:  Up:$color ${upspeed eth0} k/s${color grey} - Down:$color ${downspeed eth0} k/s
-${color grey}${downspeedgraph eth0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph eth0 32,150 000000 7f8ed3 -l}${endif}
-${if_up enp0s25}${color grey} enp0s25:  Up:$color ${upspeed enp0s25} k/s${color grey} - Down:$color ${downspeed enp0s25} k/s
-${color grey}${downspeedgraph enp0s25 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph enp0s25 32,150 000000 7f8ed3 -l}${endif}
-${if_up enp1s0}${color grey} enp1s0:  Up:$color ${upspeed enp1s0} k/s${color grey} - Down:$color ${downspeed enp1s0} k/s
-${color grey}${downspeedgraph enp1s0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph enp1s0 32,150 000000 7f8ed3 -l}${endif}
-${if_up wlan0}${color grey} wlan0: Up:$color ${upspeed wlan0} k/s${color grey} - Down:$color ${downspeed wlan0} k/s
-${color grey}${downspeedgraph wlan0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph wlan0 32,150 000000 7f8ed3 -l}${endif}
-${if_up wlp2s0}${color grey} wlp2s0: Up:$color ${upspeed wlp2s0} k/s${color grey} - Down:$color ${downspeed wlp2s0} k/s
-${color grey}${downspeedgraph wlp2s0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph wlp2s0 32,150 000000 7f8ed3 -l}${endif}
-${if_up wlp3s0}${color grey} wlp3s0: Up:$color ${upspeed wlp3s0} k/s${color grey} - Down:$color ${downspeed wlp3s0} k/s
-${color grey}${downspeedgraph wlp3s0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph wlp3s0 32,150 000000 7f8ed3 -l}${endif}
-${if_up ppp0}${color grey} ppp0: Up:$color ${upspeed ppp0} k/s${color grey} - Down:$color ${downspeed ppp0} k/s
-${color grey}${downspeedgraph ppp0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph ppp0 32,150 000000 7f8ed3 -l}${endif}
-${if_up tun0}${color grey} tun0: Up:$color ${upspeed tun0} k/s${color grey} - Down:$color ${downspeed tun0} k/s
-${color grey}${downspeedgraph tun0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph tun0 32,150 000000 7f8ed3 -l}${endif}
+# Using if_existing instead of if_up, as the later can duplicate interfaces in cases like enp0s25 is an altname for eth0:
+# https://wiki.archlinux.org/title/Conky/Tips_and_tricks#Show_graphic_of_active_network_interface
+#
+# Not adding spaces/newlines between ${endif} and ${if_existing} to avoid blank lines if devices aren't up
+${if_existing /sys/class/net/eth0/operstate up}${color grey} eth0:  Up:$color ${upspeed eth0} k/s${color grey} - Down:$color ${downspeed eth0} k/s
+${color grey}${downspeedgraph eth0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph eth0 32,150 000000 7f8ed3 -l}${endif}${if_existing /sys/class/net/enp0s25 operstate up}
+${color grey} enp0s25:  Up:$color ${upspeed enp0s25} k/s${color grey} - Down:$color ${downspeed enp0s25} k/s
+${color grey}${downspeedgraph enp0s25 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph enp0s25 32,150 000000 7f8ed3 -l}${endif}${if_existing /sys/class/net/enp1s0/operstate up}
+${color grey} enp1s0:  Up:$color ${upspeed enp1s0} k/s${color grey} - Down:$color ${downspeed enp1s0} k/s
+${color grey}${downspeedgraph enp1s0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph enp1s0 32,150 000000 7f8ed3 -l}${endif}${if_existing /sys/class/net/wlan0/operstate up}
+${color grey} wlan0: Up:$color ${upspeed wlan0} k/s${color grey} - Down:$color ${downspeed wlan0} k/s
+${color grey}${downspeedgraph wlan0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph wlan0 32,150 000000 7f8ed3 -l}${endif}${if_existing /sys/class/net/wlp2s0/operstate up}
+${color grey} wlp2s0: Up:$color ${upspeed wlp2s0} k/s${color grey} - Down:$color ${downspeed wlp2s0} k/s
+${color grey}${downspeedgraph wlp2s0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph wlp2s0 32,150 000000 7f8ed3 -l}${endif}${if_existing /sys/class/net/wlp3s0/operstate up}
+${color grey} wlp3s0: Up:$color ${upspeed wlp3s0} k/s${color grey} - Down:$color ${downspeed wlp3s0} k/s
+${color grey}${downspeedgraph wlp3s0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph wlp3s0 32,150 000000 7f8ed3 -l}${endif}${if_existing /sys/class/net/ppp0/operstate up}
+${color grey} ppp0: Up:$color ${upspeed ppp0} k/s${color grey} - Down:$color ${downspeed ppp0} k/s
+${color grey}${downspeedgraph ppp0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph ppp0 32,150 000000 7f8ed3 -l}${endif}${if_existing /sys/class/net/tun0/operstate up}
+${color grey} tun0: Up:$color ${upspeed tun0} k/s${color grey} - Down:$color ${downspeed tun0} k/s
+${color grey}${downspeedgraph tun0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph tun0 32,150 000000 7f8ed3 -l}${endif}${if_existing /sys/class/net/wg0/operstate up}
+${color grey} wg0: Up:$color ${upspeed wg0} k/s${color grey} - Down:$color ${downspeed wg0} k/s
+${color grey}${downspeedgraph wg0 32,150 000000 7f8ed3 -l} $alignr${color grey}${upspeedgraph wg0 32,150 000000 7f8ed3 -l}${endif}
 $color$stippled_hr
 
 ${color grey}File systems: