1 files changed, 31 insertions, 50 deletions
diff --git a/.config/awesome/ui/statusbar/panel/init.lua b/.config/awesome/ui/statusbar/panel/init.lua
index fe66789..b9b414c 100644
--- a/.config/awesome/ui/statusbar/panel/init.lua
+++ b/.config/awesome/ui/statusbar/panel/init.lua
@@ -1,65 +1,46 @@
 local qvars = require "quarrel.vars"
 local wibox = require "wibox"
 
-local battery_bar = require "ui.statusbar.panel.widgets.battery_bar"
-local brightness_bar = require "ui.statusbar.panel.widgets.brightness_bar"
+local displays = require "ui.statusbar.panel.widgets.displays"
+local power_menu = require "ui.statusbar.panel.widgets.power_menu"
+
 
 local panel = wibox.widget {
-    {
+    -- widget = wibox.container.constraint,
+    -- width = qvars.expanded_bar_size,
+    -- strategy = "exact",
+    -- {
         widget = wibox.container.margin,
         margins = {
-            left = qvars.big_padding * 2
-        }
-    },
-    {
-        widget = wibox.container.constraint,
-        width = qvars.bar_size * 6,
-        strategy = "exact",
+            left = qvars.big_padding
+        },
         {
-            widget = wibox.container.margin,
-            margins = {
-                right = qvars.big_padding * 4
-            },
             {
+                widget = wibox.container.place,
+                valign = "top",
                 {
-                    widget = wibox.widget.calendar.month,
-                    date = os.date("*t"),
-                    font = qvars.font,
-                    -- long_weekdays = true,
-                    -- flex_height = true,
-                    -- fn_embed = decorate_cell
-                },
-                {
-                    widget = wibox.container.background,
-                    -- bg = qvars.colors.blue,
-                    {
-                        widget = wibox.widget.textbox,
-                        text = ":)"
-                    }
-                },
+                    displays.battery,
+                    displays.volume,
+                    displays.brightness,
+                    layout = wibox.layout.fixed.horizontal,
+                    spacing = qvars.padding,
+                }
+            },
+            {
+                widget = wibox.container.background,
                 {
-                    widget = wibox.container.place,
-                    valign = "bottom",
-                    {
-                        {
-                            widget = wibox.widget.separator,
-                            forced_height = qvars.char_height * 4 + qvars.padding * 4,
-                            color = qvars.colors.transparent,
-                        },
-                        brightness_bar,
-                        battery_bar,
-                        layout = wibox.layout.fixed.vertical,
-                        spacing = qvars.padding * 2
-                    },
-                },
-                layout = wibox.layout.align.vertical,
-            }
+                    widget = wibox.widget.textbox,
+                    text = ":)"
+                }
+            },
+            {
+                widget = wibox.container.place,
+                valign = "bottom",
+                power_menu
+            },
+            layout = wibox.layout.align.vertical,
         }
-    },
-    layout = wibox.layout.fixed.horizontal
+    -- }
 }
 
--- panel:get_children_by_id("ratio_layout"):adjust_ratio(2, 0.3, 0.7, 0)
--- gdebug.dump(panel:get_children_by_id("ratio_layout"))
-
 return panel