Merge branch 'master' into cla

2 files changed, 36 insertions, 30 deletions

diff --git a/waybar/config b/waybar/config
index 146b66c..a6d299b 100644
--- a/waybar/config
+++ b/waybar/config
@@ -9,7 +9,7 @@
 
     "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
     "modules-center":[],
-    "modules-right":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "network", "clock", "tray"],
+    "modules-right":[ "tray", "mpd", "idle_inhibitor", "wireplumber", "cpu", "memory", "temperature#cpu", "temperature#gpu", "network", "clock", "custom/power"],
 
     // Modules configuration
 
@@ -158,24 +158,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 cf76ed2..f8cc3c9 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -45,7 +45,7 @@ window#waybar.hidden {
 
 /*
 #workspaces button:hover {
-    background: #39c1ed;
+    background: #6e3c85;
     color: black;
     border-bottom: 3px solid #ffffff;
 
@@ -53,12 +53,12 @@ window#waybar.hidden {
 */
 
 #workspaces button.active {
-    background: #198844;
+    background: #EC0101;
 }
 
 /*
 #workspaces button.active:hover {
-    background: #39c1ed;
+    background: #6e3c85;
     color: black;
     border-bottom: 3px solid #ffffff;
 }
@@ -81,7 +81,7 @@ window#waybar.hidden {
 #temperature,
 #backlight,
 #network,
-#pulseaudio,
+#wireplumber,
 #custom-media,
 #custom-launcher,
 #custom-power,
@@ -125,7 +125,7 @@ window#waybar.hidden {
 }
 
 #battery.charging, #battery.plugged {
-    color: #26A65B;
+    color: #EC0101;
     background-color: #1b1d1c;
 }
 
@@ -156,7 +156,7 @@ label:focus {
 }
 
 #memory {
-    background-color: #1b1d1c;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -166,12 +166,12 @@ label:focus {
 }
 
 #backlight {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
 #network {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
 }
 
@@ -180,14 +180,14 @@ label:focus {
     color: #ffffff;
 }
 
-#pulseaudio {
-    background-color: #1b1d1c;
+#wireplumber {
+    background-color: #EC0101;
     color: #ffffff;
 }
 
-#pulseaudio.muted {
+#wireplumber.muted {
     background-color: #1b1d1c;
-    color: #198844;
+    color: #EC0101;
 }
 
 #custom-media {
@@ -276,6 +276,23 @@ label:focus {
     background-color: #eb4d4b;
 }
 
+#tray {
+    background-color: transparent;
+    color: #ffffff;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+    background-color: #EC0101;
+    color: #ffffff;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #EC0101;
+    color: #ffffff;
+}
+
 #idle_inhibitor {
     background-color: #1b1d1c;
     border-radius: 20px 0px 0px 20px;
@@ -283,7 +300,7 @@ label:focus {
 }
 
 #idle_inhibitor.activated {
-    background-color: #198844;
+    background-color: #EC0101;
     color: #ffffff;
     border-radius: 20px 0px 0px 20px;