Merge branch 'master' into mac

1 files changed, 6 insertions, 17 deletions

diff --git a/waybar/config b/waybar/config
index 7a54e0c..2717db9 100644
--- a/waybar/config
+++ b/waybar/config
@@ -11,7 +11,7 @@
 
     "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
     "modules-center":[],
-    "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "tray", "custom/power"],
+    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "network", "clock", "custom/power"],
 
     // Modules configuration
 
@@ -135,24 +135,13 @@
         "max-length": 22,
         "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
     },
-    "pulseaudio": {
+    "wireplumber": {
         // "scroll-step": 1, // %, can be a float
         "format": "{volume}% {icon}",
-        "format-bluetooth": "{volume}% {icon}",
-        "format-bluetooth-muted": "{icon} {format_source}",
-        "format-muted": "{format_source}",
-        "format-source": "",
-        "format-source-muted": "",
-        "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
-            "phone": "",
-            "portable": "",
-            "car": "",
-            "default": ["", "", ""]
-        },
-        "on-click": "pavucontrol"
+        "format-muted": "{volume}% ",
+        "format-icons": ["", "", ""],
+        "on-click": "volsv -t",
+        "scroll-step": 0.1
     },
     "custom/launcher":{
         "format": "",