From a8353419ea72280bea8fd12525dd9c146dd879fe Mon Sep 17 00:00:00 2001 From: DarkWiiPlayer Date: Tue, 24 Nov 2020 10:35:29 +0100 Subject: [PATCH] Restructure conky configurations --- conky.conf | 91 ----------------------------------------------- conky/clock.conf | 59 ------------------------------ conky/clock.lua | 5 +++ conky/config.lua | 52 +++++++++++++++++++++++++++ conky/general.lua | 37 +++++++++++++++++++ conky/music.conf | 59 ------------------------------ conky/music.lua | 5 +++ 7 files changed, 99 insertions(+), 209 deletions(-) delete mode 100644 conky.conf delete mode 100644 conky/clock.conf create mode 100644 conky/clock.lua create mode 100644 conky/config.lua create mode 100644 conky/general.lua delete mode 100644 conky/music.conf create mode 100644 conky/music.lua diff --git a/conky.conf b/conky.conf deleted file mode 100644 index 35e7661..0000000 --- a/conky.conf +++ /dev/null @@ -1,91 +0,0 @@ -local dark = io.open(os.getenv("HOME").."/.dark") - --- vim: set filetype=lua :miv -- -conky.config = { - monitor = 1, - double_buffer = true, - update_interval = 1, - alignment = 'bottom_right', - gap_x = 00-1920 --[[100 + 320]], - gap_y = 00 --[[100 + 200]], - own_window = true, - own_window_title = 'conky', - own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', - own_window_argb_visual = true, - own_window_transparent = true, - own_window_argb_value = 255, - border_inner_margin = 8, --- background = true, - border_width = 1, - cpu_avg_samples = 2, - draw_borders = false, - draw_graph_borders = true, - draw_outline = false, - draw_shades = false, - use_xft = true, - font = 'Quicksand:size=14', - minimum_height = 5, - minimum_width = 250, - net_avg_samples = 2, - no_buffers = false, - out_to_console = false, - out_to_stderr = false, - extra_newline = false, - stippled_borders = 0, - uppercase = false, - use_spacer = 'none', - show_graph_scale = false, - show_graph_range = false, -} - -if dark then - print("starting in dark mode") - conky.config.default_color = '#ffffff' - conky.config.color1 = "#ffffff" - conky.config.color2 = "#aaaaaa" - conky.config.color3 = "#df74b1" -else - print("starting in light mode") - conky.config.default_color = '#525564' - conky.config.color1 = "#494c5b" - conky.config.color2 = "#333333" - conky.config.color3 = "#fb006b" -end - -conky.text = [[$color3${time %Y-%m-%d} -$color1${voffset -10}${font Quicksand:size=40}${time %H:%M}$font$color -${color2}Uptime:$color $alignr$uptime -${color2}At:$color $alignr${execi 2 atq | wc -l } Jobs -# -${color3}Stats $hr$color -${color2}ip:$color $alignr${texeci 3 wget http://darkwiiplayer.com/api/ip --no-check-certificate -qO - 2>/dev/null } -${color2}vpn:$color $alignr${execi 2 expressvpn status | grep -Po 'Not connected|(?<=Connected to).*$'} -# -#${color3}Location $hr$color -#${color2}ip:$color $alignr${execi 2 ~/.bin/location} -# -${color3}Ping $hr -${color2}Google: $color$alignr${execi 2 ping google.de -c 1 | grep -Po '(?<=time=).*'} -${color2}Server: $color$alignr${execi 2 ping darkwiiplayer.com -c 1 | grep -Po '(?<=time=).*'} -# -${color3}CPU $hr -$color$cpu%$color2 CPU Usage -$color${cpubar 8}$color -${color2}Frequency:$color $alignr$freq_g GHz -# -${color3}Memory $hr$color -$color$memperc%${color2} RAM Usage -$color${membar 8}$color -$mem / $memmax -${color2}Processes:$color $processes ${color2}Running:$color $running_processes -# -${color3}Storage $hr -${color2}root $alignr$color${fs_used /}/${fs_size /} -$color${fs_bar 8 /} -${color2}data $alignr$color${fs_used /data}/${fs_size /data} -$color${fs_bar 8 /data} -# -${color3}Networking $hr -${color2}Up:$color ${upspeed enp3s0} ${color2} - Down:$color ${downspeed enp3s0} -${font Hack:size=10}$color2$alignc${execi 1000 whoami}@${execi 1000 hostname} -]] diff --git a/conky/clock.conf b/conky/clock.conf deleted file mode 100644 index 413c548..0000000 --- a/conky/clock.conf +++ /dev/null @@ -1,59 +0,0 @@ -local dark = io.open(os.getenv("HOME").."/.dark") - --- vim: set tabstop=4 noexpandtab autoindent cindent syntax=lua nowrap :miv --- - -conky.config = { - lua_load = '~/.config/conky/conky.lua', - update_interval = 1, - cpu_avg_samples = 2, - net_avg_samples = 2, - out_to_console = false, - override_utf8_locale = true, - double_buffer = true, - no_buffers = true, - text_buffer_size = 32768, - imlib_cache_size = 0, - own_window = true, - own_window_title = 'conky', - own_window_hints = 'undecorated,sticky,below,skip_taskbar,skip_pager', - own_window_transparent = true, - own_window_argb_visual = true, - own_window_argb_value = 255, - own_window_type = 'conky', - border_inner_margin = 20, - border_outer_margin = 0, - xinerama_head = 2, - alignment = 'top_left', - gap_x = 40, - gap_y = 20, - draw_shades = false, - draw_outline = false, - draw_borders = false, - draw_graph_borders = false, - use_xft = true, - font = 'Hack:size=12', - xftalpha = 1, - uppercase = false, - own_window_colour = '#000000', - --own_window_colour = '#2F2F2F', - minimum_width = 640, - minimum_height = 0, -}; - -if dark then - conky.config.default_color = '#FFFFFF' - conky.config.color1 = 'white' - conky.config.color2 = '#FFFFFF' - conky.config.color3 = '#8844aa' -else - conky.config.default_color = '#525564' - conky.config.color1 = "#494c5b" - conky.config.color2 = "#333333" - conky.config.color3 = "#fb006b" -end - -conky.text = table.concat({[[ -${offset 10}${font Quicksand:size=40}${time %H:%M}${alignr}${font Quicksand:size=20}${execi 300 curl 'wttr.in/falkenstein%20(vogtland)?format=%t%20/%20%f' }${font} -$color3${hr} -${alignr}${font Quicksand:size=20}$color2${time %A} ${time %d.%m.%Y}$color -]]}, "\n") diff --git a/conky/clock.lua b/conky/clock.lua new file mode 100644 index 0000000..79decb8 --- /dev/null +++ b/conky/clock.lua @@ -0,0 +1,5 @@ +return [[ +${offset 10}${font Quicksand:size=40}${time %H:%M}${alignr}${font Quicksand:size=20}${execi 300 curl 'wttr.in/falkenstein%20(vogtland)?format=%t%20/%20%f' }${font} +$color3${hr} +${alignr}${font Quicksand:size=20}$color2${time %A} ${time %d.%m.%Y}$color +]] diff --git a/conky/config.lua b/conky/config.lua new file mode 100644 index 0000000..eea8b03 --- /dev/null +++ b/conky/config.lua @@ -0,0 +1,52 @@ +local config = { + monitor = 1, + double_buffer = true, + update_interval = 1, + alignment = 'bottom_right', + gap_x = 00-1920 --[[100 + 320]], + gap_y = 00 --[[100 + 200]], + own_window = true, + own_window_title = 'conky', + own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', + own_window_argb_visual = true, + own_window_transparent = true, + own_window_argb_value = 255, + border_inner_margin = 8, +-- background = true, + border_width = 1, + cpu_avg_samples = 2, + draw_borders = false, + draw_graph_borders = true, + draw_outline = false, + draw_shades = false, + use_xft = true, + font = 'Quicksand:size=14', + minimum_height = 5, + minimum_width = 250, + net_avg_samples = 2, + no_buffers = false, + out_to_console = false, + out_to_stderr = false, + extra_newline = false, + stippled_borders = 0, + uppercase = false, + use_spacer = 'none', + show_graph_scale = false, + show_graph_range = false, +} + +local dark = io.open(os.getenv("HOME").."/.dark") + +if dark then + config.default_color = '#ffffff' + config.color1 = "#ffffff" + config.color2 = "#aaaaaa" + config.color3 = "#df74b1" +else + config.default_color = '#525564' + config.color1 = "#494c5b" + config.color2 = "#333333" + config.color3 = "#fb006b" +end + +return config diff --git a/conky/general.lua b/conky/general.lua new file mode 100644 index 0000000..f550175 --- /dev/null +++ b/conky/general.lua @@ -0,0 +1,37 @@ +return [[$color3${time %Y-%m-%d} +$color1${voffset -10}${font Quicksand:size=40}${time %H:%M}$font$color +${color2}Uptime:$color $alignr$uptime +${color2}At:$color $alignr${execi 2 atq | wc -l } Jobs +# +${color3}Stats $hr$color +${color2}ip:$color $alignr${texeci 3 wget http://darkwiiplayer.com/api/ip --no-check-certificate -qO - 2>/dev/null } +${color2}vpn:$color $alignr${execi 2 expressvpn status | grep -Po 'Not connected|(?<=Connected to).*$'} +# +#${color3}Location $hr$color +#${color2}ip:$color $alignr${execi 2 ~/.bin/location} +# +${color3}Ping $hr +${color2}Google: $color$alignr${execi 2 ping google.de -c 1 | grep -Po '(?<=time=).*'} +${color2}Server: $color$alignr${execi 2 ping darkwiiplayer.com -c 1 | grep -Po '(?<=time=).*'} +# +${color3}CPU $hr +$color$cpu%$color2 CPU Usage +$color${cpubar 8}$color +${color2}Frequency:$color $alignr$freq_g GHz +# +${color3}Memory $hr$color +$color$memperc%${color2} RAM Usage +$color${membar 8}$color +$mem / $memmax +${color2}Processes:$color $processes ${color2}Running:$color $running_processes +# +${color3}Storage $hr +${color2}root $alignr$color${fs_used /}/${fs_size /} +$color${fs_bar 8 /} +${color2}data $alignr$color${fs_used /data}/${fs_size /data} +$color${fs_bar 8 /data} +# +${color3}Networking $hr +${color2}Up:$color ${upspeed enp3s0} ${color2} - Down:$color ${downspeed enp3s0} +${font Hack:size=10}$color2$alignc${execi 1000 whoami}@${execi 1000 hostname} +]] diff --git a/conky/music.conf b/conky/music.conf deleted file mode 100644 index 4bdf54a..0000000 --- a/conky/music.conf +++ /dev/null @@ -1,59 +0,0 @@ -local dark = io.open(os.getenv("HOME").."/.dark") - --- vim: set tabstop=4 noexpandtab autoindent cindent syntax=lua nowrap :miv --- - -conky.config = { - lua_load = '~/.config/conky/conky.lua', - update_interval = 1.5, - cpu_avg_samples = 2, - net_avg_samples = 2, - out_to_console = false, - override_utf8_locale = true, - double_buffer = true, - no_buffers = true, - text_buffer_size = 32768, - imlib_cache_size = 0, - own_window = true, - own_window_title = 'conky', - own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', - --[[ Full transparency, no alpha - own_window_transparent = true, - --]] - ---[[ Transparency with alpha - own_window_argb_visual = true, - own_window_argb_value = 0, - --]] - own_window_type = 'normal', - border_inner_margin = 20, - border_outer_margin = 0, - xinerama_head = 2, - draw_shades = false, - draw_outline = false, - draw_borders = false, - draw_graph_borders = false, - use_xft = true, - font = 'Quicksand:size=14', - xftalpha = 1, - uppercase = false, - own_window_colour = '#000000', - --own_window_colour = '#2F2F2F', - alignment = 'bottom_left', - minimum_width = 200, - minimum_height = 0, - -- gap_x = 1680 - 200 - 40, - -- gap_x = 40, - gap_x = 1920 + 20, - gap_y = 20, -}; - -if dark then - conky.config.default_color = '#FFFFFF' -else - conky.config.default_color = '#525564' -end - -conky.text = table.concat({[=====[ -${execi 1 playerctl metadata xesam:artist | sed 's/-/—/'} -${font Quicksand:size=20}${execi 1 playerctl metadata xesam:title | sed 's/-/—/'}${font} -${alignr}${execi 1 playerctl status} -]=====]}, "\n") diff --git a/conky/music.lua b/conky/music.lua new file mode 100644 index 0000000..7921497 --- /dev/null +++ b/conky/music.lua @@ -0,0 +1,5 @@ +return [=====[ +${execi 1 playerctl metadata xesam:artist | sed 's/-/—/'} +${font Quicksand:size=20}${execi 1 playerctl metadata xesam:title | sed 's/-/—/'}${font} +${alignr}${execi 1 playerctl status} +]=====]