idk what i'm doing

7 files changed, 207 insertions, 81 deletions

diff --git a/.config/awesome/ui/decorations/wallpaper.lua b/.config/awesome/ui/decorations/wallpaper.lua
index 3c85b83..fc2aa79 100644
--- a/.config/awesome/ui/decorations/wallpaper.lua
+++ b/.config/awesome/ui/decorations/wallpaper.lua
@@ -1,5 +1,6 @@
 local wallpaper = require "awful.wallpaper"
 local wibox = require "wibox"
+-- local gfs = require "gears.filesystem"
 local qvars = require "quarrel.vars"
 local qui = require "quarrel.ui"
 
@@ -23,6 +24,15 @@ screen.connect_signal("request::wallpaper", function(s)
                     qui.markup_fg(qvars.colors.cyan, "   \\/__/")
                 }, "\n")
             }
+            -- {
+            --     image  = gfs.get_configuration_dir() .. "assets/nightmare_fuel.png",
+            --     resize = true,
+            --     widget = wibox.widget.imagebox,
+            -- },
+            -- valign = "center",
+            -- halign = "center",
+            -- tiled  = false,
+            -- widget = wibox.container.tile,
         }
     }
 end)
diff --git a/.config/awesome/ui/statusbar/init.lua b/.config/awesome/ui/statusbar/init.lua
index 01d6498..2851b73 100644
--- a/.config/awesome/ui/statusbar/init.lua
+++ b/.config/awesome/ui/statusbar/init.lua
@@ -4,11 +4,10 @@ local qvars = require "quarrel.vars"
 local wibox = require "wibox"
 local qui = require "quarrel.ui"
 local gcolor = require "gears.color"
-local gdebug = require "gears.debug"
 local phosphor = require "assets.phosphor"
 local qbind = require "quarrel.bind"
-local q = require "quarrel"
 local rubato = require "lib.rubato"
+local panel = require "ui.statusbar.panel"
 
 local taglist = require "ui.statusbar.widgets.taglist"
 local clock = require "ui.statusbar.widgets.clock"
@@ -41,36 +40,31 @@ screen.connect_signal("request::desktop_decoration", function(s)
         minimum_height = s.geometry.height - (beautiful.useless_gap * 4 + qvars.border_width * 2),
         widget = {
             {
+                {
+                    expand_button,
+                    taglist,
+                    layout = wibox.layout.fixed.vertical,
+                    spacing = qvars.padding * 2,
+                },
                 nil,
                 {
+                    widget = wibox.container.place,
+                    valign = "bottom",
                     {
-                        expand_button,
-                        taglist,
-                        layout = wibox.layout.fixed.vertical,
-                        spacing = qvars.padding * 2,
-                    },
-                    nil,
-                    {
-                        widget = wibox.container.place,
-                        valign = "bottom",
                         {
-                            brightness,
-                            battery,
-                            wifi,
-                            {
-                                widget = wibox.container.place,
-                                keyboardlayout
-                            },
-                            clock,
-                            layout = wibox.layout.fixed.vertical,
-                            spacing = qvars.padding * 2
+                            widget = wibox.container.place,
+                            keyboardlayout
                         },
+                        clock,
+                        wifi,
+                        brightness,
+                        battery,
+                        layout = wibox.layout.fixed.vertical,
+                        spacing = qvars.padding * 2
                     },
-                    layout = wibox.layout.align.vertical,
-                    expand = "outside",
                 },
-                nil,
-                layout = wibox.layout.align.horizontal
+                layout = wibox.layout.align.vertical,
+                expand = "outside",
             },
             nil,
             nil,
@@ -78,12 +72,10 @@ screen.connect_signal("request::desktop_decoration", function(s)
         }
     }
 
-    local bar_width = bar.width
+    local bar_width = bar.width + qvars.border_width * 2
 
     bar:struts {
-        -- left = qvars.bar_size + qvars.big_padding * 2 + beautiful.useless_gap * 4
-        -- left = qvars.bar_size + qvars.border_width * 2 + beautiful.useless_gap * 4
-        left = bar_width + qvars.border_width * 2 + beautiful.useless_gap * 4
+        left = bar_width + beautiful.useless_gap * 4
     }
 
     local timed = rubato.timed {
@@ -92,58 +84,16 @@ screen.connect_signal("request::desktop_decoration", function(s)
         pos = bar_width,
         subscribed = function(pos)
             if pos ~= bar_width and expand_button._expanded then
-                bar.widget.widget.third = wibox.widget {
-                    {
-                        widget = wibox.container.margin,
-                        margins = {
-                            left = qvars.big_padding
-                        }
-                    },
-                    {
-                        widget = wibox.container.constraint,
-                        width = qvars.bar_size * 6,
-                        strategy = "min",
-                        {
-                            {
-                                {
-                                    widget = wibox.container.background,
-                                    bg = qvars.colors.black,
-                                    {
-                                        widget = wibox.widget.textbox,
-                                        text = "1"
-                                    }
-                                },
-                                {
-                                    widget = wibox.container.background,
-                                    bg = qvars.colors.black,
-                                    {
-                                        widget = wibox.widget.textbox,
-                                        text = "2"
-                                    }
-                                },
-                                {
-                                    widget = wibox.container.background,
-                                    bg = qvars.colors.black,
-                                    {
-                                        widget = wibox.widget.textbox,
-                                        text = "3"
-                                    }
-                                },
-                                spacing = qvars.padding,
-                                layout = wibox.layout.flex.horizontal
-                            },
-                            layout = wibox.layout.fixed.vertical
-                        }
-                    },
-                    layout = wibox.layout.fixed.horizontal
-                }
+                bar.widget.widget.third = panel
                 bar.ontop = true
             elseif pos == bar_width and not expand_button._expanded then
                 bar.widget.widget.third = nil
                 bar.ontop = false
             end
 
-            bar.maximum_width = pos
+            bar.shape = function(cr, _, h)
+                qvars.shape(cr, pos, h)
+            end
         end
     }
 
diff --git a/.config/awesome/ui/statusbar/panel/init.lua b/.config/awesome/ui/statusbar/panel/init.lua
new file mode 100644
index 0000000..bbdbaee
--- /dev/null
+++ b/.config/awesome/ui/statusbar/panel/init.lua
@@ -0,0 +1,65 @@
+local wibox = require "wibox"
+local qvars = require "quarrel.vars"
+
+local battery_bar = require "ui.statusbar.panel.widgets.battery_bar"
+local brightness_bar = require "ui.statusbar.panel.widgets.brightness_bar"
+
+local panel = wibox.widget {
+    {
+        widget = wibox.container.margin,
+        margins = {
+            left = qvars.big_padding * 2
+        }
+    },
+    {
+        widget = wibox.container.constraint,
+        width = qvars.bar_size * 6,
+        strategy = "exact",
+        {
+            widget = wibox.container.margin,
+            margins = {
+                right = qvars.big_padding * 4
+            },
+            {
+                {
+                    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 = ":)"
+                    }
+                },
+                {
+                    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,
+            }
+        }
+    },
+    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
diff --git a/.config/awesome/ui/statusbar/panel/widgets/battery_bar.lua b/.config/awesome/ui/statusbar/panel/widgets/battery_bar.lua
new file mode 100644
index 0000000..b504330
--- /dev/null
+++ b/.config/awesome/ui/statusbar/panel/widgets/battery_bar.lua
@@ -0,0 +1,60 @@
+local wibox = require "wibox"
+local qvars = require "quarrel.vars"
+local qmath = require "quarrel.math"
+
+local battery_bar = wibox.widget {
+    widget = wibox.container.place,
+    forced_height = qvars.char_height,
+    {
+        {
+            widget = wibox.container.constraint,
+            width = qvars.char_width * 4,
+            strategy = "exact",
+            {
+                widget = wibox.widget.textbox,
+                text = "0%"
+            },
+            id = "text"
+        },
+        nil,
+        {
+            widget = wibox.container.margin,
+            margins = {
+                left = qvars.padding
+            },
+            {
+                widget = wibox.container.place,
+                {
+                    widget = wibox.widget.progressbar,
+                    max_value = 100,
+                    value = 0,
+                    forced_height = qvars.char_height / 4,
+                    shape = qvars.shape,
+                    background_color = qvars.colors.black,
+                    color = qvars.colors.red,
+                }
+            },
+            id = "bar"
+        },
+        layout = wibox.layout.align.horizontal,
+        -- expand = "outside"
+    }
+}
+
+awesome.connect_signal("services::battery", function(capacity)
+    local color = qmath.step_value(capacity, {
+        { 0, "red" },
+        { 20, "red" },
+        { 40, "yellow" },
+        { 60, "green" },
+        { 80, "green" },
+        { 100 }
+    })
+
+    battery_bar.widget.bar.widget.widget.color = qvars.colors[color]
+    battery_bar.widget.bar.widget.widget.value = capacity
+
+    battery_bar.widget.text.widget.text = capacity .. "%"
+end)
+
+return battery_bar
diff --git a/.config/awesome/ui/statusbar/panel/widgets/brightness_bar.lua b/.config/awesome/ui/statusbar/panel/widgets/brightness_bar.lua
new file mode 100644
index 0000000..2db03dc
--- /dev/null
+++ b/.config/awesome/ui/statusbar/panel/widgets/brightness_bar.lua
@@ -0,0 +1,46 @@
+local wibox = require "wibox"
+local qvars = require "quarrel.vars"
+local qmath = require "quarrel.math"
+
+local brightness_bar = wibox.widget {
+    widget = wibox.container.place,
+    forced_height = qvars.char_height,
+    {
+        {
+            widget = wibox.widget.textbox,
+            text = "0%",
+            id = "text"
+        },
+        nil,
+        {
+            widget = wibox.container.margin,
+            margins = {
+                left = qvars.padding
+            },
+            {
+                widget = wibox.container.place,
+                {
+                    widget = wibox.widget.progressbar,
+                    max_value = 100,
+                    value = 0,
+                    forced_height = qvars.char_height / 4,
+                    shape = qvars.shape,
+                    background_color = qvars.colors.black,
+                    color = qvars.colors.fg,
+                }
+            },
+            id = "bar"
+        },
+        layout = wibox.layout.align.horizontal,
+    }
+}
+
+awesome.connect_signal("services::brightness", function(brightness)
+    brightness = math.floor(qmath.translate_range(brightness, 0, 255, 0, 100))
+
+    brightness_bar.widget.bar.widget.widget.value = brightness
+
+    brightness_bar.widget.text.text = brightness .. "%"
+end)
+
+return brightness_bar
diff --git a/.config/awesome/ui/statusbar/panel/widgets/calendar.lua b/.config/awesome/ui/statusbar/panel/widgets/calendar.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/awesome/ui/statusbar/panel/widgets/calendar.lua
diff --git a/.config/awesome/ui/statusbar/widgets/clock.lua b/.config/awesome/ui/statusbar/widgets/clock.lua
index 77ce8ce..ff57a36 100644
--- a/.config/awesome/ui/statusbar/widgets/clock.lua
+++ b/.config/awesome/ui/statusbar/widgets/clock.lua
@@ -1,6 +1,5 @@
 local qvars = require "quarrel.vars"
 local wibox = require "wibox"
-local qui = require "quarrel.ui"
 
 local clock = wibox.widget {
     widget = wibox.container.place,
@@ -8,11 +7,7 @@ local clock = wibox.widget {
         format = "%H\n%M",
         widget = wibox.widget.textclock,
         font = qvars.font
-    },
+    }
 }
 
-qui.tooltip({ clock }, function()
-    return os.date("%a %d/%m/%y")
-end)
-
 return clock