From 5a1d8bb61c18cd03fdb6e390392d8b10ba8cf16d Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 18 Nov 2024 17:57:24 +0000
Subject: [PATCH] feat: replace pavucontrol with pwvucontrol

---
 home/common/desktop/default.nix                      | 2 +-
 home/common/desktop/hyprland/config/window-rules.nix | 2 +-
 home/common/desktop/sway/config/window-rules.nix     | 2 +-
 home/common/desktop/waybar/default.nix               | 4 ++--
 host/common/services/pipewire.nix                    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/home/common/desktop/default.nix b/home/common/desktop/default.nix
index 9c4fe89..0da9c1c 100644
--- a/home/common/desktop/default.nix
+++ b/home/common/desktop/default.nix
@@ -33,7 +33,7 @@
     loupe
     pamixer
     papers
-    pavucontrol
+    pwvucontrol
     todoist-electron
     xdg-utils
     xorg.xlsclients
diff --git a/home/common/desktop/hyprland/config/window-rules.nix b/home/common/desktop/hyprland/config/window-rules.nix
index ba4375a..6efde9d 100644
--- a/home/common/desktop/hyprland/config/window-rules.nix
+++ b/home/common/desktop/hyprland/config/window-rules.nix
@@ -17,7 +17,7 @@ _: {
     "noanim,title:^(Quick Access — 1Password)$"
 
     "float, class:^(org.gnome.*)$"
-    "float, class:^(pavucontrol)$"
+    "float, class:^(pavucontrol|com.saivert.pwvucontrol)$"
     "float, class:(blueberry\.py)"
 
     # make pop-up file dialogs floating, centred, and pinned
diff --git a/home/common/desktop/sway/config/window-rules.nix b/home/common/desktop/sway/config/window-rules.nix
index 916fdfb..d1a5d06 100644
--- a/home/common/desktop/sway/config/window-rules.nix
+++ b/home/common/desktop/sway/config/window-rules.nix
@@ -10,7 +10,7 @@ _: {
     {
       command = "floating enable";
       criteria = {
-        app_id = "org.gnome.*|nm-connection-editor|pavucontrol|pinentry-qt|^code$";
+        app_id = "org.gnome.*|nm-connection-editor|pavucontrol|com.saivert.pwvucontrol|pinentry-qt|^code$";
       };
     }
     {
diff --git a/home/common/desktop/waybar/default.nix b/home/common/desktop/waybar/default.nix
index e6d43ed..f6b7453 100644
--- a/home/common/desktop/waybar/default.nix
+++ b/home/common/desktop/waybar/default.nix
@@ -223,7 +223,7 @@ in
         "wireplumber" = {
           format = "{volume}% {icon}";
           format-muted = "";
-          on-click = "${lib.getExe pkgs.pavucontrol}";
+          on-click = "${lib.getExe pkgs.pwvucontrol}";
           format-icons = [
             ""
             ""
@@ -236,7 +236,7 @@ in
           format = "{format_source}";
           format-source = "";
           format-source-muted = "";
-          on-click = "${lib.getExe pkgs.pavucontrol}";
+          on-click = "${lib.getExe pkgs.pwvucontrol}";
           tooltip-format = "{source_volume}% / {desc}";
         };
 
diff --git a/host/common/services/pipewire.nix b/host/common/services/pipewire.nix
index 58b499a..854f0ff 100644
--- a/host/common/services/pipewire.nix
+++ b/host/common/services/pipewire.nix
@@ -14,5 +14,5 @@
     wireplumber.enable = true;
   };
 
-  environment.systemPackages = if (builtins.isString desktop) then [ pkgs.pavucontrol ] else [ ];
+  environment.systemPackages = if (builtins.isString desktop) then [ pkgs.pwvucontrol ] else [ ];
 }