From f7e5b10c543ad47515cb50c839bb6fb3273d7938 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Sun, 26 Jul 2026 00:24:33 +0530 Subject: refactor(waybar): extract mkIcon helper, drop per-module iconColor parameter - Add lib.nix with shared mkIcon function for consistent icon formatting - Pass mkIcon instead of per-module iconColor to all modules - Define iconColor locally within each module - Fix battery icon character --- modules/desktop/waybar/module/volume.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'modules/desktop/waybar/module/volume.nix') diff --git a/modules/desktop/waybar/module/volume.nix b/modules/desktop/waybar/module/volume.nix index fb57a16..0aa2b94 100644 --- a/modules/desktop/waybar/module/volume.nix +++ b/modules/desktop/waybar/module/volume.nix @@ -1,8 +1,11 @@ -{ config, iconColor }: +{ config, mkIcon }: with config.scheme.withHashtag; +let + iconColor = base0A; +in { - format = "{icon} {volume}%"; - format-muted = "󰝟"; + format = "${mkIcon iconColor "{icon}"} {volume}%"; + format-muted = mkIcon iconColor " "; format-icons = [ "" "" -- cgit v1.2.3