Merge branch 'upstream-custom' into dev

waybar/themes/ml4w-blur-custom/config

@@ -43,7 +43,8 @@
         "custom/updates",
         "pulseaudio",
         //"bluetooth",
-        //"battery", 
+        "battery",
+        "battery#charging",
         "network",
         "cpu",
         "memory",

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