salt/home
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Conky: Modularize more generated configs

Browse Source
This commit is contained in:
Salt 2020-06-04 18:12:15 -05:00
parent 2dd26fcbab
commit 71020bd1b1
1 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
.config/conky/gen.sh
View File

@ -149,67 +149,69 @@ conky.config = {
EOF EOF
} }
step_text() { step_text() {
local -r topitems=4
# Generate our actual functional Conky stuff # Generate our actual functional Conky stuff
# Header # Header
cat << 'EOF' >> "$_optout" cat <<- 'EOF' >> "$_optout"
conky.text = [[ conky.text = [[
${font Roboto:style=Light:size=30}$alignr${no_update $nodename_short}$font ${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=17}$alignr${time %I:%M %p}$font
${font Roboto:style=Light:size=12}${acpitemp}°C$alignr${time %A, %B %d, %Y}$font ${font Roboto:style=Light:size=12}${acpitemp}°C$alignr${time %A, %B %d, %Y}$font
EOF EOF
# CPU info # CPU info
cat << 'EOF' >> "$_optout" cat <<- 'EOF' >> "$_optout"
${color3}$hr$color ${color3}$hr$color
${font Roboto:style=Medium:size=9}CPU$font: $freq_g GHz$alignr$cpu% ${font Roboto:style=Medium:size=9}CPU$font: $freq_g GHz$alignr$cpu%
${color8}${cpugraph cpu1 36,200} ${cpugraph cpu2 36,200} ${color8}${cpugraph cpu1 36,200} ${cpugraph cpu2 36,200}
${cpugraph cpu3 36,200} ${cpugraph cpu4 36,200}$color ${cpugraph cpu3 36,200} ${cpugraph cpu4 36,200}$color
${color8}${top name 1}$color$alignr${top cpu 1}% EOF
${color8}${top name 2}$color$alignr${top cpu 2}% for i in $(seq $topitems); do
${color8}${top name 3}$color$alignr${top cpu 3}% echo "\${color8}\${top name $i}\$color\$alignr\${top cpu $i}%" >> "$_optout"
${color8}${top name 4}$color$alignr${top cpu 4}% done
EOF
# Memory info # Memory info
cat << 'EOF' >> "$_optout" cat <<- 'EOF' >> "$_optout"
${color3}$hr$color ${color3}$hr$color
${font Roboto:style=Medium:size=9}Memory$font: $mem / $memmax used$alignr$memperc% ${font Roboto:style=Medium:size=9}Memory$font: $mem / $memmax used$alignr$memperc%
${color9}${memgraph}$color ${color9}${memgraph}$color
Memory$alignr$memeasyfree ${color9}${membar}$color Memory$alignr$memeasyfree ${color9}${membar}$color
Swap$alignr$swapfree ${color9}${swapbar}$color EOF
${color9}${top_mem name 1}$color$alignr${top_mem mem 1}% if [ -n "$(swapon)" ]; then
${color9}${top_mem name 2}$color$alignr${top_mem mem 2}% echo "Swap\$alignr\$swapfree \${color9}\${swapbar}\$color" >> "$_optout"
${color9}${top_mem name 3}$color$alignr${top_mem mem 3}% fi
${color9}${top_mem name 4}$color$alignr${top_mem mem 4}% for i in $(seq $topitems); do
EOF echo "\${color9}\${top_mem name $i}\$color\$alignr\${top_mem mem $i}%" >> "$_optout"
done
# Disk info # Disk info
cat << 'EOF' >> "$_optout" cat <<- 'EOF' >> "$_optout"
${color3}$hr$color ${color3}$hr$color
${font Roboto:style=Medium:size=9}Disk$font (R/W):$alignr${diskio /dev/sda} ${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 ${color7}${diskiograph_read /dev/sda 36,200} ${diskiograph_write /dev/sda 36,200}$color
/$alignr${fs_free /} ${color7}${fs_bar /}$color EOF
/home$alignr${fs_free /home} ${color7}${fs_bar /home}$color # Mountpoint detection
/boot$alignr${fs_free /boot} ${color7}${fs_bar /boot}$color for mountpoint in / /home /var /usr /opt /boot /boot/efi; do
/boot/efi$alignr${fs_free /boot/efi} ${color7}${fs_bar /boot/efi}$color if mountpoint $mountpoint > /dev/null 2>&1; then
${color7}${top_io name 1}$color$alignr${top_io io_perc 1}% echo "$mountpoint\$alignr\${fs_free $mountpoint} \${color7}\${fs_bar $mountpoint}\$color" >> "$_optout"
${color7}${top_io name 2}$color$alignr${top_io io_perc 2}% fi
${color7}${top_io name 3}$color$alignr${top_io io_perc 3}% done
${color7}${top_io name 4}$color$alignr${top_io io_perc 4}% for i in $(seq $topitems); do
EOF echo "\${color7}\${top_io name $i}\$color\$alignr\${top_io io_perc $i}%" >> "$_optout"
done
# Networking # Networking
cat << 'EOF' >> "$_optout" cat <<-'EOF' >>"$_optout"
${color3}$hr$color ${color3}$hr$color
${font Roboto:style=Medium:size=9}Network$font:${alignr}Default $gw_iface${if_up wlp1s0} ${font Roboto:style=Medium:size=9}Network$font:${alignr}Default $gw_iface${if_up wlp1s0}
wlp1s0 (U/D):$alignr${addr wlp1s0} / ${wireless_essid wlp1s0} EOF
${color6}${upspeedgraph wlp1s0 36,200} ${downspeedgraph wlp1s0 36,200}$color$endif${if_up wlp5s0} for interface in $(iw dev | awk '$1=="Interface"{print $2}'); do
wlp5s0 (U/D):$alignr${addr wlp5s0} / ${wireless_essid wlp5s0} cat <<- EOF >>"$_optout"
${color6}${upspeedgraph wlp5s0 36,200} ${downspeedgraph wlp5s0 36,200}$color$endif${if_up enp0s31f6} $interface (U/D): \$alignr\${addr $interface} / \${wireless_essid $interface}
enp0s31f6 (U/D):$alignr${addr enp0s31f6} \${color6}\${upspeedgraph $interface 36,200} \${downspeedgraph $interface 36,200}\$color
${color6}${upspeedgraph enp0s31f6 36,200} ${downspeedgraph enp0s31f6 36,200}$color$endif${if_up eno1} EOF
eno1 (U/D):$alignr${addr eno1} done
${color6}${upspeedgraph eno1 36,200} ${downspeedgraph eno1 36,200}$color$endif${if_up enp0s20f0u2} echo "]]" >> "$_optout"
enp0s20f0u2 (U/D):$alignr${addr enp0s20f0u2}
${color6}${upspeedgraph enp0s20f0u2 36,200} ${downspeedgraph enp0s20f0u2 36,200}$color$endif
]]
EOF
} }
genconfig() { genconfig() {
log "Generating config: $_optout" log "Generating config: $_optout"