From 6b7b88130b284da0b1b71aa583eb20d58bdd96ed Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Mon, 1 May 2023 17:52:22 +0200
Subject: [PATCH] Modify battery

---
 .../home-manager/config/waybar/config.json    | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/nixos-config/home-manager/config/waybar/config.json b/nixos-config/home-manager/config/waybar/config.json
index 768c03af..9d3e3b0b 100644
--- a/nixos-config/home-manager/config/waybar/config.json
+++ b/nixos-config/home-manager/config/waybar/config.json
@@ -6,15 +6,7 @@
 
   "modules-left": ["wlr/workspaces"],
   "modules-center": ["wlr/window"],
-  "modules-right": [
-    "mpris",
-    "idle_inhibitor",
-    "keyboard-state",
-    "battery",
-    "battery#bat2",
-    "clock",
-    "tray"
-  ],
+  "modules-right": ["mpris", "battery", "clock", "tray"],
 
   "wlr/workspaces": {
     "all-outputs": true,
@@ -32,15 +24,25 @@
     "separate-outputs": true
   },
   "mpris": {
-    "format": "DEFAULT: {player_icon} {dynamic}",
-    "format-paused": "DEFAULT: {status_icon} <i>{dynamic}</i>",
-    "player-icons": {
-      "default": "▶"
-    },
+    "format": "{status_icon} {dynamic}",
+    "format-paused": "{status_icon} <i>{dynamic}</i>",
     "status-icons": {
+      "playing": "▶",
       "paused": "⏸"
     }
   },
+  "battery": {
+    "bat": "BAT0",
+    "states": {
+      "warning": 30,
+      "critical": 15
+    },
+    "format": "{capacity}% {icon}",
+    "format-charging": "{capacity}% ",
+    "format-plugged": "{capacity}% ",
+    "format-alt": "{time} {icon}",
+    "format-icons": ["", "", "", "", ""]
+  },
 
   "sway/workspaces": {
     "disable-scroll": true,
@@ -138,20 +140,6 @@
     "format": "{percent}% {icon}",
     "format-icons": ["", "", "", "", "", "", "", "", ""]
   },
-  "battery": {
-    "states": {
-      "good": 95,
-      "warning": 30,
-      "critical": 15
-    },
-    "format": "{capacity}% {icon}",
-    "format-charging": "{capacity}% ",
-    "format-plugged": "{capacity}% ",
-    "format-alt": "{time} {icon}",
-    "format-good": "",
-    "format-full": "",
-    "format-icons": ["", "", "", "", ""]
-  },
   "battery#bat2": {
     "bat": "BAT2"
   },