5 files changed, 49 insertions, 16 deletions
diff --git a/.config/awesome/ui/statusbar/widgets/battery.lua b/.config/awesome/ui/statusbar/widgets/battery.lua
index 98af803..f220ff1 100644
--- a/.config/awesome/ui/statusbar/widgets/battery.lua
+++ b/.config/awesome/ui/statusbar/widgets/battery.lua
@@ -10,19 +10,14 @@ local battery = wibox.widget {
     halign = "center",
     {
         widget = wibox.widget.imagebox,
-        image = gcolor.recolor_image(phosphor.battery_warning_vertical_fill, qvars.colors.red),
-        forced_width = qvars.icon_size,
-        forced_height = qvars.icon_size
+        image = gcolor.recolor_image(phosphor.battery_vertical_warning_fill, qvars.colors.red),
+        forced_width = qvars.char_height,
+        forced_height = qvars.char_height
     }
 }
 
 awesome.connect_signal("services::battery", function(capacity, status)
-    if status == "Charging" then
-        battery.widget.image = gcolor.recolor_image(phosphor.battery_charging_vertical_fill, qvars.colors.green)
-        return
-    end
-
-    local icon_data = qmath.step_value(capacity, {
+    local icon_data = status == "Charging" and { "charging", "green" } or qmath.step_value(capacity, {
         { 0, { "empty", "red" } },
         { 20, { "low", "red" } },
         { 40, { "medium", "yellow" } },
diff --git a/.config/awesome/ui/statusbar/widgets/brightness.lua b/.config/awesome/ui/statusbar/widgets/brightness.lua
index 5c1cb16..bfb8e91 100644
--- a/.config/awesome/ui/statusbar/widgets/brightness.lua
+++ b/.config/awesome/ui/statusbar/widgets/brightness.lua
@@ -11,8 +11,8 @@ local brightness = wibox.widget {
     {
         widget = wibox.widget.imagebox,
         image = gcolor.recolor_image(phosphor.moon_fill, qvars.colors.fg),
-        forced_width = qvars.icon_size,
-        forced_height = qvars.icon_size
+        forced_width = qvars.char_height,
+        forced_height = qvars.char_height
     }
 }
 
diff --git a/.config/awesome/ui/statusbar/widgets/taglist.lua b/.config/awesome/ui/statusbar/widgets/taglist.lua
index 5b479bc..10618aa 100644
--- a/.config/awesome/ui/statusbar/widgets/taglist.lua
+++ b/.config/awesome/ui/statusbar/widgets/taglist.lua
@@ -19,8 +19,8 @@ return awful.widget.taglist {
         {
             widget = wibox.widget.imagebox,
             image = gcolor.recolor_image(phosphor.circle_bold, qvars.colors.fg),
-            forced_width = qvars.icon_size,
-            forced_height = qvars.icon_size,
+            forced_width = qvars.char_height,
+            forced_height = qvars.char_height,
             icon = phosphor.dot_fill
         },
         create_callback = function(self, tag)
diff --git a/.config/awesome/ui/statusbar/widgets/volume.lua b/.config/awesome/ui/statusbar/widgets/volume.lua
index e69de29..72723a0 100644
--- a/.config/awesome/ui/statusbar/widgets/volume.lua
+++ b/.config/awesome/ui/statusbar/widgets/volume.lua
@@ -0,0 +1,36 @@
+local gcolor = require "gears.color"
+local phosphor = require "assets.phosphor"
+local qmath = require "quarrel.math"
+local qvars = require "quarrel.vars"
+local wibox = require "wibox"
+
+local volume_widget = wibox.widget {
+    widget = wibox.container.place,
+    valign = "center",
+    halign = "center",
+    {
+        widget = wibox.widget.imagebox,
+        image = gcolor.recolor_image(phosphor.speaker_simple_slash_fill, qvars.colors.red),
+        forced_width = qvars.char_height,
+        forced_height = qvars.char_height
+    }
+}
+
+awesome.connect_signal("services::audio", function(volume, muted)
+    if muted then
+        volume_widget.widget.image = gcolor.recolor_image(phosphor["speaker_simple_x_fill"], qvars.colors.red)
+        return
+    end
+
+    local icon_data = qmath.step_value(volume, {
+        { 0, "slash" },
+        { 25, "none" },
+        { 50, "low" },
+        { 75, "high" },
+        { 100 }
+    })
+
+    volume_widget.widget.image = gcolor.recolor_image(phosphor["speaker_simple_" .. icon_data .. "_fill"], qvars.colors.fg)
+end)
+
+return volume_widget
diff --git a/.config/awesome/ui/statusbar/widgets/wifi.lua b/.config/awesome/ui/statusbar/widgets/wifi.lua
index ec5b72c..c895b0a 100644
--- a/.config/awesome/ui/statusbar/widgets/wifi.lua
+++ b/.config/awesome/ui/statusbar/widgets/wifi.lua
@@ -3,6 +3,8 @@ local phosphor = require "assets.phosphor"
 local qmath = require "quarrel.math"
 local qvars = require "quarrel.vars"
 local wibox = require "wibox"
+local q = require "quarrel"
+local gdebug = require "gears.debug"
 
 local wifi = wibox.widget {
     widget = wibox.container.place,
@@ -11,12 +13,12 @@ local wifi = wibox.widget {
     {
         widget = wibox.widget.imagebox,
         image = gcolor.recolor_image(phosphor.wifi_x_fill, qvars.colors.red),
-        forced_width = qvars.icon_size,
-        forced_height = qvars.icon_size
+        forced_width = qvars.char_height,
+        forced_height = qvars.char_height
     }
 }
 
-awesome.connect_signal("services::wifi", function(strength, connected)
+awesome.connect_signal("services::wifi", function(essid, strength, connected)
     if not connected then
         wifi.widget.image = gcolor.recolor_image(phosphor.wifi_x_fill, qvars.colors.red)
         return