2 files changed, 19 insertions, 30 deletions
diff --git a/waybar/config b/waybar/config
index a178ed6..70b7b67 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", "battery", "network", "clock", "tray", "custom/power"],
+    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight", "battery", "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": "",
diff --git a/waybar/style.css b/waybar/style.css
index 88b8900..05af6ab 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -53,7 +53,7 @@ window#waybar.hidden {
 */
 
 #workspaces button.active {
-    background: #198844;
+    background: #EC0101;
 }
 
 /*
@@ -81,7 +81,7 @@ window#waybar.hidden {
 #temperature,
 #backlight,
 #network,
-#pulseaudio,
+#wireplumber,
 #custom-media,
 #custom-launcher,
 #custom-power,
@@ -157,7 +157,7 @@ label:focus {
 }
 
 #memory {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -167,12 +167,12 @@ label:focus {
 }
 
 #backlight {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
 #network {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -181,14 +181,14 @@ label:focus {
     color: #ffffff;
 }
 
-#pulseaudio {
-    background-color: #198844;
+#wireplumber {
+    background-color: #EC0101;
     color: #ffffff;
 }
 
-#pulseaudio.muted {
+#wireplumber.muted {
     background-color: #1b1d1c;
-    color: #198844;
+    color: #EC0101;
 }
 
 #custom-media {
@@ -278,19 +278,19 @@ label:focus {
 }
 
 #tray {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
 #tray > .passive {
     -gtk-icon-effect: dim;
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -301,7 +301,7 @@ label:focus {
 }
 
 #idle_inhibitor.activated {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
     border-radius: 20px 0px 0px 20px;