From 1d38228cea096a6b70fbea91fa8f2b1455b18363 Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 1 Jun 2019 17:26:52 +0100 Subject: [PATCH] update --- conky-bottom.conf => conky-short.conf | 66 +++------- conky-start.sh | 7 +- conky-top.conf | 166 -------------------------- 3 files changed, 21 insertions(+), 218 deletions(-) rename conky-bottom.conf => conky-short.conf (62%) delete mode 100644 conky-top.conf diff --git a/conky-bottom.conf b/conky-short.conf similarity index 62% rename from conky-bottom.conf rename to conky-short.conf index ac6f4b8..69d1735 100644 --- a/conky-bottom.conf +++ b/conky-short.conf @@ -26,11 +26,12 @@ along with this program. If not, see . conky.config = { lua_load = '~/.config/conky/functions.lua', - alignment = 'bottom_right', + xinerama_head=1, + alignment = 'tr', background = false, border_width = 1, cpu_avg_samples = 2, - default_color = '2B1F42', + default_color = '6470a1', default_outline_color = 'white', default_shade_color = 'white', draw_borders = false, @@ -38,11 +39,9 @@ conky.config = { draw_outline = false, draw_shades = false, use_xft = true, - font = 'xos4 Terminus:size=12', + font = 'xos4 Terminus:size=22', gap_x = 6, - gap_y = 66, - minimum_height = 5, - minimum_width = 5, + gap_y = 147, net_avg_samples = 2, double_buffer = true, no_buffers = true, @@ -65,50 +64,17 @@ conky.config = { } conky.text = [[ -${color 3a2a59}\ ---\ -${lua_parse sub_space 0 ${top pid 1}}\ -:\ -${color 553D82}\ -${lua_parse sub_space . ${top name 1}}.\ -${lua_parse pad . 8 ${top mem_res 1}}\ -${color 3a2a59}\ -${top mem_res 1}:\ -${lua_parse sub_space 0 ${top cpu 1}}\ -::: -${color 32244D}\ ---\ -${lua_parse sub_space 0 ${top pid 2}}\ -:\ -${color 433066}\ -${lua_parse sub_space . ${top name 2}}.\ -${lua_parse pad . 8 ${top mem_res 2}}\ -${color 3a2a59}\ -${top mem_res 2}:\ -${lua_parse sub_space 0 ${top cpu 2}}\ -::: -${color 2B1F42}\ ---\ -${lua_parse sub_space 0 ${top pid 3}}\ -:\ -${color 32244D}\ -${lua_parse sub_space . ${top name 3}}.\ -${lua_parse pad . 8 ${top mem_res 3}}\ -${color 3a2a59}\ -${top mem_res 3}:\ -${lua_parse sub_space 0 ${top cpu 3}}\ -::: -${color 251a38}\ ---\ -${lua_parse sub_space 0 ${top pid 4}}\ -:\ -${color 2B1F42}\ -${lua_parse sub_space . ${top name 4}}.\ -${lua_parse pad . 8 ${top mem_res 4}}\ -${color 3a2a59}\ -${top mem_res 4}:\ -${lua_parse sub_space 0 ${top cpu 4}}\ -::: +${lua_parse pad 0 6 $mem}\ +$mem\ + \ +${lua_parse pad 0 6 ${upspeed enp3s0}}\ +${upspeed enp3s0}\ + \ +${lua_parse pad 0 6 ${downspeed enp3s0}}\ +${downspeed enp3s0}\ + \ +${lua_parse pad 0 3 ${cpu}}\ +$cpu% \ ]] -- vim: set filetype=lua: diff --git a/conky-start.sh b/conky-start.sh index 286158d..45a6e92 100755 --- a/conky-start.sh +++ b/conky-start.sh @@ -1,4 +1,7 @@ #!/bin/sh -conky -d -c ~/.config/conky/conky-top.conf -conky -d -c ~/.config/conky/conky-bottom.conf +killall conky + +conky -d -c ~/.config/conky/conky-full.conf +conky -d -c ~/.config/conky/conky-htop.conf +conky -d -c ~/.config/conky/conky-short.conf diff --git a/conky-top.conf b/conky-top.conf deleted file mode 100644 index 86919f0..0000000 --- a/conky-top.conf +++ /dev/null @@ -1,166 +0,0 @@ ---[[ -Conky, a system monitor, based on torsmo - -Any original torsmo code is licensed under the BSD license - -All code written since the fork of torsmo is licensed under the GPL - -Please see COPYING for details - -Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) -All rights reserved. - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see . -]] - -conky.config = { - lua_load = '~/.config/conky/functions.lua', - alignment = 'top_left', - background = false, - border_width = 1, - cpu_avg_samples = 2, - default_color = '4B0D56', - default_outline_color = 'white', - default_shade_color = 'white', - draw_borders = false, - draw_graph_borders = true, - draw_outline = false, - draw_shades = false, - use_xft = true, - font = 'xos4 Terminus:size=12', - gap_x = 6, - gap_y = 117, - minimum_height = 5,0, - minimum_width = 5, - net_avg_samples = 2, - double_buffer = true, - no_buffers = true, - out_to_console = false, - out_to_ncurses = false, - out_to_stderr = false, - out_to_x = true, - extra_newline = false, - own_window = true, - own_window_class = 'Conky', - own_window_type = 'override', - own_window_transparent = true, - short_units = true, - stippled_borders = 0, - update_interval = 1.0, - uppercase = false, - use_spacer = 'none', - show_graph_scale = false, - show_graph_range = false -} - -conky.text = [[ ------::\ -${lua_parse pad - 3 ${processes}}\ -$processes\ -:\ -${lua_parse pad - 3 ${running_processes}}\ -$running_processes\ -:\ -${lua_parse pad - 3 ${cpu}}\ -${color 701461}\ -$cpu\ -$color\ -::\ -$color\ -$memmax\ -$color\ --\ -${color A82283}\ -$mem\ -$color\ -=\ -${color 701461}\ -$memeasyfree\ -${color}\ -|$memfree.\ -[\ -${color 701461}\ -$swap\ -$color]\ -${color 701461}\ -$color\ -::\ -\ -/\ -${color A82283}\ -${fs_free /}\ -$color\ -:\ -m/\ -${color 701461}\ -${fs_free /mnt/manjaro}\ -$color\ -:\ -4/\ -${color 701461}\ -${fs_free /mnt/4tb}\ -$color\ -:\ -4_2/\ -${color 701461}\ -${fs_free /mnt/4tb_2}\ -$color\ -::\ -\ -${lua_parse pad - 6 ${upspeed enp3s0}}\ -${color 701461}\ -${upspeed enp3s0}\ -$color\ --\ -${color A82283}\ -${downspeed enp3s0}\ -$color\ -${lua_parse pad - 6 ${downspeed enp3s0}}\ --\ -${color 701461}\ -$nodename\ -$color\ -:\ -$sysname\ -:\ -${color 701461}\ -$kernel\ -$color\ -[\ -$machine\ -]\ -::\ -$color\ ---\ -${color 701461}\ -${time %Y.%m.%d}\ -$color\ -:\ -${color A82283}\ -${time %H:%M}\ -$color\ -::\ -${color 701461}\ -$uptime_short\ -$color\ -::\ -${color 701461}\ -${hwmon temp 1}\ -$color\ -:\ -${hwmon fan 1}\ -:::--- -]] - --- vim: set filetype=lua: