From bff5419919cc60f87bc8d04db1edbb0976140e2a Mon Sep 17 00:00:00 2001
From: thomasabishop <tactonbishop@gmail.com>
Date: Sat, 30 Mar 2024 09:33:48 +0000
Subject: [PATCH] waybar: add pulseaudio

---
 waybar/config    | 31 +++++++++++++++++++------------
 waybar/style.css | 11 +++++++----
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/waybar/config b/waybar/config
index 8a6b9e2..babe815 100644
--- a/waybar/config
+++ b/waybar/config
@@ -22,7 +22,8 @@
 		"custom/diskBackup",
     "battery",
     "custom/wakatime",
-    "clock",
+		"pulseaudio",
+		"clock",
     "custom/timewarrior",
     "custom/lock",
     "custom/restart",
@@ -150,12 +151,12 @@
     "format-alt": "Sig: {essid} ({signalStrength}%)"
   },
   "pulseaudio": {
-    "format": "{icon} {volume}%",
-    "format-bluetooth": "{icon} {volume}% {format_source}",
-    "format-bluetooth-muted": " {icon} {format_source}",
-    "format-muted": " {format_source}",
-    "format-source": " {volume}%",
-    "format-source-muted": "",
+    "format": "Vol: {volume}%",
+    "format-bluetooth": "Vol: {volume}%",
+    "format-bluetooth-muted": "",
+    "format-muted": "Vol: mute",
+    "format-source": "Vol: {volume}%",
+    "format-source-muted": "Vole: mute",
     "format-icons": {
       "headphone": "",
       "hands-free": "",
@@ -198,7 +199,8 @@
     "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null"
   },
   "custom/os": {
-    "format": ""
+    "format": "",
+		"tooltip": false
   },
   "custom/wakatime": {
     "exec": "source $HOME/.env && python3 $HOME/.config/waybar/resources/custom_modules/wakatime.py",
@@ -212,7 +214,8 @@
     "on-click": "sleep 0.15 && timew stop && notify-send 'Time Warrior' 'Timer stopped'",
     "on-click-right": "sleep 0.1 && timew continue && notify-send 'Time Warrior' 'Timer resumed'",
     "return-type": "json",
-    "interval": 5
+    "interval": 5,
+		"tooltip": false
   },
   "custom/logout": {
     "format": "󰛂",
@@ -223,7 +226,7 @@
     "tooltip": false,
     "format": "{icon}",
     "format-icons": {
-      "notification": "<span color=\"#fabd2f\">󰂝</span>",
+      "notification": "<span color=\"#b8bb26\">󰂝</span>",
       "none": "󰂚",
       "dnd-notification": "󰂛",
       "dnd-none": "󰂛",
@@ -242,18 +245,22 @@
   "custom/diskBackup": {
     "format": "Bak: {}",
     "exec": "df -h /media/backups | awk 'NR==2{print $5}'",
-    "interval": 60
+    "interval": 60,
+		 "tooltip": false
   },
 		"custom/lock": {
     "format": "󰍁",
-		"on-click": "hyprlock"
+		"on-click": "hyprlock",
+		"tooltip": false
   },
 		"custom/shutdown": {
     "format": "󱠡",
+		"tooltip": false,
 		"on-click": "systemctl poweroff"
   },
 	"custom/restart": {
     "format": "󰑓",
+		"tooltip": false,
 		"on-click": "systemctl reboot" 
 	}
 }
diff --git a/waybar/style.css b/waybar/style.css
index e929708..4aa8b90 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -16,15 +16,16 @@ button {
 }
 
 tooltip {
-  color: #ebdbb2;
+  color: #282828;
+  border-width: 0;
   border-radius: 0;
   font-weight: 400;
-  background-color: rgba(40, 40, 40, 0.8);
+  background-color: #bdae93;
   box-shadow: none;
 }
 
 tooltip label {
-  color: #ebdbb2;
+  color: #282828;
 }
 
 /* Layout */
@@ -46,6 +47,7 @@ tooltip label {
 #memory,
 #temperature,
 #backlight,
+#pulseaudio,
 #disk,
 #custom-diskBackup,
 #battery {
@@ -144,7 +146,8 @@ tooltip label {
 }
 
 #network,
-#bluetooth {
+#bluetooth,
+#pulseaudio {
   color: #282828;
   background-color: #a89984;
   border: 2px solid; /* Base border */