diff --git a/drawing/FileSystem.lua b/drawing/FileSystem.lua index 3634c20..e3714f8 100644 --- a/drawing/FileSystem.lua +++ b/drawing/FileSystem.lua @@ -8,9 +8,9 @@ local Util = require 'Util' local __string_match = string.match -local _FS_PATHS_ = {'/', '/boot', '/var/cache', '/home', '/mnt/data', '/mnt/dcache', '/usr/local/opt'} +local _FS_PATHS_ = {'/', '/boot', '/home', '/mnt/data', '/mnt/dcache'} local _MODULE_Y_ = 170 -local _SPACING_ = 22 +local _SPACING_ = 20 local _BAR_PAD_ = 100 local FS_NUM = #_FS_PATHS_ @@ -28,11 +28,9 @@ local labels = _G_Widget_.TextColumn{ spacing = _SPACING_, 'root', 'boot', - 'vcache', 'home', 'data', 'dcache', - 'lopt' } local conky_used_perc = {} @@ -47,6 +45,7 @@ local bars = _G_Widget_.CompoundBar{ length = _G_INIT_DATA_.SECTION_WIDTH - _BAR_PAD_, spacing = _SPACING_, num_bars = FS_NUM, + -- thickness = 12, critical_limit = '>0.8' } diff --git a/drawing/Power.lua b/drawing/Power.lua index a7d7999..65d7796 100644 --- a/drawing/Power.lua +++ b/drawing/Power.lua @@ -7,10 +7,10 @@ local Line = require 'Line' local ScalePlot = require 'ScalePlot' local Util = require 'Util' -local _MODULE_Y_ = 373 +local _MODULE_Y_ = 320 local _TEXT_SPACING_ = 20 local _PLOT_SEC_BREAK_ = 20 -local _PLOT_HEIGHT_ = 56 +local _PLOT_HEIGHT_ = 73 local power_label_function = function(watts) return watts..' W' end @@ -51,6 +51,7 @@ local pkg0 = { width = _G_INIT_DATA_.SECTION_WIDTH, height = _PLOT_HEIGHT_, y_label_func = power_label_function, + num_y_intrvl = 5, }, } @@ -76,6 +77,7 @@ local dram = { width = _G_INIT_DATA_.SECTION_WIDTH, height = _PLOT_HEIGHT_, y_label_func = power_label_function, + num_y_intrvl = 5, } } @@ -99,6 +101,7 @@ local battery_draw = { width = _G_INIT_DATA_.SECTION_WIDTH, height = _PLOT_HEIGHT_, y_label_func = power_label_function, + num_y_intrvl = 5, } }