1 files changed, 43 insertions, 33 deletions
diff --git a/.config/awesome/ui/statusbar/panel/init.lua b/.config/awesome/ui/statusbar/panel/init.lua
index 31c2860..814a5a1 100644
--- a/.config/awesome/ui/statusbar/panel/init.lua
+++ b/.config/awesome/ui/statusbar/panel/init.lua
@@ -1,51 +1,61 @@
-local qvars = require "quarrel.vars"
+local C = require "ui.statusbar.consts"
+local qui = require "quarrel.ui"
 local wibox = require "wibox"
 
 local battery = require "ui.statusbar.panel.widgets.battery"
 local calendar = require "ui.statusbar.panel.widgets.calendar"
 local displays = require "ui.statusbar.panel.widgets.displays"
-local music = require "ui.statusbar.panel.widgets.music"
-local power_menu = require "ui.statusbar.panel.widgets.power_menu"
+local music = require "ui.statusbar.panel.widgets.mpris"
 local wifi = require "ui.statusbar.panel.widgets.wifi"
 
 local panel = wibox.widget {
-    widget = wibox.container.margin,
-    margins = {
-        left = qvars.big_padding,
-    },
+    widget = wibox.container.constraint,
+    strategy = "max",
+    width = C.EXPANDED_BAR_SIZE,
+    -- visible = false,
     {
+        widget = wibox.container.background,
         {
-            widget = wibox.container.place,
-            valign = "top",
+            widget = wibox.container.margin,
+            margins = {
+                left = qui.BIG_PADDING,
+            },
             {
                 {
-                    displays.battery,
-                    displays.audio,
-                    displays.brightness,
-                    layout = wibox.layout.fixed.horizontal,
-                    spacing = qvars.padding,
+                    widget = wibox.container.place,
+                    valign = "top",
+                    {
+                        {
+                            displays.battery,
+                            displays.audio,
+                            -- displays.brightness,
+                            -- displays.brightness,
+                            layout = wibox.layout.flex.horizontal,
+                            spacing = qui.PADDING,
+                        },
+                        wifi,
+                        -- battery,
+                        music.widget,
+                        calendar,
+                        layout = wibox.layout.fixed.vertical,
+                        spacing = qui.PADDING,
+                    },
                 },
-                wifi,
-                -- battery,
-                -- music,
-                calendar,
-                layout = wibox.layout.fixed.vertical,
-                spacing = qvars.padding,
-            },
-        },
-        {
-            widget = wibox.container.background,
-            {
-                widget = wibox.widget.textbox,
-                text = ":)",
+                -- {
+                --     widget = wibox.container.background,
+                --     {
+                --         widget = wibox.widget.textbox,
+                --         text = ":)",
+                --     },
+                -- },
+                -- {
+                --     widget = wibox.container.place,
+                --     valign = "bottom",
+                --     power_menu,
+                -- },
+                layout = wibox.layout.align.vertical,
             },
         },
-        {
-            widget = wibox.container.place,
-            valign = "bottom",
-            power_menu,
-        },
-        layout = wibox.layout.align.vertical,
     },
 }