From 00b53b80c7e6c4c6ef866e4367838064be0d372c Mon Sep 17 00:00:00 2001 From: cyteen Date: Sat, 13 Jun 2020 19:44:57 +0100 Subject: [PATCH] Adjusted rings in conky_files and recentred text to match. --- configs/conky_cpu | 2 +- configs/conky_files | 16 ++++++++-------- configs/conky_system | 2 +- lua/files_ring.lua | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/conky_cpu b/configs/conky_cpu index 47c6f88..0e344c7 100644 --- a/configs/conky_cpu +++ b/configs/conky_cpu @@ -16,7 +16,7 @@ conky.config = { minimum_width = 235, minimum_height = 165, maximum_width = 235, - gap_x = 430, + gap_x = 435, gap_y = 50, -- ------------------------- Font diff --git a/configs/conky_files b/configs/conky_files index ce4a1df..cb72985 100644 --- a/configs/conky_files +++ b/configs/conky_files @@ -13,10 +13,10 @@ conky.config = { -- ------------------------- Position alignment = 'top_right', - minimum_width = 255, + minimum_width = 242, minimum_height = 165, maximum_width = 255, - gap_x = 870, + gap_x = 890, gap_y = 50, -- ------------------------- Font @@ -44,18 +44,18 @@ conky.config = { lua_load = '~/.conky/conky-xanimos/lua/files_ring.lua', lua_draw_hook_pre = 'main', - template0 = [[${GOTO 50}${color\1}${top_io name \2} ${top_io cpu \2} ${GOTO 202}${top_io io_perc \2}]], + template0 = [[${GOTO 45}${color\1}${top_io name \2} ${GOTO 130}${top_io cpu \2} ${GOTO 202}${alignr}${top_io io_perc \2}]], }; conky.text = [[ ${voffset 8}${GOTO 50}${font Monofur:bold:size=12}File System${font} -${voffset 10}${GOTO 50}${font}Read: ${font Monofur:size=8}${color0}${diskio_read}${GOTO 160}${font}${color}Write: ${font Monofur:size=8}${color0}${diskio_write} -${template0 0 1} +${voffset 10}${GOTO 45}${font}Read: ${font Monofur:size=8}${color0}${diskio_read}${GOTO 160}${font}${color}Write: ${font Monofur:size=8}${color0}${diskio_write} +${voffset 3}${template0 0 1} ${template0 1 2} ${template0 2 3} ${template0 3 4} -${voffset 6}${GOTO 90}${font Monofur:size=7}${color}/: ${color0}${font Monofur:size=7}${fs_used /}${color} | ${font Monofur:size=7}${color0}${fs_size /} -${voffset 4}${GOTO 80}${font Monofur:size=7}${color}/home: ${color0}${font Monofur:size=7}${fs_used /home}${color} | ${font Monofur:size=7}${color0}${fs_size /home} -${voffset 4}${GOTO 80}${font Monofur:size=7}${color}/tmp: ${color0}${font Monofur:size=7}${fs_used /tmp}${color} | ${font Monofur:size=7}${color0}${fs_size /tmp} +${voffset 3}${GOTO 100}${font Monofur:size=7}${color}/: ${color0}${font Monofur:size=7}${fs_used /}${color} | ${font Monofur:size=7}${color0}${fs_size /} +${voffset 4}${GOTO 90}${font Monofur:size=7}${color}/home: ${color0}${font Monofur:size=7}${fs_used /home}${color} | ${font Monofur:size=7}${color0}${fs_size /home} +${voffset 4}${GOTO 90}${font Monofur:size=7}${color}/tmp: ${color0}${font Monofur:size=7}${fs_used /tmp}${color} | ${font Monofur:size=7}${color0}${fs_size /tmp} ${image ~/.conky/conky-xanimos/img/files.png -p 0,5} ]]; diff --git a/configs/conky_system b/configs/conky_system index 98d984f..91a3304 100644 --- a/configs/conky_system +++ b/configs/conky_system @@ -56,7 +56,7 @@ conky.text = [[ ${voffset 8}${GOTO 50}${font Monofur:bold:size=12}System${font} ${voffset 18}${GOTO 50}${font}Uptime: ${font}${color1}${font Monofur:size=8}${format_time $uptime_short "\hh \mm"}${color} ${voffset 10}${GOTO 50}${font}Battery: ${font Monofur:size=8}${color1}${if_match "${acpiacadapter ACAD}"!="off-line"}${image ~/.conky/conky-xanimos/img/units/timeleft.png -p 157,64 -s 18x18}Charging${alignr}(${template1}${color1}${battery_percent BAT0}%${color1})${else}${image ~/.conky/conky-xanimos/img/units/timeleft.png -p 145,64 -s 18x18}${if_match ${battery_percent BAT0}<=10}${color4}${blink ${battery_percent BAT0}%}${else}${battery_percent BAT0}%${endif}${color}${if_empty ${battery_time BAT0}}${else}${alignr}(${template1}${format_time ${battery_time BAT0} "\hh \mm"}${color})${endif}${endif} -${voffset 10}${font Monofur:size=8}${GOTO 50}${font}Processes: ${font Monofur:size=8}${color1}${processes}${color} +${voffset 10}${font Monofur:size=8}${GOTO 50}${font}${color}Processes: ${font Monofur:size=8}${color1}${processes}${color} ${voffset 10}${GOTO 50}${font}Threads: ${font Monofur:size=8}${color1}${running_threads}${color} ${voffset 10}${GOTO 50}${font}Connections: ${font Monofur:size=8}${color1}${tcp_portmon 1 65535 count}${color} ${image ~/.conky/conky-xanimos/img/system.png -p 0,0}${image ~/.conky/conky-xanimos/img/units/uptime.png -p 19,42 -s 16x16}${image ~/.conky/conky-xanimos/img/units/batt.png -p 18,62 -s 20x20}${image ~/.conky/conky-xanimos/img/units/processes.png -p 18,86 -s 20x20}${image ~/.conky/conky-xanimos/img/units/freq.png -p 18,109 -s 20x20}${image ~/.conky/conky-xanimos/img/units/connections.png -p 19,133 -s 18x18}]]; diff --git a/lua/files_ring.lua b/lua/files_ring.lua index ba26d85..6dbcfa8 100644 --- a/lua/files_ring.lua +++ b/lua/files_ring.lua @@ -20,7 +20,7 @@ require 'cairo' gauge = { { name='fs_used_perc', arg='/', max_value=100, - x=135, y=180, + x=147, y=180, graph_radius=110, graph_thickness=5, graph_start_angle=-60, @@ -41,7 +41,7 @@ gauge = { }, { name='fs_used_perc', arg='/home', max_value=100, - x=135, y=180, + x=147, y=180, graph_radius=110, graph_thickness=5, graph_start_angle=-60,