Merge branch 'master' into cas

1 files changed, 6 insertions, 18 deletions

diff --git a/waybar/config b/waybar/config
index aa1bba3..49cc19c 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", "battery", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "tray", "custom/power"],
+    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "battery", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "custom/power"],
 
     // Modules configuration
 
@@ -41,7 +41,6 @@
       },
       "persistent-workspaces": {
         "eDP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
-        "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ],
       },
       "on-scroll-up": "hyprctl dispatch split-workspace e+1",
       "on-scroll-down": "hyprctl dispatch split-workspace e-1",
@@ -137,24 +136,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": "",