diff --git a/.config/conky/conky.conf b/.config/conky/primary.conf similarity index 86% rename from .config/conky/conky.conf rename to .config/conky/primary.conf index ab87c3eb..a5a3c0db 100644 --- a/.config/conky/conky.conf +++ b/.config/conky/primary.conf @@ -30,7 +30,7 @@ conky.config = { alignment = 'top_left', xinerama_head = 0, minimum_height = 4000, - minimum_width = 300, + minimum_width = 404, border_width = 6, gap_x = 10, gap_y = 44, @@ -45,8 +45,8 @@ conky.config = { conky.text = [[ ${font Roboto:style=Medium:size=30}$alignr$nodename$font -${font Roboto:style=Light:size=17}$alignr${time %I:%M %p}$font -${font Roboto:style=Light:size=12}$alignr${time %A, %B %d, %Y}$font +${font Roboto:style=Light:size=17}$alignr$uptime$font +${font Roboto:style=Light:size=12}$alignr$kernel$font ${color3}$hr$color ${font Roboto:style=Medium:size=10}CPU$font: $freq_g GHz$alignr$cpu% ${color8}${cpugraph cpu1 40,200} ${cpugraph cpu2 40,200} @@ -61,8 +61,11 @@ ${top_mem name 1}$alignr${color9}${top_mem mem 1}%$color ${top_mem name 2}$alignr${color9}${top_mem mem 2}%$color ${top_mem name 3}$alignr${color9}${top_mem mem 3}%$color ${color3}$hr$color -${font Roboto:style=Medium:size=10}Disk$font (R/W):$alignr${diskio /dev/sda} +${font Roboto:style=Medium:size=10}Disk$font (R/W): ${fs_free /home} free$alignr${diskio /dev/sda} ${color7}${diskiograph_read /dev/sda 40,200} ${diskiograph_write /dev/sda 40,200}$color +${top_io name 1}$alignr${color7}${top_io io_perc 1}%$color +${top_io name 2}$alignr${color7}${top_io io_perc 2}%$color +${top_io name 3}$alignr${color7}${top_io io_perc 3}%$color ${color3}$hr$color${if_up wlp1s0} ${font Roboto:style=Medium:size=10}WLAN$font (U/D):$alignr${addr wlp1s0} on $wireless_essid ${color6}${upspeedgraph wlp1s0 40,200} ${downspeedgraph wlp1s0 40,200}$color$endif${if_up wlp5s0} @@ -74,9 +77,4 @@ ${font Roboto:style=Medium:size=10}Ethernet$font (U/D):$alignr${addr eno1} ${color6}${upspeedgraph eno1 40,200} ${downspeedgraph eno1 40,200}$color$endif${if_up enp0s20f0u2} ${font Roboto:style=Medium:size=10}USB Tether$font (U/D):$alignr${addr enp0s20f0u2} ${color6}${upspeedgraph enp0s20f0u2 40,200} ${downspeedgraph enp0s20f0u2 40,200}$color$endif -${color3}$hr$color -${font Roboto:style=Medium:size=10}Statistics$font: -Battery: $battery_percent% charged, $battery_time remaining -Processes: $running_processes running, $processes total -Uptime: $uptime ]] diff --git a/.config/conky/secondary.conf b/.config/conky/secondary.conf new file mode 100644 index 00000000..7b346de6 --- /dev/null +++ b/.config/conky/secondary.conf @@ -0,0 +1,69 @@ +-- vim: ts=4 sw=4 noet ai cindent syntax=lua + +conky.config = { + own_window = true, + own_window_title = 'Conky', + own_window_class = 'Conky', + own_window_type = 'desktop', + own_window_colour = '1d2021', + own_window_argb_visual = true, + own_window_argb_value = 180, + + 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=10', + default_color = '#ebdbb2', + color1 = '282828', -- Background + color2 = 'ebdbb2', -- Foreground + color3 = '3c3836', -- Background-alt + color4 = 'fb4934', -- Red (Debian) + color6 = '8ec07c', -- Cyan + color7 = 'fabd2f', -- Yellow + color8 = '83a598', -- Blue + color9 = 'd3869b', -- Magenta (Gentoo) + + alignment = 'top_right', + xinerama_head = 0, + minimum_height = 4000, + minimum_width = 404, + border_width = 6, + gap_x = 10, + gap_y = 44, + + show_graph_scale = true, + format_human_readable = true, + + draw_outline = false, + draw_graph_borders = false, + draw_shades = false +} + +conky.text = [[ +${font Roboto:style=Medium:size=30}salt$font +${font Roboto:style=Light:size=17}${time %I:%M %p}$font +${font Roboto:style=Light:size=12}${time %A, %B %d, %Y}$font +${color3}$hr$color +${font Roboto:style=Medium:size=10}$color9${rss https://security.gentoo.org/glsa/feed.rss 1440 feed_title}$font$color: +${rss https://security.gentoo.org/glsa/feed.rss 1440 item_title 0} +${rss https://security.gentoo.org/glsa/feed.rss 1440 item_title 1} +${rss https://security.gentoo.org/glsa/feed.rss 1440 item_title 2} +${rss https://security.gentoo.org/glsa/feed.rss 1440 item_title 3} +${rss https://security.gentoo.org/glsa/feed.rss 1440 item_title 4} +${color3}$hr$color +${font Roboto:style=Medium:size=10}$color4${rss https://www.debian.org/security/dsa 1440 feed_title}$font$color: +${rss https://www.debian.org/security/dsa 1440 item_title 0} +${rss https://www.debian.org/security/dsa 1440 item_title 1} +${rss https://www.debian.org/security/dsa 1440 item_title 2} +${rss https://www.debian.org/security/dsa 1440 item_title 3} +${rss https://www.debian.org/security/dsa 1440 item_title 4} +${color3}$hr$color +${font Roboto:style=Medium:size=10}Statistics$font: +Battery: $battery_percent% charged, $battery_time remaining +Processes: $running_processes running, $processes total +Uptime: $uptime +]] diff --git a/.config/dtfscripts/wmstartup.sh b/.config/dtfscripts/wmstartup.sh index 049a7ab6..a6277233 100755 --- a/.config/dtfscripts/wmstartup.sh +++ b/.config/dtfscripts/wmstartup.sh @@ -103,7 +103,11 @@ $HOME/.config/polybar/start.sh & printf " [INFO] Starting dunst\n" dunst& printf " [INFO] Starting conky\n" -conky& +# Use all the config files in its config directory +for file in $HOME/.config/conky/*.conf; do + printf " [INFO] Found config file $file\n" + conky -c $file& +done # Wallpaper management printf "[INFO] Setting wallpaper\n" if which xfdesktop > /dev/null 2>&1; then