resolved merge conflict

waybar/config.jsonc

@@ -2,15 +2,13 @@
 {
     "layer": "top",
     "position": "top",
-    "height": 35,
-    "modules-left": [
-		"hyprland/workspaces"
-	],
+    "height": 40,
+    "modules-left": ["hyprland/workspaces"],
     "modules-center": [],
     "modules-right": [
-		"wireplumber", 
-		"custom/audio-output", 
+		"custom/bluetooth-audio", 
 		"custom/pixelbuds_pro", 
+		"wireplumber", 
 		"network", 
 		"cpu", 
 		"memory",
@@ -19,9 +17,9 @@
 		"custom/gamemode",
         "tray",
 		"clock"
-		// "custom/power"
 	],
 
+
     "hyprland/workspaces": {
         "format": "{icon}",
         "on-click": "activate"
@@ -56,17 +54,27 @@
         "tooltip-format": "{ifname} via {gwaddr}"
     },
 	"wireplumber": {
-        "format": "{volume}% {icon}",
-        "format-muted": "Muted ",
+        "format": "{volume}%  {icon}",
+        "format-muted": "---  ",
         "format-icons": {
             "headphone": "",
             "hands-free": "",
-            "default": ["", ""]
+            "default": ["", "", ""]
         },
-        "on-click": "pavucontrol",
+        "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
+		"on-click-right": "~/.config/waybar/scripts/cycle_audio_output.sh",
+		"on-click-middle": "pavucontrol",
         "scroll-step": 1
     },
 
+    "custom/bluetooth-audio": {
+        "format": "{}",
+        "return-type": "json",
+        "exec": "~/.config/waybar/scripts/bluetooth_audio.sh",
+        "interval": 3,
+        "on-click": "~/.config/waybar/scripts/bluetooth_audio.sh disconnect"
+    },
+
     "pulseaudio": {
         "format": "{icon} {volume}%",
         "format-muted": " Muted",
@@ -113,9 +121,8 @@
 		"return-type": "json",
 		"exec": "~/.config/waybar/scripts/pixelbuds_pro_control.sh",
 		"interval": 5,
-		"on-click": "~/.config/waybar/scripts/pixelbuds_pro_control.sh connect",
-		"on-click-right": "~/.config/waybar/scripts/pixelbuds_pro_control.sh disconnect",
-		"on-click-middle": "~/.config/waybar/scripts/pixelbuds_pro_control.sh cycle_anc"
+		"on-click-right": "~/.config/waybar/scripts/pixelbuds_pro_control.sh connect",
+		"on-click": "~/.config/waybar/scripts/pixelbuds_pro_control.sh cycle_anc"
 	},
     "custom/audio-output": {
         "format": "{}",
@@ -136,14 +143,13 @@
         "return-type": "json",
         "exec": "~/.config/waybar/scripts/gpu-screen-recorder-status.sh",
         "on-click-right": "~/.config/hypr/scripts/replay-ctrl.sh save",
-        "on-click": "~/.config/hypr/scripts/replay-ctrl.sh toggle",
+        "on-click": "~/.config/waybar/scripts/toggle-replay.sh",
         "interval": 1
     },
     "custom/gpu-usage": {
         "format": "{}",
         "return-type": "json",
         "exec": "~/.config/waybar/scripts/gpu_usage.sh",
-		"on-click": "lact gui",
         "interval": 5
     }
 }