1 files changed, 15 insertions, 14 deletions
diff --git a/.config/awesome/ui/powermenu/init.lua b/.config/awesome/ui/powermenu/init.lua
index 81d2ea3..2e2b4af 100644
--- a/.config/awesome/ui/powermenu/init.lua
+++ b/.config/awesome/ui/powermenu/init.lua
@@ -1,5 +1,6 @@
 local awful = require "awful"
 local phosphor = require "assets.phosphor"
+local qcolor = require "quarrel.color"
 local qui = require "quarrel.ui"
 local qvars = require "quarrel.vars"
 local rubato = require "lib.rubato"
@@ -8,21 +9,21 @@ local wibox = require "wibox"
 local function create_button(title, icon, color, exec)
     return wibox.widget {
         widget = wibox.container.background,
-        shape = qvars.shape,
+        shape = qui.shape,
         {
             widget = wibox.container.margin,
-            margins = qvars.big_padding,
+            margins = qui.BIG_PADDING,
             {
                 qui.styled {
                     widget = wibox.container.background,
                     border_color = color,
                     {
                         widget = wibox.container.margin,
-                        margins = qvars.big_padding,
+                        margins = qui.BIG_PADDING,
                         qui.icon {
                             widget = {
-                                forced_height = qvars.char_height * 4 - qvars.big_padding * 2,
-                                forced_width = qvars.char_height * 4 - qvars.big_padding * 2,
+                                forced_height = qui.CHAR_HEIGHT * 4 - qui.BIG_PADDING * 2,
+                                forced_width = qui.CHAR_HEIGHT * 4 - qui.BIG_PADDING * 2,
                             },
                             icon = icon,
                             color = color,
@@ -37,12 +38,12 @@ local function create_button(title, icon, color, exec)
                     },
                 },
                 layout = wibox.layout.fixed.vertical,
-                spacing = qvars.big_padding,
+                spacing = qui.BIG_PADDING,
                 exec = exec,
             },
         },
         select = function(self)
-            self.bg = qvars.colors.black
+            self.bg = qcolor.palette.bg.high
         end,
     }
 end
@@ -56,7 +57,7 @@ screen.connect_signal("request::desktop_decoration", function(s)
         visible = false,
         minimum_width = s.geometry.width,
         minimum_height = s.geometry.height,
-        bg = qvars.colors.bg .. "ee",
+        bg = qcolor.palette.bg() .. "ee",
         border_width = 0,
         widget = {
             widget = wibox.container.place,
@@ -64,10 +65,10 @@ screen.connect_signal("request::desktop_decoration", function(s)
                 widget = wibox.container.background,
                 {
                     widget = wibox.container.margin,
-                    margins = qvars.big_padding,
+                    margins = qui.BIG_PADDING,
                     {
                         layout = wibox.layout.fixed.horizontal,
-                        spacing = qvars.big_padding * 2,
+                        spacing = qui.BIG_PADDING * 2,
                         id = "list",
                     },
                 },
@@ -77,16 +78,16 @@ screen.connect_signal("request::desktop_decoration", function(s)
 
     local layout = powermenu._widget.widget:get_children_by_id("list")[1]
 
-    layout:add(create_button("Shutdown", phosphor.power_bold, qvars.colors.red, function()
+    layout:add(create_button("Shutdown", phosphor.power_bold, qcolor.palette.red(), function()
         awful.spawn "poweroff"
     end))
-    layout:add(create_button("Log out", phosphor.sign_out_bold, qvars.colors.green, function()
+    layout:add(create_button("Log out", phosphor.sign_out_bold, qcolor.palette.green(), function()
         awesome.quit()
     end))
-    layout:add(create_button("Lock", phosphor.lock_simple_fill, qvars.colors.blue, function()
+    layout:add(create_button("Lock", phosphor.lock_simple_fill, qcolor.palette.blue(), function()
         require("quarrel").debug "locked!l"
     end))
-    layout:add(create_button("Restart", phosphor.arrow_clockwise_bold, qvars.colors.pink, function()
+    layout:add(create_button("Restart", phosphor.arrow_clockwise_bold, qcolor.palette.pink(), function()
         awful.spawn "reboot"
     end))
 end)