From 089cc7a73020b36e9a6bbf46a2aa2a645be6a5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergiolain11@gmail.com>
Date: Thu, 21 Dec 2023 01:52:39 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(hypr):=20add=20swayosd=20bindi?=
 =?UTF-8?q?ngs=20and=20changed=20some=20existing=20ones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .config/hypr/configs/binds.conf    | 33 +++++++++++++++++++-----------
 .config/hypr/scripts/autostart     |  2 +-
 .config/keyb/bindings/hyprland.yml | 20 ++++++++++++++----
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/.config/hypr/configs/binds.conf b/.config/hypr/configs/binds.conf
index f4209fb9..f7431439 100644
--- a/.config/hypr/configs/binds.conf
+++ b/.config/hypr/configs/binds.conf
@@ -161,19 +161,28 @@ submap = reset
 
 ## Audio
 bind = SUPERCTRL, V, exec, restartAudio
-bind = ,XF86AudioPlay, exec, playerctl play-pause
-bindl = SUPERCTRL, mouse:274, exec,playerctl play-pause
-bind = ,XF86AudioPrev, exec, playerctl previous
-bindl = SUPERCTRL, mouse_up, exec, playerctl previous
-bind = ,XF86AudioNext, exec, playerctl next
-bindl = SUPERCTRL, mouse_down, exec, playerctl next
 
-bindl = , XF86AudioMedia, exec, playerctl play-pause
-bindl = , XF86AudioStop, exec, playerctl stop
-bindle = , XF86AudioRaiseVolume, exec, swayosd --output-volume raise
-bindle = , XF86AudioLowerVolume, exec, swayosd --output-volume lower
-bindle = , XF86AudioMute, exec, swayosd --output-volume mute-toggle
-bindle = , XF86AudioMicMute, exec, exec swayosd --input-volume mute-toggle
+bindl = SUPERCTRL, mouse:280, exec, swayosd-client --output-volume mute-toggle # Extra Up Button
+bindl = , XF86AudioMute, exec, swayosd-client --output-volume mute-toggle
+bindl = SUPERCTRL, mouse:281, exec, swayosd-client --input-volume mute-toggle # Extra Down Button
+bindl = , XF86AudioMicMute, exec, exec swayosd-client --input-volume mute-toggle
+
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = SUPERCTRL, mouse:282, exec, playerctl play-pause # Extra Center Button
+bindl = , XF86AudioPrev, exec, playerctl previous
+bindl = SUPERCTRL, mouse:275, exec, playerctl previous # Extra Back Button
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = SUPERCTRL, mouse:276, exec, playerctl next # Extra Forward Button
+
+bindle = , XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise
+bindle = SUPERCTRL, 21, exec, swayosd-client --output-volume raise # Minus key
+bindle = , XF86AudioLowerVolume, exec, swayosd-client --output-volume lower
+bindle = SUPERCTRL, 20, exec, swayosd-client --output-volume lower # Plus key
+
+bindle = , XF86InputRaiseVolume, exec, swayosd-client --input-volume raise
+bindle = SUPERSHIFT, 21, exec, swayosd-client --input-volume raise # Minus key
+bindle = , XF86InputLowerVolume, exec, swayosd-client --input-volume lower
+bindle = SUPERSHIFT, 20, exec, swayosd-client --input-volume lower # Plus key
 
 # Disable anim, blur, etc
 bind = SUPER, F12, exec, ~/.config/hypr/scripts/performance
diff --git a/.config/hypr/scripts/autostart b/.config/hypr/scripts/autostart
index 37aeb601..391408b4 100755
--- a/.config/hypr/scripts/autostart
+++ b/.config/hypr/scripts/autostart
@@ -18,7 +18,7 @@ swww init
 waybar &
 
 # OSD Window
-swayosd &
+swayosd-server &
 
 # Automounter for removable media
 udiskie &
diff --git a/.config/keyb/bindings/hyprland.yml b/.config/keyb/bindings/hyprland.yml
index 65b5c593..9bd21283 100644
--- a/.config/keyb/bindings/hyprland.yml
+++ b/.config/keyb/bindings/hyprland.yml
@@ -102,14 +102,26 @@
 
 - name: Audio
   keybinds:
-    - name: Play-Pause Music
-      key: Ctrl + Win + Middle Mouse Button
+    - name: Play-Pause Song
+      key: Ctrl + Win + Mouse Extra Middle Button
     - name: Play Previous Song
-      key: Ctrl + Win + Mouse Wheel Down
+      key: Ctrl + Win + Mouse Backward Button
     - name: Play Next Song
-      key: Ctrl + Win + Mouse Wheel Up
+      key: Ctrl + Win + Mouse Forward Button
+    - name: Toggle Output Mute
+      key: Ctrl + Win + Mouse Extra Up Button
+    - name: Toggle Input Mute
+      key: Ctrl + Win + Mouse Extra Down Button
     - name: Restart Audio
       key: Ctrl + Win + V
+    - name: Output Volume Up
+      key: Ctrl + Win + Plus Sign
+    - name: Output Volume Down
+      key: Ctrl + Win + Minus Sign
+    - name: Input Volume Up
+      key: Win + Shift + Plus Sign
+    - name: Input Volume Down
+      key: Win + Shift + Minus Sign
 
 - name: Screenshots
   keybinds: