From d91c31b1b29c6cbc55caae8e913632418aeb0fee Mon Sep 17 00:00:00 2001
From: oluceps <i@oluceps.uk>
Date: Sat, 27 Jul 2024 21:55:05 +0800
Subject: [PATCH] + pw-vol

---
 home/sway/config.nix   |  7 ++++---
 home/waybar/config.nix | 12 ++++++++++++
 home/waybar/style.css  |  4 ++--
 userPkgs.nix           |  1 +
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/home/sway/config.nix b/home/sway/config.nix
index c9d7dd9a3..548a48228 100755
--- a/home/sway/config.nix
+++ b/home/sway/config.nix
@@ -2,6 +2,7 @@
 let
   wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
   wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
+  pw-volume = "${pkgs.pw-volume}/bin/pw-volume";
   genDeps = n: lib.genAttrs n (name: lib.getExe pkgs.${name});
   bg = "${
     pkgs.fetchurl {
@@ -77,7 +78,7 @@ in
   client.placeholder #000000 #0c0c0c #ffffff #000000 #0c0c0c
   client.background a7c080
 
-  bindsym --no-repeat XF86AudioMute exec pamixer --toggle-mute
+  bindsym --no-repeat XF86AudioMute exec "${pw-volume} mute toggle; pkill -RTMIN+8 waybar"
   bindsym Alt+Print exec ${deps.grim} - | ${wl-copy} -t image/png
   bindsym Ctrl+Shift+l exec ${lib.getExe pkgs.swaylock}
   bindsym Mod4+0 workspace number 10
@@ -152,8 +153,8 @@ in
   bindsym Mod4+v splitv
   bindsym Mod4+w layout tabbed
   bindsym Print exec ${lib.getExe pkgs.sway-contrib.grimshot} copy area
-  bindsym XF86AudioLowerVolume exec pamixer -d 5
-  bindsym XF86AudioRaiseVolume exec pamixer -i 5
+  bindsym XF86AudioLowerVolume exec "${pw-volume} change -2.5%; pkill -RTMIN+8 waybar"
+  bindsym XF86AudioRaiseVolume exec "${pw-volume} change +2.5%; pkill -RTMIN+8 waybar"
   bindsym XF86MonBrightnessUp exec brightnessctl set +3%
   bindsym XF86MonBrightnessdown exec brightnessctl set 3%-
 
diff --git a/home/waybar/config.nix b/home/waybar/config.nix
index 1a5a0b254..d659bb8f0 100755
--- a/home/waybar/config.nix
+++ b/home/waybar/config.nix
@@ -77,6 +77,7 @@
         "cpu",
         "memory",
         "battery",
+        "custom/pipewire"
       ],
       "network": {
         "format": "{bandwidthDownOctets}",
@@ -87,6 +88,17 @@
         "tooltip": false
       },
       "position": "top",
+      "custom/pipewire": {
+      "exec": "${lib.getExe pkgs.pw-volume} status",
+      "return-type": "json",
+      "interval": "once",
+      "signal": 8,
+      "format": "{icon} {percentage}",
+      "format-icons": {
+             "mute": "",
+             "default": ["󰕿", "󰖀", "󰕾"]
+           }
+       },
       "pulseaudio": {
         "format": "{volume}% {icon}",
         "format-icons": {
diff --git a/home/waybar/style.css b/home/waybar/style.css
index f89ee5080..d8efc3188 100755
--- a/home/waybar/style.css
+++ b/home/waybar/style.css
@@ -65,9 +65,9 @@ window#waybar.solo {
   padding-left: 10px;
 }
 
-#pulseaudio {
+#pulseaudio, #custom-pipewire {
 	color: rgba(217, 216, 216, 1);
-	padding: 3px 6px 3px 6px;
+	padding: 3px 8px 3px 6px;
 	margin: 2px 4px 2px 4px;
 	background: rgba(35, 31, 32, 0.5);
 	border-radius: 6px;
diff --git a/userPkgs.nix b/userPkgs.nix
index 674257ae7..42effd2d2 100644
--- a/userPkgs.nix
+++ b/userPkgs.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 with pkgs;
 [
+  paperback
   gtkcord4
   amberol
   mako