X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/97546c0717e183d360a0375064130e20a7682990..refs/heads/cadscan:/conkyrc

diff --git a/conkyrc b/conkyrc
index a5c79df..6eb26d0 100644
--- a/conkyrc
+++ b/conkyrc
@@ -83,10 +83,12 @@ ${endif}
 # |--MEM
 ${font Droid Sans:style=Bold:size=12}${color 75D1FF}MEMORY${color 1B71CC}$hr${color}${font}
 RAM${alignr}$memperc%
-${mem}/${memmax}${alignr}${color 75D1FF}${membar 8,150}${color}
+${mem}/${memmax}${alignr}${color 75D1FF}${membar 8,150}${color}#
 # |--SWAP
-SWAP${alignr}${swapperc}%
-${swap}/${swapmax}${alignr}${color 75D1FF}${swapbar 8,150}${color}
+${if_match "${swapmax}" == "0B"}
+SWAP${alignr}${swapperc}#
+${swap}/${swapmax}${alignr}${color 75D1FF}${swapbar 8,150}${color}#
+${endif}
 
 # |--PROC
 ${font Droid Sans:style=Bold:size=12}${color 75D1FF}TOP${color 1B71CC}$hr${color}${font}
@@ -101,17 +103,19 @@ ${top name 5}${alignr 80}${top cpu 5}${alignr}${top mem 5}
 # - NETWORK - #
 ###############
 ${font Droid Sans:style=Bold:size=12}${color 75D1FF}NETWORK${color 1B71CC}$hr${color}${font}
-Public IP: ${alignr}${execi 1800 ~/bin/whatsmyip}${if_up enp3s0}
+Public IP: ${alignr}${execi 1800 ~/bin/whatsmyip}#
+${if_up enp3s0}
 Local IP: ${alignr}${addr enp3s0}
-Upload: ${upspeedf enp3s0}KiB/s${alignr}${color 75D1FF}${upspeedgraph enp3s0 20,150}${color}
-${voffset -20}Overall: ${totalup enp3s0}
-Download: ${downspeedf enp3s0}KiB/s${alignr}${color 75D1FF}${downspeedgraph enp3s0 20,150}${color}
-${voffset -20}Overall: ${totaldown enp3s0}${endif}${if_up wlp3s0}
+Upload:   ${alignr 10}${upspeed enp3s0}/s${alignr}${color 75D1FF}${upspeedgraph enp3s0 20,150}${color}
+${voffset -20}Overall: ${alignr 160}${totalup enp3s0}
+Download: ${alignr 10}${downspeed enp3s0}/s${alignr}${color 75D1FF}${downspeedgraph enp3s0 20,150}${color}
+${voffset -20}Overall: ${alignr 160}${totaldown enp3s0}${endif}#
+${if_up wlp3s0}
 Local IP: ${alignr}${addr wlp3s0}
-Upload: ${upspeedf wlp3s0}KiB/s${alignr}${color 75D1FF}${upspeedgraph wlp3s0 20,150}${color}
-${voffset -20}Overall: ${totalup wlp3s0}
-Download: ${downspeedf wlp3s0}KiB/s${alignr}${color 75D1FF}${downspeedgraph wlp3s0 20,150}${color}
-${voffset -20}Overall: ${totaldown wlp3s0}${endif}
+Upload:   ${alignr 10}${upspeed wlp3s0}/s${alignr}${color 75D1FF}${upspeedgraph wlp3s0 20,150}${color}
+${voffset -20}Overall: ${alignr 160}${totalup wlp3s0}
+Download: ${alignr 10}${downspeed wlp3s0}/s${alignr}${color 75D1FF}${downspeedgraph wlp3s0 20,150}${color}
+${voffset -20}Overall: ${alignr 160}${totaldown wlp3s0}${endif}
 
 ##########
 # - HD - #
@@ -122,5 +126,7 @@ Root: ${fs_used_perc /}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /}${co
 Free: ${fs_free /} ${alignr 1}Used: ${fs_used /}
 Home: ${fs_used_perc /home}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /home}${color}
 Free: ${fs_free /home} ${alignr 1}Used: ${fs_used /home}
+${if_mounted /mnt/data}data: ${fs_used_perc /mnt/data}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /mnt/data}${color}
+Free: ${fs_free /mnt/data} ${alignr 1}Used: ${fs_used /mnt/data}${endif}
 ${if_mounted /mnt/Skaro}Skaro: ${fs_used_perc /mnt/Skaro}%${goto 100}${alignr}${color 75D1FF}${fs_bar 7,150 /mnt/Skaro}${color}
 Free: ${fs_free /mnt/Skaro} ${alignr 1}Used: ${fs_used /mnt/Skaro}${endif}