Pop update

1 files changed, 23 insertions, 31 deletions

diff --git a/.config/conkyrc b/.config/conkyrc
index e69a172..4b95633 100644
--- a/.config/conkyrc
+++ b/.config/conkyrc
@@ -11,7 +11,7 @@ conky.config = {
     use_spacer = 'none',
     use_xft = true,
     xftalpha = 1,
-    font  = 'Cantarell Mono:size=14',
+    font  = 'NotoSansMono Nerd Font:size=14',
 	font1 = 'Hack Nerd Font Mono:bold:size=11',
 	font2 = 'Hack Nerd Font Mono:bold:size=10',
 	template0 = '\\n',
@@ -58,49 +58,41 @@ ${font1}${color white}${goto 140}${mpd_artist}
 ${goto 140}${scroll wait 25 3 1 ${mpd_title}}
 ${goto 140}${mpd_elapsed}/${mpd_length} ${mpd_bar}
 ${execi 5 ~/.local/bin/conky_cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 20,150 -n}
-${hr}${endif}${if_up re0}
+${hr}${endif}${if_up enx4ce1734c425a}
 ${font2}${color white}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}
 ${hr}${endif}
-${color grey}${alignc}New mails${template0}\
-${if_match ${new_mails /var/mail/jozan/gmail_br/INBOX}>0}${color grey}GMail BR:  ${font1}${color white}${new_mails /var/mail/jozan/gmail_br/INBOX}${font}${template0}${endif}\
-${if_match ${new_mails /var/mail/jozan/gmail_oon/INBOX}>0}${color grey}${color grey}GMail OON: ${font1}${color white}${new_mails /var/mail/jozan/gmail_oon/INBOX}${font}${template0}${endif}\
-${if_match ${new_mails /var/mail/jozan/gmail_tos/INBOX}>0}${color grey}${color grey}GMail TOS: ${font1}${color white}${new_mails /var/mail/jozan/gmail_tos/INBOX}${font}${template0}${endif}${hr}
-${color grey}Battery: ${font1}${color white}${if_match ${battery_percent}<15}${color red}${endif}${battery_percent}% ${battery_bar}${font}
+${color grey}CPU: ${font1}${color white} ${freq_g} GHz ${color white}${cpu}%
+${offset 4}${cpugraph bfbfbf c0c0c0}
+${color grey}1:${color white} ${cpu cpu0}% ${cpubar cpu0}${color white}
+${color grey}2:${color white} ${cpu cpu1}% ${cpubar cpu1}${color white}
+${color grey}3:${color white} ${cpu cpu2}% ${cpubar cpu2}${color white}
+${color grey}4:${color white} ${cpu cpu3}% ${cpubar cpu3}${color white}
+${color grey}5:${color white} ${cpu cpu4}% ${cpubar cpu4}${color white}
+${color grey}6:${color white} ${cpu cpu5}% ${cpubar cpu5}${color white}${font}
 ${hr}
-${color grey}CPU: ${font1}${color white} ${freq_g} GHz ${color white}${if_match ${cpu}>80}${color red}${else}${endif}${cpu}%
-${offset 4}${cpugraph bfbfbf c0c0c0}${color white}
-${color grey}1:${color white} ${if_match ${cpu cpu0}>80}${color red}${else}${endif}${cpu cpu0}% ${cpubar cpu0}${color white}
-${color grey}2:${color white} ${if_match ${cpu cpu1}>80}${color red}${else}${endif}${cpu cpu1}% ${cpubar cpu1}${color white}
-${color grey}3:${color white} ${if_match ${cpu cpu2}>80}${color red}${else}${endif}${cpu cpu2}% ${cpubar cpu2}${color white}
-${color grey}4:${color white} ${if_match ${cpu cpu3}>80}${color red}${else}${endif}${cpu cpu3}% ${cpubar cpu3}${color white}
-${color grey}5:${color white} ${if_match ${cpu cpu4}>80}${color red}${else}${endif}${cpu cpu4}% ${cpubar cpu4}${color white}
-${color grey}6:${color white} ${if_match ${cpu cpu5}>80}${color red}${else}${endif}${cpu cpu5}% ${cpubar cpu5}${color white}
-${color grey}7:${color white} ${if_match ${cpu cpu6}>80}${color red}${else}${endif}${cpu cpu6}% ${cpubar cpu6}${color white}
-${color grey}8:${color white} ${if_match ${cpu cpu7}>80}${color red}${else}${endif}${cpu cpu7}% ${cpubar cpu7}${color white}${font}
+${color grey}RAM:  ${font1}${color white}${mem} / ${memmax} ${color white}${memperc}% ${membar 4}${font}
+${offset 4}${memgraph bfbfbf c0c0c0}
+${color grey}SWAP:  ${font1}${color white}${swap} / ${swapmax} ${color white}${swapperc}% ${swapbar 4}${font}
 ${hr}
-${color grey}RAM:  ${font1}${color white}${mem} / ${memmax} ${color white}${if_match ${memperc}>80}${color red}${else}${endif}${memperc}% ${membar 4}${font}
-${offset 4}${memgraph bfbfbf c0c0c0}${color white}
-${color grey}SWAP:  ${font1}${color white}${swap} / ${swapmax} ${color white}${if_match ${swapperc}>80}${color red}${else}${endif}${swapperc}% ${swapbar 4}${font}
-${hr}
-${color grey}SSD: ${font1}${color white}${if_match ${fs_free_perc /}<20}${color red}${else}${endif}${fs_free_perc /}% ${fs_bar 6 /}${font}
+${color grey}SSD: ${font1}${color white}${fs_free_perc /}% ${fs_bar 6 /}${font}
 ${hr}
 ${color grey}Process:${color grey}${alignr}PID     CPU     MEM
-${font1}${color white}${top name 1} ${alignr}${top pid 1}  ${top cpu 1}  ${top mem 1}
-${font1}${color  grey}${top name 2} ${alignr}${top pid 2}  ${top cpu 2}  ${top mem 2}
-${font1}${color white}${top name 3} ${alignr}${top pid 3}  ${top cpu 3}  ${top mem 3}
-${font1}${color  grey}${top name 4} ${alignr}${top pid 4}  ${top cpu 4}  ${top mem 4}${font}
+${font1}${color white}${top_mem name 1} ${alignr}${top_mem pid 1}  ${top_mem cpu 1}  ${top_mem mem_res 1}
+${font1}${color  grey}${top_mem name 2} ${alignr}${top_mem pid 2}  ${top_mem cpu 2}  ${top_mem mem_res 2}
+${font1}${color white}${top_mem name 3} ${alignr}${top_mem pid 3}  ${top_mem cpu 3}  ${top_mem mem_res 3}
+${font1}${color  grey}${top_mem name 4} ${alignr}${top_mem pid 4}  ${top_mem cpu 4}  ${top_mem mem_res 4}${font}
 ${color grey}---------
 ${color grey}Processes: ${color white}${processes}
-${hr}${if_up re0}
-${color grey}LAN IP:    ${font1}${color white}${addr re0}${font}
+${hr}${if_up enx4ce1734c425a}
+${color grey}LAN IP:    ${font1}${color white}${addr enx4ce1734c425a}${font}
 ${color grey}---------
 ${color grey}VPN IP:    ${font1}${color white}${addr proton0}${font}
 ${color grey}---------
 ${color grey}Public IP: ${color white}${font1}${execi 300 curl -s https://ifconfig.me || echo No Address}${font}${color grey}
 ${hr}
-${color grey}Down: ${color white}${font1}${downspeed re0} ${font}${color grey}- Up: ${color white}${font1}${upspeed re0}${font}
-${color grey}Down: ${color white}${downspeedgraph re0 bfbfbf c0c0c0  125829120}
-${color grey}Up:   ${color white}${upspeedgraph   re0 bfbfbf c0c0c0  125829120}
+${color grey}Down: ${color white}${font1}${downspeed enx4ce1734c425a} ${font}${color grey}- Up: ${color white}${font1}${upspeed enx4ce1734c425a}${font}
+${color grey}Down: ${color white}${downspeedgraph enx4ce1734c425a bfbfbf c0c0c0  125829120}
+${color grey}Up:   ${color white}${upspeedgraph   enx4ce1734c425a bfbfbf c0c0c0  125829120}
 ${hr}
 ${color grey}${alignc}DNS
 ${font1}${color white}${nameserver 0}${font}