idk anymore

1 files changed, 22 insertions, 14 deletions

diff --git a/.config/awesome/ui/statusbar/panel/widgets/displays.lua b/.config/awesome/ui/statusbar/panel/widgets/displays.lua
index de15bd5..b52c986 100644
--- a/.config/awesome/ui/statusbar/panel/widgets/displays.lua
+++ b/.config/awesome/ui/statusbar/panel/widgets/displays.lua
@@ -1,3 +1,5 @@
+local backlight = require "services.backlight"
+local battery = require "services.battery"
 local phosphor = require "assets.phosphor"
 local qmath = require "quarrel.math"
 local qui = require "quarrel.ui"
@@ -23,23 +25,29 @@ local function create_display(icon, color)
                         forced_width = qvars.element_size * 4,
                         {
                             widget = wibox.container.place,
-                            qui.icon(icon, color, { id = "icon" })
+                            qui.icon {
+                                icon = icon,
+                                color = color,
+                                widget = {
+                                    id = "icon",
+                                },
+                            },
                         },
-                        id = "indicator"
+                        id = "indicator",
                     },
                     {
                         widget = wibox.container.place,
                         {
                             widget = wibox.widget.textbox,
                             text = "0%",
-                            id = "text"
-                        }
+                            id = "text",
+                        },
                     },
                     layout = wibox.layout.fixed.vertical,
-                    spacing = qvars.big_padding
-                }
-            }
-        }
+                    spacing = qvars.big_padding,
+                },
+            },
+        },
     })
 end
 
@@ -58,23 +66,23 @@ awesome.connect_signal("services::audio::icon", function(icon, color)
 end)
 
 local d_battery = create_display(phosphor.battery_vertical_warning_fill, qvars.colors.red)
-awesome.connect_signal("services::battery", function(capacity)
-    d_battery:get_children_by_id("indicator")[1].value = capacity
-    d_battery:get_children_by_id("text")[1].text = capacity .. "%"
+battery:connect_signal("level", function(_, level)
+    d_battery:get_children_by_id("indicator")[1].value = level
+    d_battery:get_children_by_id("text")[1].text = level .. "%"
 end)
-awesome.connect_signal("services::battery::icon", function(icon, color)
+battery:connect_signal("icon", function(_, icon, color)
     d_battery:get_children_by_id("indicator")[1].color = color
     d_battery:get_children_by_id("icon")[1].image = icon
     d_battery:get_children_by_id("icon")[1].stylesheet = qui.recolor(color)
 end)
 
 local d_brightness = create_display(phosphor.sun_fill, qvars.colors.fg)
-awesome.connect_signal("services::brightness", function(brightness)
+backlight:connect_signal("value", function(_, brightness)
     brightness = math.floor(qmath.translate_range(brightness, 0, 255, 0, 100))
     d_brightness:get_children_by_id("indicator")[1].value = brightness
     d_brightness:get_children_by_id("text")[1].text = brightness .. "%"
 end)
-awesome.connect_signal("services::brightness::icon", function(icon, color)
+backlight:connect_signal("icon", function(_, icon, color)
     d_brightness:get_children_by_id("icon")[1].image = icon
     d_brightness:get_children_by_id("icon")[1].stylesheet = qui.recolor(color)
 end)