summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs-widget/fs-widget.lua247
1 files changed, 128 insertions, 119 deletions
diff --git a/fs-widget/fs-widget.lua b/fs-widget/fs-widget.lua
index 0c12a3a..b5f75f2 100644
--- a/fs-widget/fs-widget.lua
+++ b/fs-widget/fs-widget.lua
@@ -8,26 +8,36 @@ local storage_bar_widget = {}
local function worker(user_args)
local args = user_args or {}
- local mounts = args.mounts or {'/'}
+ local mounts = args.mounts or { '/' }
local timeout = args.timeout or 60
storage_bar_widget = wibox.widget {
- max_value = 100,
- forced_height = 20,
- forced_width = 35,
- paddings = 1,
- margins = 4,
- border_width = 1,
- border_radius = 2,
- border_color = beautiful.fg_normal,
- background_color = beautiful.bg_normal,
- bar_border_width = 1,
- bar_border_color = beautiful.bg_focus,
- color = "linear:150,0:0,0:0,"
- .. beautiful.fg_normal
- .. ":0.3," .. beautiful.bg_urgent .. ":0.6,"
- .. beautiful.fg_normal,
- widget = wibox.widget.progressbar,
+ {
+ id = 'progressbar',
+ max_value = 100,
+ forced_height = 20,
+ forced_width = 35,
+ paddings = 1,
+ margins = 4,
+ border_width = 1,
+ border_radius = 2,
+ border_color = beautiful.fg_normal,
+ background_color = beautiful.bg_normal,
+ bar_border_width = 1,
+ bar_border_color = beautiful.bg_focus,
+ color = "linear:150,0:0,0:0,"
+ .. beautiful.fg_normal
+ .. ":0.3," .. beautiful.bg_urgent .. ":0.6,"
+ .. beautiful.fg_normal,
+ widget = wibox.widget.progressbar
+ },
+ shape = function(cr, width, height)
+ gears.shape.rounded_rect(cr, width, height, 4)
+ end,
+ widget = wibox.container.background,
+ set_value = function(self, new_value)
+ self:get_children_by_id("progressbar")[1].value = new_value
+ end
}
local disk_rows = {
@@ -36,120 +46,119 @@ local function worker(user_args)
layout = wibox.layout.fixed.vertical,
}
- local disk_header = wibox.widget{
- {
- markup = '<b>Mount</b>',
- forced_width = 150,
- align = 'left',
- widget = wibox.widget.textbox,
- },
- {
- markup = '<b>Used</b>',
- align = 'left',
- widget = wibox.widget.textbox,
- },
- layout = wibox.layout.ratio.horizontal
+ local disk_header = wibox.widget {
+ {
+ markup = '<b>Mount</b>',
+ forced_width = 150,
+ align = 'left',
+ widget = wibox.widget.textbox,
+ },
+ {
+ markup = '<b>Used</b>',
+ align = 'left',
+ widget = wibox.widget.textbox,
+ },
+ layout = wibox.layout.ratio.horizontal
}
disk_header:ajust_ratio(1, 0, 0.3, 0.7)
- local popup = awful.popup{
- ontop = true,
- visible = false,
- shape = gears.shape.rounded_rect,
- border_width = 1,
- border_color = beautiful.bg_normal,
+ local popup = awful.popup {
+ ontop = true,
+ visible = false,
+ shape = gears.shape.rounded_rect,
+ border_width = 1,
+ border_color = beautiful.bg_normal,
maximum_width = 400,
- offset = { y = 5 },
- widget = {}
+ offset = { y = 5 },
+ widget = {}
}
storage_bar_widget:buttons(
- awful.util.table.join(
- awful.button({}, 1, function()
- if popup.visible then
- popup.visible = not popup.visible
- else
- popup:move_next_to(mouse.current_widget_geometry)
- end
- end)
- )
- )
-
- local disk_widget = wibox.container.margin(storage_bar_widget, 0, 0, 0, 0)
+ awful.util.table.join(
+ awful.button({}, 1, function()
+ if popup.visible then
+ popup.visible = not popup.visible
+ storage_bar_widget:set_bg('#00000000')
+ else
+ storage_bar_widget:set_bg(beautiful.bg_focus)
+ popup:move_next_to(mouse.current_widget_geometry)
+ end
+ end)
+ )
+ )
local disks = {}
watch([[bash -c "df | tail -n +2"]], timeout,
- function(widget, stdout)
- for line in stdout:gmatch("[^\r\n$]+") do
- local filesystem, size, used, avail, perc, mount =
- line:match('([%p%w]+)%s+([%d%w]+)%s+([%d%w]+)%s+([%d%w]+)%s+([%d]+)%%%s+([%p%w]+)')
-
- disks[mount] = {}
- disks[mount].filesystem = filesystem
- disks[mount].size = size
- disks[mount].used = used
- disks[mount].avail = avail
- disks[mount].perc = perc
- disks[mount].mount = mount
-
- if disks[mount].mount == mounts[1] then
- widget.value = tonumber(disks[mount].perc)
- end
- end
-
- for k,v in ipairs(mounts) do
-
- local row = wibox.widget{
- {
- text = disks[v].mount,
- forced_width = 150,
- widget = wibox.widget.textbox
- },
- {
- max_value = 100,
- value = tonumber(disks[v].perc),
- forced_height = 20,
- paddings = 1,
- margins = 4,
- border_width = 1,
- border_color = beautiful.bg_focus,
- background_color = beautiful.bg_normal,
- bar_border_width = 1,
- bar_border_color = beautiful.bg_focus,
- color = "linear:150,0:0,0:0,"
- .. beautiful.fg_normal
- .. ":0.3," .. beautiful.bg_urgent .. ":0.6,"
- .. beautiful.fg_normal,
- widget = wibox.widget.progressbar,
-
- },
- {
- text = math.floor(disks[v].used/1024/1024)
- .. '/'
- .. math.floor(disks[v].size/1024/1024) .. 'GB('
- .. math.floor(disks[v].perc) .. '%)',
- widget = wibox.widget.textbox
- },
- layout = wibox.layout.ratio.horizontal
- }
- row:ajust_ratio(2, 0.3, 0.3, 0.4)
-
- disk_rows[k] = row
- end
- popup:setup {
- {
- disk_header,
- disk_rows,
- layout = wibox.layout.fixed.vertical,
- },
- margins = 8,
- widget = wibox.container.margin
- }
- end,
- storage_bar_widget
+ function(widget, stdout)
+ for line in stdout:gmatch("[^\r\n$]+") do
+ local filesystem, size, used, avail, perc, mount = line:match('([%p%w]+)%s+([%d%w]+)%s+([%d%w]+)%s+([%d%w]+)%s+([%d]+)%%%s+([%p%w]+)')
+
+ disks[mount] = {}
+ disks[mount].filesystem = filesystem
+ disks[mount].size = size
+ disks[mount].used = used
+ disks[mount].avail = avail
+ disks[mount].perc = perc
+ disks[mount].mount = mount
+
+ if disks[mount].mount == mounts[1] then
+ widget:set_value(tonumber(disks[mount].perc))
+ end
+ end
+
+ for k, v in ipairs(mounts) do
+
+ local row = wibox.widget {
+ {
+ text = disks[v].mount,
+ forced_width = 150,
+ widget = wibox.widget.textbox
+ },
+ {
+ max_value = 100,
+ value = tonumber(disks[v].perc),
+ forced_height = 20,
+ paddings = 1,
+ margins = 4,
+ border_width = 1,
+ border_color = beautiful.bg_focus,
+ background_color = beautiful.bg_normal,
+ bar_border_width = 1,
+ bar_border_color = beautiful.bg_focus,
+ color = "linear:150,0:0,0:0,"
+ .. beautiful.fg_normal
+ .. ":0.3," .. beautiful.bg_urgent .. ":0.6,"
+ .. beautiful.fg_normal,
+ widget = wibox.widget.progressbar,
+
+ },
+ {
+ text = math.floor(disks[v].used / 1024 / 1024)
+ .. '/'
+ .. math.floor(disks[v].size / 1024 / 1024) .. 'GB('
+ .. math.floor(disks[v].perc) .. '%)',
+ widget = wibox.widget.textbox
+ },
+ layout = wibox.layout.ratio.horizontal
+ }
+ row:ajust_ratio(2, 0.3, 0.3, 0.4)
+
+ disk_rows[k] = row
+ end
+ popup:setup {
+ {
+ disk_header,
+ disk_rows,
+ layout = wibox.layout.fixed.vertical,
+ },
+ margins = 8,
+ widget = wibox.container.margin
+ }
+ end,
+ storage_bar_widget
)
- return disk_widget
+ return storage_bar_widget
end
return setmetatable(storage_bar_widget, { __call = function(_, ...)