Conky: Stop tracking config since it's now dynamically-generated

This commit is contained in:
Salt 2020-06-04 17:44:15 -05:00
parent 85eedfdf37
commit 2dd26fcbab
2 changed files with 14 additions and 99 deletions

View File

@ -1,99 +0,0 @@
-- vim: ts=4 sw=4 noet ai cindent syntax=lua
-- WARNING:
-- This file was generated with conkygen. See gen.sh if you need to edit this!
-- Any changes you make here can and probably will be clobbered!
conky.config = {
own_window = true,
own_window_title = 'Conky',
own_window_class = 'Conky',
own_window_type = 'desktop',
own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
own_window_argb_visual = true,
own_window_transparent = true,
own_window_colour = '000000',
double_buffer = true,
cpu_avg_samples = 2,
net_avg_samples = 2,
no_buffers = true,
update_interval = 1,
use_xft = true,
font = 'Roboto:style=Light:size=9',
default_color = '#fffcf6',
color1 = '383c4a', -- Background
color2 = 'fffcf6', -- Foreground
color3 = '4b5162', -- Background-alt
color4 = '11d116', -- Green (Battery)
color6 = '1abc9c', -- Cyan (Network)
color7 = 'fdbc4b', -- Yellow (Disk)
color8 = '1d99f3', -- Blue (CPU)
color9 = '9b59b6', -- Magenta (Memory)
alignment = 'bottom_right',
xinerama_head = 0,
minimum_height = 0,
minimum_width = 304,
border_width = 0,
border_outer_margin = 1,
border_inner_margin = 16,
gap_x = 32,
gap_y = 48,
format_human_readable = true,
temperature_unit = "celsius",
if_up_strictness = "link",
default_bar_height = 11,
default_bar_width = 130,
default_graph_height = 36,
draw_borders = true,
draw_outline = false,
draw_graph_borders = true,
draw_shades = false
}
conky.text = [[
${font Roboto:style=Light:size=30}$alignr${no_update $nodename_short}$font
${font Roboto:style=Light:size=17}$alignr${time %I:%M %p}$font
${font Roboto:style=Light:size=12}${acpitemp}°C$alignr${time %A, %B %d, %Y}$font
${color3}$hr$color
${font Roboto:style=Medium:size=9}CPU$font: $freq_g GHz$alignr$cpu%
${color8}${cpugraph cpu1 36,200} ${cpugraph cpu2 36,200}
${cpugraph cpu3 36,200} ${cpugraph cpu4 36,200}$color
${color8}${top name 1}$color$alignr${top cpu 1}%
${color8}${top name 2}$color$alignr${top cpu 2}%
${color8}${top name 3}$color$alignr${top cpu 3}%
${color8}${top name 4}$color$alignr${top cpu 4}%
${color3}$hr$color
${font Roboto:style=Medium:size=9}Memory$font: $mem / $memmax used$alignr$memperc%
${color9}${memgraph}$color
Memory$alignr$memeasyfree ${color9}${membar}$color
Swap$alignr$swapfree ${color9}${swapbar}$color
${color9}${top_mem name 1}$color$alignr${top_mem mem 1}%
${color9}${top_mem name 2}$color$alignr${top_mem mem 2}%
${color9}${top_mem name 3}$color$alignr${top_mem mem 3}%
${color9}${top_mem name 4}$color$alignr${top_mem mem 4}%
${color3}$hr$color
${font Roboto:style=Medium:size=9}Disk$font (R/W):$alignr${diskio /dev/sda}
${color7}${diskiograph_read /dev/sda 36,200} ${diskiograph_write /dev/sda 36,200}$color
/$alignr${fs_free /} ${color7}${fs_bar /}$color
/home$alignr${fs_free /home} ${color7}${fs_bar /home}$color
/boot$alignr${fs_free /boot} ${color7}${fs_bar /boot}$color
/boot/efi$alignr${fs_free /boot/efi} ${color7}${fs_bar /boot/efi}$color
${color7}${top_io name 1}$color$alignr${top_io io_perc 1}%
${color7}${top_io name 2}$color$alignr${top_io io_perc 2}%
${color7}${top_io name 3}$color$alignr${top_io io_perc 3}%
${color7}${top_io name 4}$color$alignr${top_io io_perc 4}%
${color3}$hr$color
${font Roboto:style=Medium:size=9}Network$font:${alignr}Default $gw_iface${if_up wlp1s0}
wlp1s0 (U/D):$alignr${addr wlp1s0} / ${wireless_essid wlp1s0}
${color6}${upspeedgraph wlp1s0 36,200} ${downspeedgraph wlp1s0 36,200}$color$endif${if_up wlp5s0}
wlp5s0 (U/D):$alignr${addr wlp5s0} / ${wireless_essid wlp5s0}
${color6}${upspeedgraph wlp5s0 36,200} ${downspeedgraph wlp5s0 36,200}$color$endif${if_up enp0s31f6}
enp0s31f6 (U/D):$alignr${addr enp0s31f6}
${color6}${upspeedgraph enp0s31f6 36,200} ${downspeedgraph enp0s31f6 36,200}$color$endif${if_up eno1}
eno1 (U/D):$alignr${addr eno1}
${color6}${upspeedgraph eno1 36,200} ${downspeedgraph eno1 36,200}$color$endif${if_up enp0s20f0u2}
enp0s20f0u2 (U/D):$alignr${addr enp0s20f0u2}
${color6}${upspeedgraph enp0s20f0u2 36,200} ${downspeedgraph enp0s20f0u2 36,200}$color$endif
]]

View File

@ -150,11 +150,15 @@ EOF
}
step_text() {
# Generate our actual functional Conky stuff
# Header
cat << 'EOF' >> "$_optout"
conky.text = [[
${font Roboto:style=Light:size=30}$alignr${no_update $nodename_short}$font
${font Roboto:style=Light:size=17}$alignr${time %I:%M %p}$font
${font Roboto:style=Light:size=12}${acpitemp}°C$alignr${time %A, %B %d, %Y}$font
EOF
# CPU info
cat << 'EOF' >> "$_optout"
${color3}$hr$color
${font Roboto:style=Medium:size=9}CPU$font: $freq_g GHz$alignr$cpu%
${color8}${cpugraph cpu1 36,200} ${cpugraph cpu2 36,200}
@ -163,6 +167,9 @@ ${color8}${top name 1}$color$alignr${top cpu 1}%
${color8}${top name 2}$color$alignr${top cpu 2}%
${color8}${top name 3}$color$alignr${top cpu 3}%
${color8}${top name 4}$color$alignr${top cpu 4}%
EOF
# Memory info
cat << 'EOF' >> "$_optout"
${color3}$hr$color
${font Roboto:style=Medium:size=9}Memory$font: $mem / $memmax used$alignr$memperc%
${color9}${memgraph}$color
@ -172,6 +179,9 @@ ${color9}${top_mem name 1}$color$alignr${top_mem mem 1}%
${color9}${top_mem name 2}$color$alignr${top_mem mem 2}%
${color9}${top_mem name 3}$color$alignr${top_mem mem 3}%
${color9}${top_mem name 4}$color$alignr${top_mem mem 4}%
EOF
# Disk info
cat << 'EOF' >> "$_optout"
${color3}$hr$color
${font Roboto:style=Medium:size=9}Disk$font (R/W):$alignr${diskio /dev/sda}
${color7}${diskiograph_read /dev/sda 36,200} ${diskiograph_write /dev/sda 36,200}$color
@ -183,6 +193,9 @@ ${color7}${top_io name 1}$color$alignr${top_io io_perc 1}%
${color7}${top_io name 2}$color$alignr${top_io io_perc 2}%
${color7}${top_io name 3}$color$alignr${top_io io_perc 3}%
${color7}${top_io name 4}$color$alignr${top_io io_perc 4}%
EOF
# Networking
cat << 'EOF' >> "$_optout"
${color3}$hr$color
${font Roboto:style=Medium:size=9}Network$font:${alignr}Default $gw_iface${if_up wlp1s0}
wlp1s0 (U/D):$alignr${addr wlp1s0} / ${wireless_essid wlp1s0}
@ -199,6 +212,7 @@ ${color6}${upspeedgraph enp0s20f0u2 36,200} ${downspeedgraph enp0s20f0u2 36,200}
EOF
}
genconfig() {
log "Generating config: $_optout"
step_header
step_config
step_text