From 1b3d8b8b12e470d71e5031fef157d89a32464154 Mon Sep 17 00:00:00 2001
From: timoxa0 <tima012007@gmail.com>
Date: Wed, 20 Nov 2024 22:36:35 +0500
Subject: [PATCH] waybar: Add battery and backlight modules

---
 dot-config/waybar/waybar.css   |  8 ++--
 dot-config/waybar/waybar.jsonc | 67 +++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/dot-config/waybar/waybar.css b/dot-config/waybar/waybar.css
index 5d4395f..a90ebd0 100644
--- a/dot-config/waybar/waybar.css
+++ b/dot-config/waybar/waybar.css
@@ -45,8 +45,8 @@ window#waybar {
 	color: @base;
 }
 
-#custom-power, #custom-runner,
-#wireplumber, #wireplumber.muted,
+#custom-power, #custom-runner, #battery,
+#backlight, #wireplumber, #wireplumber.muted,
 #tray, #language, #clock {
  	background: @mantle;
 	border-radius: 14px;
@@ -63,11 +63,11 @@ window#waybar {
     padding: 0px 10px;
 }
 
-#tray {
+#tray, #battery {
 	padding: 0px 10px;
 }
 
-#wireplumber, #wireplumber.muted {
+#backlight, #wireplumber, #wireplumber.muted {
 	padding: 0px 10px;
     min-width: 55px;
 }
diff --git a/dot-config/waybar/waybar.jsonc b/dot-config/waybar/waybar.jsonc
index d18aaa4..de184e4 100644
--- a/dot-config/waybar/waybar.jsonc
+++ b/dot-config/waybar/waybar.jsonc
@@ -1,43 +1,60 @@
 {
 	"position": "bottom",
 	"height": 31,
-  "width": 900,
+	"width": 900,
 	"spacing": 0,
 	"margin-bottom": 5,
-  "layer": "top",
-  "modules-left": ["custom/power", "custom/runner"],
-  "modules-center": ["hyprland/workspaces"],
-  "modules-right": ["tray", "wireplumber", "hyprland/language", "clock"],
-
+	"layer": "top",
+	"modules-left": ["custom/power", "custom/runner", "tray"],
+	"modules-center": ["hyprland/workspaces"],
+	"modules-right": ["wireplumber", "backlight", "battery", "hyprland/language", "clock"],
+	
 	"custom/power": {
-    "format": "",
-    "on-click": "~/.config/hypr/bin/powermenu"
-  },
+		"format": "",
+		"on-click": "~/.config/hypr/bin/powermenu"
+	},
 
-  "custom/runner": {
-    "format": "",
-    "on-click": "~/.config/hypr/bin/runner"
-  },
+	"custom/runner": {
+		"format": "",
+		"on-click": "hyprlauncher"
+	},
 
-  "hyprland/workspaces": {
+  	"hyprland/workspaces": {
 		"format": "{name}",
 		"on-click": "activate",
 		"tooltip": false,
-    "persistent_workspaces": {
-      "*": 1
-    }
+    	"persistent_workspaces": {
+      		"*": 1
+    	}
 	},
 
-  "tray": {
+  	"tray": {
 		"icon-size": 14,
 		"spacing": 15
-  },
-  
-  "wireplumber": {
+	},
+
+	"battery": {
+		"bat": "qcom-battery",
+		"interval": 60,
+		"states": {
+			"warning": 30,
+			"critical": 15
+		},
+		"format": "{capacity}% ",
+		"max-length": 25
+	},
+
+	"backlight": {
+		"device": "ktz8866-backlight",
+		"format": "{percent}% ",
+		"format-icons": ["", ""]
+	},
+	
+    "wireplumber": {
 		"scroll-step": 2,
 		"format": "{icon} {volume}%",
-    "format-icons":["", "", ""],
-    "format-muted": " mute",
+		"format-icons":["", "", ""],
+		"format-muted": " mute",
 		"on-click": "pavucontrol",
 		"max-volume": 100
 	},
@@ -51,7 +68,7 @@
 	"clock": {
 		"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
 		"format-alt": " {:%Y-%m-%d}",
-    "format": "{:%H:%M}",
-    "timezone": "Asia/Yekaterinburg"
+    	"format": "{:%H:%M}",
+    	"timezone": "Asia/Yekaterinburg"
 	}
 }