From 475fbc55cc9c2135423203dc62de090e581c643b Mon Sep 17 00:00:00 2001
From: Yingjie Wang <phywyj@gmail.com>
Date: Thu, 4 Apr 2024 04:42:52 -0400
Subject: [PATCH] update: better battery in waybar

---
 waybar/themes/ml4w-blur-custom/config       |  3 ++-
 waybar/themes/ml4w-blur-custom/modules.json | 30 ++++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/waybar/themes/ml4w-blur-custom/config b/waybar/themes/ml4w-blur-custom/config
index df6e6bb..2081fca 100644
--- a/waybar/themes/ml4w-blur-custom/config
+++ b/waybar/themes/ml4w-blur-custom/config
@@ -43,7 +43,8 @@
         "custom/updates",
         "pulseaudio",
         //"bluetooth",
-        //"battery", 
+        "battery", 
+        "battery#charging",
         "network",
         "cpu",
         "memory",
diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json
index bb20f05..dc5ad64 100644
--- a/waybar/themes/ml4w-blur-custom/modules.json
+++ b/waybar/themes/ml4w-blur-custom/modules.json
@@ -322,16 +322,32 @@
             "warning": 30,
             "critical": 15
         },
-        "format": "{icon}   {capacity}%",
-        "format-charging": "{icon}  {capacity}%",
+        "format": "{icon}  {capacity}%",
+        "format-charging": "",
         "format-plugged": "  {capacity}%",
         "format-alt": "{icon}  {time}",
         // "format-good": "", // An empty format will hide the module
-        // "format-full": "",
-        "format-icons": {
-            "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"],
-            "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
-        }
+        "format-full": "󱟢 {capacity}%",
+        //"format-icons": {
+        //    "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"],
+        //    "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
+        //}
+        "format-icons": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
+    },
+    "battery#charging": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "",
+        "format-charging": "{icon}  {capacity}%",
+        // "format-good": "", // An empty format will hide the module
+        //"format-icons": {
+        //    "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"],
+        //    "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
+        //}
+        "format-icons": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"]
     },
 
     // Pulseaudio