diff options
| -rw-r--r-- | .config/conky/conkyrc | 95 | ||||
| -rwxr-xr-x | .local/bin/conky/net.sh | 23 | ||||
| -rwxr-xr-x | .local/bin/conky/weather.sh | 13 |
3 files changed, 59 insertions, 72 deletions
diff --git a/.config/conky/conkyrc b/.config/conky/conkyrc index 3af2470..9a3900b 100644 --- a/.config/conky/conkyrc +++ b/.config/conky/conkyrc @@ -3,7 +3,7 @@ conky.config = { background = false, own_window = true, own_window_class = 'Desktop', - own_window_transparent = true, + own_window_transparent = false, own_window_type = 'desktop', own_window_argb_visual = true, own_window_argb_value = 255, @@ -11,29 +11,31 @@ conky.config = { use_spacer = 'left', use_xft = true, xftalpha = 1, - font = 'Hack Nerd Font Mono:size=10', - font1 = 'Hack Nerd Font Mono:bold:size=10', - font2 = 'Hack Nerd Font Mono:bold:size=10', + font = 'Open Sans:style=bold:size=10', + font1 = 'ConkySymbols:size=18', template0 = '\\n', if_up_strictness = address, format_human_readable = true, - update_interval = 1, + update_interval = 0.3, uppercase = false, override_utf8_locale = true, stippled_borders = 0, border_width = 1, + border_inner_margin = 8, + border_outer_margin = 0, draw_borders = false, draw_outline = false, draw_shades = false, default_shade_color = AAAAAA, default_outline_color = AAAAAA, - draw_graph_borders = false, + draw_graph_borders = true, show_graph_scale = false, show_graph_range = false, alignment = 'top_left', - minimum_width = 380, - maximum_width = 380, + minimum_width = 390, + maximum_width = 390, minimum_height = 1440, + maximum_size = 390, gap_x = 10, gap_y = 40, net_avg_samples = 2, @@ -53,53 +55,54 @@ conky.config = { } conky.text = [[ -${color0}${font2}${alignc}${time %A %e %B %Y - %Hh%M} -${color1}${font1}SYS ${hr 2}${font} -${color1}Terminal: ${font2}${color0}${nodename_short}${font} -${color1}OS: ${font2}${color0}${sysname}${font} -${color1}Kernel: ${font2}${color0}${kernel}${font} -${color1}Uptime: ${font2}${color0}${uptime}${font} -${if_match "${nodename_short}" == "mother"}${if_mpd_playing}${color1}${font1}MPD ${hr 2}${font} -${font2}${color0}${goto 130}${mpd_artist} +${color0}${alignc}${time %A %e %B %Y - %Hh%M} +${alignc}${color1}Terminal: ${color0}${nodename_short} +${alignc}${color1}OS: ${color0}${sysname} - ${execi 300 lsb_release -ds} +${alignc}${color1}Kernel: ${color0}${kernel} +${alignc}${color1}Uptime: ${color0}${uptime} +${image ~/.config/conky/artix-logo.png -p 5,10 -s 75x75 -n}${font}${if_match "${nodename_short}" == "mother"}${if_mpd_playing} +${color1}MPD ${hr 2}${font} +${color0}${goto 130}${mpd_artist} ${goto 130}${scroll wait 30 3 5 ${mpd_title}} ${goto 130}${mpd_date} - ${mpd_album} ${goto 130}${mpd_elapsed}/${mpd_length} ${mpd_bar} -${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 5,120 -n}${font} +${execi 5 ~/.local/bin/conky/cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 5,120 -n} -${endif}${endif}${execpi 300 ~/.local/bin/conky/weather.sh} -${color1}${font1}CPU ${hr 2}${font} -${color1}Freq: ${font2}${color0}${freq_g} GHz ${color0}${font}${alignr}${if_match "${nodename_short}" == "mother"}${color1}Temp:${font2}${color0}${hwmon 2 temp 1}°C${endif}${if_match "${nodename_short}" == "po-rbo"}${color1}Temp:${font2}${color0}${hwmon 4 temp 1}°C${endif}${font} -${cpugraph 50,380 ebdbb2 928374 -t} -${voffset -21}${hr} -${color1}1: ${color0}${cpubar cpu0 8,155}${color0}${color1}${alignr}2: ${color0}${cpubar cpu1 8,155}${color0} -${color1}3: ${color0}${cpubar cpu2 8,155}${color0}${color1}${alignr}4: ${color0}${cpubar cpu3 8,155}${color0} -${color1}5: ${color0}${cpubar cpu4 8,155}${color0}${color1}${alignr}6: ${color0}${cpubar cpu5 8,155}${color0}${if_match "${nodename_short}" == "mother"} -${color1}7: ${color0}${cpubar cpu6 8,155}${color0}${color1}${alignr}8: ${color0}${cpubar cpu7 8,155}${color0}${endif}${font} -${color1}${font1}MEM ${hr 2}${font} -${color0}${memgraph 50,380 ebdbb2 928374 -t} -${voffset -21}${hr} -${color1}RAM: ${color0}${membar 8}${font} -${color1}SWAP: ${color0}${swapbar 8}${font}${if_match "${nodename_short}" == "mother"} -${color1}${font1}GPU ${hr 2}${font} -${color1}Card: ${font2}${color0}${nvidia modelname}${font}${alignr}${color1}Temp: ${font2}${color0}${nvidia gputemp}°C${font} +${endif}${endif} +${color orange}${hr} +${color0}${font ConkySymbols:size=18}f${font :bold:}${voffset -5} CPU${font}${goto 115}${if_match "${nodename_short}" == "po-rbo"}AMD Ryzen 5 4500U${endif}${if_match "${nodename_short}" == "mother"}Intel i7-4790${endif} @ ${freq_g}GHz${alignr}${font :bold:}${cpu}%${font} +${color orange}${cpubar} +${color orange}${offset 10}${cpugraph cpu1 30,90 000000 DDAA00} ${cpugraph cpu2 30,90 000000 DDAA00} ${cpugraph cpu3 30,90 000000 DDAA00} ${cpugraph cpu4 30,90 000000 DDAA00} ${voffset 12} ${color White} ${goto 25}CPU 1: ${cpu cpu1}% ${goto 120}CPU 2: ${cpu cpu2}% ${goto 215}CPU 3: ${cpu cpu3}% ${voffset -29} ${goto 307}CPU 4: ${cpu cpu4}% +${color orange}${offset 10}${cpugraph cpu5 30,90 000000 DDAA00} ${cpugraph cpu6 30,90 000000 DDAA00} ${voffset 12} ${color White} ${goto 25}CPU 5: ${cpu cpu5}% ${voffset -29} ${goto 120}CPU 6: ${cpu cpu6}%${if_match "${nodename_short}" == "mother"}${goto 215}CPU 7: ${cpu cpu7}% ${voffset -29} ${goto 307}CPU 8: ${cpu cpu8}%${endif} +${color LightGreen}${hr 1}${font} +${color0}${font ConkySymbols:size=18}j${font :bold:}${voffset -5} RAM${goto 150}$mem / $memmax${alignr}${memperc}%${font} +${color LightGreen}${membar} +${color0}${font :size 11:bold}${offset 5}Top Processes ${alignr}${offset -5}CPU%${offset 10}MEM% +${color LightGreen}${memgraph 120,390 000000 228B22}${voffset -135} +${color0}${offset 5}${top_mem name 1} ${alignr 10}${offset -13}${top_mem cpu 1}${offset 15}${top_mem mem 1} +${color0}${offset 5}${top_mem name 2} ${alignr 10}${offset -13}${top_mem cpu 2}${offset 15}${top_mem mem 2} +${color0}${offset 5}${top_mem name 3} ${alignr 10}${offset -13}${top_mem cpu 3}${offset 15}${top_mem mem 3} +${color0}${offset 5}${top_mem name 4} ${alignr 10}${offset -13}${top_mem cpu 4}${offset 15}${top_mem mem 4} +${color0}${offset 5}${top_mem name 5} ${alignr 10}${offset -13}${top_mem cpu 5}${offset 15}${top_mem mem 5} +${if_match "${nodename_short}" == "mother"} +${color1}GPU ${hr 2}${font} +${color1}Card: ${color0}${nvidia modelname}${font}${alignr}${color1}Temp: ${color0}${nvidia gputemp}°C${font} ${color0}${nvidiagraph gpuutil 50,380 ebdbb2 928374 -t} -${voffset -21}${hr} ${color1}VRAM: ${color0}${nvidiabar 8 mem}${font}${endif} -${color1}${font1}DISK ${hr 2}${font} -${alignr}${if_match "${nodename_short}" == "mother"}${color1}NVMe temp:${font2}${color0}${hwmon 1 temp 1}°C${endif}${if_match "${nodename_short}" == "po-rbo"}${color1}NVMe temp:${font2}${color0}${hwmon 2 temp 1}°C${endif}${font} +${color1}DISK ${hr 2}${font} +${alignr}${if_match "${nodename_short}" == "mother"}${color1}NVMe temp:${color0}${hwmon 1 temp 1}°C${endif}${if_match "${nodename_short}" == "po-rbo"}${color1}NVMe temp:${color0}${hwmon 2 temp 1}°C${endif}${font} ${diskiograph nvme0n1 50,380 ebdbb2 928374 -t} -${voffset -21}${hr} -${color1}NVMe: ${font2}${color0}${fs_bar 8 /}${font}${if_existing /var/hdd} -${color1}HDD: ${font2}${color0}${fs_bar 8 /var/hdd}${font}${endif}${if_existing /home/jozan/exthdd} -${color1}EHDD: ${font2}${color0}${fs_bar 8 /home/jozan/exthdd}${endif} -${color1}${font1}PROC ${hr 2}${font} +${color1}NVMe: ${color0}${fs_bar 8 /}${font}${if_existing /var/hdd} +${color1}HDD: ${color0}${fs_bar 8 /var/hdd}${font}${endif}${if_existing /home/jozan/exthdd} +${color1}EHDD: ${color0}${fs_bar 8 /home/jozan/exthdd}${endif} +${color1}PROC ${hr 2}${font} ${color1}COMMAND${color1}${alignr}PID CPU MEM -${font2}${color0}${top_mem name 1} ${alignr}${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem_res 1} -${font2}${color2}${top_mem name 2} ${alignr}${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem_res 2} -${font2}${color0}${top_mem name 3} ${alignr}${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem_res 3} -${font2}${color2}${top_mem name 4} ${alignr}${top_mem pid 4} ${top_mem cpu 4} ${top_mem mem_res 4}${font} +${color0}${top_mem name 1} ${alignr}${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem_res 1} +${color2}${top_mem name 2} ${alignr}${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem_res 2} +${color0}${top_mem name 3} ${alignr}${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem_res 3} +${color2}${top_mem name 4} ${alignr}${top_mem pid 4} ${top_mem cpu 4} ${top_mem mem_res 4}${font} ${color1}--------- -${color1}Processes: ${font2}${color0}${processes}${font} +${color1}Processes: ${color0}${processes}${font} ${execpi 5 ~/.local/bin/conky/net.sh} ${if_match "${nodename_short}" == "mother"}${color0}${downspeedgraph eth1 50,185 ebdbb2 928374 256000000 -t}${goto 195}${color0}${upspeedgraph eth1 50,180 ebdbb2 928374 256000000 -t}${endif}${if_match "${nodename_short}" == "po-rbo"}${color0}${downspeedgraph enx34298f762de7 50,180 ebdbb2 928374 128000000 -t}${goto 195}${color0}${upspeedgraph enx34298f762de7 50,180 ebdbb2 928374 128000000 -t}${endif} ]] diff --git a/.local/bin/conky/net.sh b/.local/bin/conky/net.sh index 5287e44..1cf715a 100755 --- a/.local/bin/conky/net.sh +++ b/.local/bin/conky/net.sh @@ -28,22 +28,19 @@ if grep up "/sys/class/net/$if_main/operstate" >/dev/null 2>&1 && ! [ -z $(ifcon elif grep up "/sys/class/net/$if_alt/operstate" >/dev/null 2>&1 && ! [ -z $(ifconfig $if_alt 2>/dev/null | awk '/inet / {print $2}') ]; then if_main=$if_alt else - echo '${color1}${font1}NET ${hr}${font} + echo '${color1}NET ${hr}${font} ${color1}No network${font}' exit fi -echo '${color1}${font1}NET ${hr 2}${font} -${color1}Interface: ${font2}${color0}'$if_main'${font}' -[ -z $if_wg ] || echo '${color1}WireGuard: ${color0}${font2}ON${font}' +echo '${color1}NET ${hr 2}${font} +${color1}Interface: ${color0}'$if_main'${font}' +[ -z $if_wg ] || echo '${color1}WireGuard: ${color0}ON${font}' echo '${color1}--------- -${color1}LAN IP: ${font2}${color0}${addr '$if_main'}${font}' -[ -z $if_wg ] || echo '${color1}WG IP: ${color0}${font2}${addr '$if_wg'}${font}' -echo '${color1}DNS IP: ${font2}${color0}${nameserver 0}${font}' -echo '${color1}WAN IP: ${color0}${font2}${execi 15 curl -s https://ifconfig.me || echo No WAN}${font} +${color1}LAN IP: ${color0}${addr '$if_main'}${font}' +[ -z $if_wg ] || echo '${color1}WG IP: ${color0}${addr '$if_wg'}${font}' +echo '${color1}DNS IP: ${color0}${nameserver 0}${font}' +echo '${color1}WAN IP: ${color0}${execi 15 curl -s https://ifconfig.me || echo No WAN}${font} ${color1}--------- -${color1}D: ${color0}${font2}${downspeed '$if_main'}${font}${color1} -- Total: ${color0}${font2}${totaldown '$if_main'}${font} -${color1}U: ${color0}${font2}${upspeed '$if_main'}${font}${color1} -- Total: ${color0}${font2}${totalup '$if_main'}${font}' - - -# ${color1}VPN IP: ${font2}${color0}${addr proton0}${font} +${color1}D: ${color0}${downspeed '$if_main'}${font}${color1} -- Total: ${color0}${totaldown '$if_main'}${font} +${color1}U: ${color0}${upspeed '$if_main'}${font}${color1} -- Total: ${color0}${totalup '$if_main'}${font}' diff --git a/.local/bin/conky/weather.sh b/.local/bin/conky/weather.sh deleted file mode 100755 index b24f589..0000000 --- a/.local/bin/conky/weather.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -case "$(hostname -s)" in - mother | po-rbo) - ping -c1 -w1 9.9.9.9 >/dev/null 2>&1 || exit - ;; - mars) - ping -c1 -t1 9.9.9.9 >/dev/null 2>&1 || exit - ;; -esac - -echo '${color1}${font1}WEAT ${hr 2} -${font2}${color0}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font}' |