diff options
Diffstat (limited to 'bar.lua')
-rw-r--r-- | bar.lua | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -17,6 +17,7 @@ local spacing = 8 local separator = { widget = wibox.widget.separator, opacity = 0 } local widgets = { + temperature_file = nil; spacing = spacing, -- constant layoutlist = wibox.widget { layout = wibox.layout.fixed.horizontal, @@ -47,15 +48,14 @@ local widgets = { }, separator, } end, - textclock = wibox.widget.textclock("%A, %B %e, %-I:%M %p"), - cpu = wibox.widget { + textclock = wibox.widget.textclock("%A, %B %-e, %-I:%M %p"), + cpu = { layout = wibox.layout.fixed.horizontal, wibox.widget.textbox "CPU: ", widget_cpu_usage, wibox.widget.textbox "% ", - widget_temperature "/sys/class/hwmon/hwmon2/temp1_input", -- FIXME - wibox.widget.textbox "°", }, + temp = widget_temperature(), ram = { layout = wibox.layout.fixed.horizontal, wibox.widget.textbox "RAM: ", @@ -101,7 +101,11 @@ function widgets.right_widgets(s) return wibox.widget { { layout = wibox.layout.fixed.horizontal, spacing = spacing, - widgets.cpu, + { + layout = wibox.layout.fixed.horizontal, + widgets.cpu, + widgets.temp, + }, widgets.ram, widgets.vol, widgets.bat, |