add(modules): more waybar modules and visual changes

1 files changed, 58 insertions, 36 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index f3a8c0b..a376158 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -2,7 +2,7 @@
 	"layer": "top",
 	"position": "top",
 	"modules-left": [
-    "clock",
+		"clock",
 		"custom/window"
 	],
 	"modules-center": [
@@ -12,7 +12,8 @@
 		"custom/gsr",
 		"group/tray-group",
 		"group/brightness-group",
-    "network",
+		"group/hardware",
+		"network",
 		"custom/vpn",
 		"pulseaudio",
 		"bluetooth",
@@ -22,17 +23,6 @@
 		"all-outputs": true,
 		"format": "{name}"
 	},
-	"custom/window": {
-		"exec": "~/.local/bin/waybar-window",
-		"exec-if": "~/.local/bin/waybar-window",
-		"format": "<span color='#aaaaaa'>{}</span>",
-		"return-type": "json",
-		"max-length": 60,
-		"tooltip": false,
-		// titles where special characters are present weren't being shown
-		// this solves that
-		"escape": true
-	},
 	"clock": {
 		"format": "{:%a, %b %d/%m/%y %H:%M}",
 		"interval": 60,
@@ -78,10 +68,10 @@
 		"on-click-right": "rfkill toggle bluetooth"
 	},
 	"pulseaudio": {
-	"format": "{icon} <span color='#aaaaaa'>{volume}%</span>",
-	"format-bluetooth": "{icon}  <span color='#aaaaaa'>{volume}%</span>",
-	"format-muted": "",
-	"format-icons": {
+		"format": "{icon} <span color='#aaaaaa'>{volume}%</span>",
+		"format-bluetooth": "{icon}  <span color='#aaaaaa'>{volume}%</span>",
+		"format-muted": "",
+		"format-icons": {
 			"alsa_output.pci-0000_00_1f.3.analog-stereo": "",
 			"alsa_output.pci-0000_00_1f.3.analog-stereo-muted": "",
 			"headphone": "",
@@ -90,12 +80,15 @@
 			"phone-muted": "",
 			"portable": "",
 			"car": "",
-			"default": ["", ""]
+			"default": [
+				"",
+				""
+			]
+		},
+		"scroll-step": 5,
+		"tooltip-format": "{desc}",
+		"on-click": "pavucontrol-qt"
 	},
-	"scroll-step": 5,
-	"tooltip-format": "{desc}",
-	"on-click": "pavucontrol-qt"
-  },
 	"network": {
 		"interface": "wlo1",
 		"format": "{ifname}",
@@ -123,25 +116,54 @@
 		"interval": 30,
 		"signal": 9
 	},
+	// Hardware group
+	"group/hardware": {
+		"orientation": "horizontal",
+		"modules": [
+			"cpu",
+			"memory",
+			"temperature"
+		]
+	},
+	"cpu": {
+		"interval": 3,
+		"format": " {}%",
+		"max-length": 10
+	},
+	"memory": {
+		"interval": 30,
+		"format": " {}%",
+		"max-length": 10
+	},
+	"temperature": {
+		// "thermal-zone": 2,
+		// "hwmon-path": ["/sys/class/hwmon/hwmon2/temp1_input", "/sys/class/thermal/thermal_zone0/temp"],
+		// "critical-threshold": 80,
+		// "format-critical": "{temperatureC}°C ",
+		"format": " {temperatureC}°C"
+	},
 	// Brightness display
 	"group/brightness-group": {
-    "orientation": "horizontal",
-    "drawer": {
-        "transition-duration": 500,
-        "children-class": "brightness-child",
-        "transition-left-to-right": false
-    },
-    "modules": [
+		"orientation": "horizontal",
+		"drawer": {
+			"transition-duration": 500,
+			"children-class": "brightness-child",
+			"transition-left-to-right": false
+		},
+		"modules": [
 			"custom/brightness-icon",
 			"backlight",
 			"custom/brightness"
-    ]
+		]
 	},
 	"backlight": {
-	"device": "intel_backlight",
-	"format": "{icon} {percent}%",
-	"tooltip-format": "Built-in: {percent}%",
-	"format-icons": ["", ""]
+		"device": "intel_backlight",
+		"format": "{icon} {percent}%",
+		"tooltip-format": "Built-in: {percent}%",
+		"format-icons": [
+			"",
+			""
+		]
 	},
 	"custom/brightness-icon": {
 		"format": "",
@@ -182,8 +204,8 @@
 			"transition-left-to-right": true
 		},
 		"modules": [
-				"custom/tray-drawer",
-				"tray"
+			"custom/tray-drawer",
+			"tray"
 		]
 	},
 	"custom/tray-drawer": {