restructure and improve config

2 files changed, 24 insertions, 24 deletions

diff --git a/.config/awesome/ui/decorations/titlebar.lua b/.config/awesome/ui/decorations/titlebar.lua
index 8451817..9463dbc 100644
--- a/.config/awesome/ui/decorations/titlebar.lua
+++ b/.config/awesome/ui/decorations/titlebar.lua
@@ -1,5 +1,5 @@
 local awful = require "awful"
-local vars = require "misc.vars"
+local qvars = require "quarrel.vars"
 local gears = require "gears"
 local wibox = require "wibox"
 local rubato = require "lib.rubato"
@@ -8,10 +8,10 @@ local cfg = require "misc.cfg"
 local function button(color, color_focus, callback)
     local widget = wibox.widget {
         widget = wibox.container.background,
-        forced_height = vars.button_size,
-        forced_width = vars.button_size,
+        forced_height = qvars.button_size,
+        forced_width = qvars.button_size,
         bg = color,
-        shape = vars.shape,
+        shape = qvars.shape,
         buttons = { callback }
     }
 
@@ -19,13 +19,13 @@ local function button(color, color_focus, callback)
         local timed = rubato.timed {
             duration = 0.1,
             intro = 0.05,
-            pos = vars.button_size,
+            pos = qvars.button_size,
             subscribed = function(pos)
                 widget.forced_width = pos
             end
         }
 
-        timed.target = vars.button_size * 2
+        timed.target = qvars.button_size * 2
         widget.bg = color_focus
     end)
 
@@ -33,13 +33,13 @@ local function button(color, color_focus, callback)
         local timed = rubato.timed {
             duration = 0.1,
             intro = 0.05,
-            pos = vars.button_size * 2,
+            pos = qvars.button_size * 2,
             subscribed = function(pos)
                 widget.forced_width = pos
             end
         }
 
-        timed.target = vars.button_size
+        timed.target = qvars.button_size
         widget.bg = color
     end)
 
@@ -51,31 +51,31 @@ client.connect_signal("request::titlebars", function(c)
 
     local titlebar =  awful.titlebar(c, { 
         position = "top",
-        size = vars.button_size + vars.padding * 2
+        size = qvars.button_size + qvars.padding * 2
     })
 
     awful.titlebar.enable_tooltip = false
 
     titlebar.widget = {
         widget = wibox.container.margin,
-        margins = vars.padding,
+        margins = qvars.padding,
         {
             nil,
             nil,
             {
-                button(vars.colors.green, vars.colors.bright.green, awful.button({}, 1, function()
+                button(qvars.colors.green, qvars.colors.bright.green, awful.button({}, 1, function()
                     c.maximized = not c.maximized
                 end)),
-                button(vars.colors.yellow, vars.colors.bright.yellow, awful.button({}, 1, function()
+                button(qvars.colors.yellow, qvars.colors.bright.yellow, awful.button({}, 1, function()
                     gears.timer.delayed_call(function()
                         c.minimized = true
                     end) 
                 end)),
-                button(vars.colors.red, vars.colors.bright.red, awful.button({}, 1, function()
+                button(qvars.colors.red, qvars.colors.bright.red, awful.button({}, 1, function()
                     c:kill()
                 end)),
 
-                spacing = vars.padding,
+                spacing = qvars.padding,
                 layout = wibox.layout.fixed.horizontal
             },
             layout = wibox.layout.align.horizontal
diff --git a/.config/awesome/ui/decorations/wallpaper.lua b/.config/awesome/ui/decorations/wallpaper.lua
index f7104ff..3c85b83 100644
--- a/.config/awesome/ui/decorations/wallpaper.lua
+++ b/.config/awesome/ui/decorations/wallpaper.lua
@@ -1,11 +1,11 @@
 local wallpaper = require "awful.wallpaper"
 local wibox = require "wibox"
-local vars = require "misc.vars"
-local h = require "misc.helpers"
+local qvars = require "quarrel.vars"
+local qui = require "quarrel.ui"
 
 screen.connect_signal("request::wallpaper", function(s)
     wallpaper {
-        bg = vars.colors.dim.bg,
+        bg = qvars.colors.dim.bg,
         screen = s,
         widget = {
             widget = wibox.container.place,
@@ -13,14 +13,14 @@ screen.connect_signal("request::wallpaper", function(s)
             halign = "center",
             {
                 widget = wibox.widget.textbox,
-                font = h.font(1.5),
+                font = qui.font(1.5),
                 markup = table.concat({
-                    h.markup_fg(vars.colors.red, "   ___"),
-                    h.markup_fg(vars.colors.green, "  /\\  \\"),
-                    h.markup_fg(vars.colors.yellow, " /::\\  \\"),
-                    h.markup_fg(vars.colors.blue, "/::\\:\\__\\"),
-                    h.markup_fg(vars.colors.pink, "\\/\\::/  /"),
-                    h.markup_fg(vars.colors.cyan, "   \\/__/")
+                    qui.markup_fg(qvars.colors.red, "   ___"),
+                    qui.markup_fg(qvars.colors.green, "  /\\  \\"),
+                    qui.markup_fg(qvars.colors.yellow, " /::\\  \\"),
+                    qui.markup_fg(qvars.colors.blue, "/::\\:\\__\\"),
+                    qui.markup_fg(qvars.colors.pink, "\\/\\::/  /"),
+                    qui.markup_fg(qvars.colors.cyan, "   \\/__/")
                 }, "\n")
             }
         }