diff options
-rw-r--r-- | .config/conkyrc | 50 | ||||
-rwxr-xr-x | .local/bin/conky/net.sh | 13 |
2 files changed, 32 insertions, 31 deletions
diff --git a/.config/conkyrc b/.config/conkyrc index ca0cf8c..dcd57a0 100644 --- a/.config/conkyrc +++ b/.config/conkyrc @@ -12,8 +12,9 @@ conky.config = { use_xft = true, xftalpha = 1, font = 'NotoSansMono Nerd Font:size=10', - font1 = 'Hack Nerd Font Mono:bold:size=10', - font2 = 'Hack Nerd Font Mono:bold:size=9', + font1 = 'NotoSansMono Nerd Font:bold:size=10', + font2 = 'Hack Nerd Font Mono:bold:size=10', + font3 = 'Hack Nerd Font Mono:bold:size=9', template0 = '\\n', if_up_strictness = address, format_human_readable = true, @@ -47,22 +48,22 @@ conky.config = { conky.text = [[ ${color #928374}${alignc}${time %A %e %B %Y - %Hh%M} -${color #ebdbb2}SYSTEM ${hr} -${color #928374}Terminal: ${font1}${color #ebdbb2}${nodename_short}${font} -${color #928374}OS: ${font1}${color #ebdbb2}${sysname}${font} -${color #928374}Kernel: ${font1}${color #ebdbb2}${kernel}${font} -${color #928374}Uptime: ${font1}${color #ebdbb2}${uptime}${font} -${if_mpd_playing}MPD ${hr} +${color #ebdbb2}${font1}SYSTEM ${hr}${font} +${color #928374}Terminal: ${font2}${color #ebdbb2}${nodename_short}${font} +${color #928374}OS: ${font2}${color #ebdbb2}${sysname}${font} +${color #928374}Kernel: ${font2}${color #ebdbb2}${kernel}${font} +${color #928374}Uptime: ${font2}${color #ebdbb2}${uptime}${font} +${if_mpd_playing}${font1}MPD ${hr}${font} -${font1}${color #ebdbb2}${goto 130}${mpd_artist} +${font2}${color #ebdbb2}${goto 130}${mpd_artist} ${goto 130}${scroll wait 30 3 1 ${mpd_title}} ${goto 130}${mpd_elapsed}/${mpd_length} ${mpd_bar} ${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 0,150 -n}${font} -${endif}${if_up enx4ce1734c425a}WEATHER ${hr} -${font2}${color #ebdbb2}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}${endif} -CPU ${hr} -${color #928374}CPU: ${font1}${color #ebdbb2} ${freq_g} GHz ${color #ebdbb2}${cpu}% +${endif}${if_up enx4ce1734c425a}${font1}WEATHER ${hr}${font} +${font3}${color #ebdbb2}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}${endif} +${font1}CPU ${hr}${font} +${color #928374}CPU: ${font2}${color #ebdbb2} ${freq_g} GHz ${color #ebdbb2}${cpu}% ${offset 4}${cpugraph bfbfbf c0c0c0} ${color #928374}1:${color #ebdbb2} ${cpu cpu0}% ${cpubar cpu0}${color #ebdbb2} ${color #928374}2:${color #ebdbb2} ${cpu cpu1}% ${cpubar cpu1}${color #ebdbb2} @@ -70,20 +71,19 @@ ${color #928374}3:${color #ebdbb2} ${cpu cpu2}% ${cpubar cpu2}${color #ebdbb2} ${color #928374}4:${color #ebdbb2} ${cpu cpu3}% ${cpubar cpu3}${color #ebdbb2} ${color #928374}5:${color #ebdbb2} ${cpu cpu4}% ${cpubar cpu4}${color #ebdbb2} ${color #928374}6:${color #ebdbb2} ${cpu cpu5}% ${cpubar cpu5}${color #ebdbb2}${font} -RAM ${hr} -${color #928374}RAM: ${font1}${color #ebdbb2}${mem} / ${memmax} ${color #ebdbb2}${memperc}% ${membar 4}${font} +${font1}RAM ${hr}${font} +${color #928374}RAM: ${font2}${color #ebdbb2}${mem} / ${memmax} ${color #ebdbb2}${memperc}% ${membar 4}${font} ${offset 4}${memgraph bfbfbf c0c0c0} -${color #928374}SWAP: ${font1}${color #ebdbb2}${swap} / ${swapmax} ${color #ebdbb2}${swapperc}% ${swapbar 4}${font} -DISK ${hr} -${color #928374}SSD: ${font1}${color #ebdbb2}${fs_free_perc /}% ${fs_bar 6 /}${font} -PROC ${hr} +${color #928374}SWAP: ${font2}${color #ebdbb2}${swap} / ${swapmax} ${color #ebdbb2}${swapperc}% ${swapbar 4}${font} +${font1}DISK ${hr}${font} +${color #928374}SSD: ${font2}${color #ebdbb2}${fs_free_perc /}% ${fs_bar 6 /}${font} +${font1}PROC ${hr}${font} ${color #928374}Process:${color #928374}${alignr}PID CPU MEM -${font1}${color #ebdbb2}${top_mem name 1} ${alignr}${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem_res 1} -${font1}${color #928374}${top_mem name 2} ${alignr}${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem_res 2} -${font1}${color #ebdbb2}${top_mem name 3} ${alignr}${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem_res 3} -${font1}${color #928374}${top_mem name 4} ${alignr}${top_mem pid 4} ${top_mem cpu 4} ${top_mem mem_res 4}${font} +${font2}${color #ebdbb2}${top_mem name 1} ${alignr}${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem_res 1} +${font2}${color #928374}${top_mem name 2} ${alignr}${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem_res 2} +${font2}${color #ebdbb2}${top_mem name 3} ${alignr}${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem_res 3} +${font2}${color #928374}${top_mem name 4} ${alignr}${top_mem pid 4} ${top_mem cpu 4} ${top_mem mem_res 4}${font} ${color #928374}--------- -${color #928374}Processes: ${font1}${color #ebdbb2}${processes}${font} -NETWORK ${hr} +${color #928374}Processes: ${font2}${color #ebdbb2}${processes}${font} ${execp ~/.local/bin/conky/net.sh} ]] diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh index 09e4fb6..0a1bbee 100755 --- a/.local/bin/conky/net.sh +++ b/.local/bin/conky/net.sh @@ -26,14 +26,15 @@ else exit fi -echo '${color #928374}Interface: ${font1}${color #ebdbb2}'$if_main'${font} +echo '${font1}NETWORK ${hr}${font} +${color #928374}Interface: ${font2}${color #ebdbb2}'$if_main'${font} ${color #928374}--------- -${color #928374}LAN IP: ${font1}${color #ebdbb2}${addr '$if_main'}${font} -${color #928374}DNS IP: ${font1}${color #ebdbb2}${nameserver 0}${font} -${color #928374}WAN IP: ${color #ebdbb2}${font1}${execi 300 curl -s https://ifconfig.me || echo No WAN}${font} +${color #928374}LAN IP: ${font2}${color #ebdbb2}${addr '$if_main'}${font} +${color #928374}DNS IP: ${font2}${color #ebdbb2}${nameserver 0}${font} +${color #928374}WAN IP: ${color #ebdbb2}${font2}${execi 300 curl -s https://ifconfig.me || echo No WAN}${font} ${color #928374}--------- -${color #928374}Speed: ${font1}down: ${color #ebdbb2}${font1}${downspeed '$if_main'} ${color #928374}- up: ${color #ebdbb2}${font1}${upspeed '$if_main'}${font} +${color #928374}Speed: ${font2}down: ${color #ebdbb2}${font2}${downspeed '$if_main'} ${color #928374}- up: ${color #ebdbb2}${font2}${upspeed '$if_main'}${font} ${color #928374}Down: ${color #ebdbb2}${downspeedgraph '$if_main' bfbfbf c0c0c0 125829120} ${color #928374}Up: ${color #ebdbb2}${upspeedgraph '$if_main' bfbfbf c0c0c0 125829120}' -# ${color #928374}VPN IP: ${font1}${color #ebdbb2}${addr proton0}${font} +# ${color #928374}VPN IP: ${font2}${color #ebdbb2}${addr proton0}${font} |