cleanup

GonKyrellM

@@ -129,16 +129,16 @@ ${color1}${cpubar cpu3 5,}
 ${color2}${alignc}CPU3 ${color0}
 
 # sensors, load, procs
-${color2}Load ${alignr}${color2}${loadavg 1}
-${color2}Procs ${alignr}${color2}$processes
-${color2}CPU ${alignr}$color${acpitemp}°C
-${color2}Fan ${alignr}$color${ibm_fan}
+${color2}Load ${alignr}${loadavg 1}
+${color2}Procs ${alignr}$processes
+${color2}CPU ${alignr}${acpitemp}°C
+${color2}Fan ${alignr}${ibm_fan}
 #
 
-${color2}Disk IO${color2} ${alignr}$diskio
+${color2}Disk IO ${alignr}$diskio
 ${color1}${diskiograph 40,99 ff0000 00ff00 -l}
 #
-# Network data (my desktop have only LAN). ETHERNET ring is mostly useless but looks pretty, main info is in the graphs
+# Network data 
 ${color2}Net ${alignr}${color 00ff00}${downspeed enp0s25} ${alignr}${color ff0000}${upspeed enp0s25}
 ${downspeedgraph enp0s25 40,50 00ff00 00ff00 100 -l -t} ${alignr}${upspeedgraph enp0s25 40,50 ff0000 ff0000 100 -l -t}
 
@@ -149,15 +149,15 @@ ${color2}Swap ${color0}${alignr}${swapfree}
 ${color1}${swapbar 5,}
 
 # Filesystems
-${color2}/ ${color2}${alignr}${fs_free /}
+${color2}/ ${alignr}${fs_free /}
 ${color1}${fs_bar 5,100 /}
-${color2}/tmp ${color2}${alignr}${fs_free /tmp}
+${color2}/tmp ${alignr}${fs_free /tmp}
 ${color1}${fs_bar 5,100 /tmp}
-${color2}/home ${color2}${alignr}${fs_free /home}
+${color2}/home ${alignr}${fs_free /home}
 ${color1}${fs_bar 5,100 /home}
-${color2}/nfs ${color2}${alignr}${fs_free /nfs/tmp}
+${color2}/nfs ${alignr}${fs_free /nfs/tmp}
 ${color1}${fs_bar 5,100 /nfs/tmp}
 
 # 
-${color2}Batterie ${color2}${alignr}${battery_percent}%
+${color2}Batt ${alignr}${battery_short}
 ${color1}${battery_bar 5,100}