From 015613ad47891224e64d82d8caa58bb20fe3212f Mon Sep 17 00:00:00 2001
From: Simon Cornet <simon@simoncor.net>
Date: Sun, 31 Mar 2024 18:40:48 +0200
Subject: [PATCH] [hyprland] restore wpctl bindings

---
 apps/waybar/style.css                   | 19 +++++++++++++++++++
 apps/waybar/waybar.conf                 | 11 +++--------
 nix/home/hyprland/hyprland-bindings.nix |  6 +++---
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/apps/waybar/style.css b/apps/waybar/style.css
index 42c776a..39b5063 100644
--- a/apps/waybar/style.css
+++ b/apps/waybar/style.css
@@ -20,6 +20,22 @@ tooltip {
   border-color: #4771c9;
 }
 
+window#waybar {
+  background: rgba(21, 18, 27, 0);
+  color: #cdd6f4;
+}
+
+tooltip {
+  background: rgba(12, 12, 12, 0.9);
+  border-radius: 10px;
+  border-width: 2px;
+  border-style: solid;
+  border-color: #4771c9;
+}
+
+#battery,
+#backlight,
+
 #battery,
 #backlight,
 #clock,
@@ -60,6 +76,9 @@ tooltip {
 
 /* middle segment */
 #clock {
+  font-family: "Ubuntu Light 12";
+  font-weight: normal;
+  font-size: 18px;
   color: #fab387;
   border: 2px solid #4771c9;
 }
diff --git a/apps/waybar/waybar.conf b/apps/waybar/waybar.conf
index 1be895c..1412a38 100644
--- a/apps/waybar/waybar.conf
+++ b/apps/waybar/waybar.conf
@@ -43,13 +43,8 @@
   },
 
   "battery": {
-		"states": {
-			"good": 75,
-			"warning": 50,
-			"critical": 15
-		},
-		"format": "{icon} {capacity}%",
-    "format-full": "{icon}",
+		"format": "{icon} ",
+    "format-full": "{icon} ",
 		"format-icons": [
 			"",
 			"",
@@ -112,7 +107,7 @@
   },
 
   "pulseaudio": {
-		"format": "{icon} ",
+		"format": "{icon} {volume:2}%",
 		"format-muted": "󰖁 ",
 		"format-icons": {
       "headphone": "",
diff --git a/nix/home/hyprland/hyprland-bindings.nix b/nix/home/hyprland/hyprland-bindings.nix
index d0605cd..c73b48f 100644
--- a/nix/home/hyprland/hyprland-bindings.nix
+++ b/nix/home/hyprland/hyprland-bindings.nix
@@ -87,9 +87,9 @@
     bind = $mainMod SHIFT, right, resizeactive, 50 0
 
     # multimedia key bindings
-    bind = ,XF86AudioMute,         exec, pw-volume mute toggle
-    bind = ,XF86AudioRaiseVolume,  exec, pw-volume change +5%
-    bind = ,XF86AudioLowerVolume,  exec, pw-volume change -5%
+    bind = ,XF86AudioMute,         exec, wpctl set-mute @DEFAULT_SINK@ toggle
+    bind = ,XF86AudioRaiseVolume,  exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+    bind = ,XF86AudioLowerVolume,  exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
     bind = ,XF86MonBrightnessDown, exec, brightnessctl set 10%-
     bind = ,XF86MonBrightnessUp,   exec, brightnessctl set 10%+