From b11e1aa71778f33575925ee8870dcc6a56b7eed5 Mon Sep 17 00:00:00 2001
From: Simon Cornet <simon@simoncor.net>
Date: Sun, 31 Mar 2024 23:35:23 +0200
Subject: [PATCH] [packages] switch from easyeffects to pavucontrol

---
 apps/waybar/waybar.conf                     |  2 +-
 nix/home/hyprland/hyprland-execution.nix    | 14 +++++++-------
 nix/home/hyprland/hyprland-window_rules.nix |  6 +++---
 nix/systems/packages.nix                    |  3 +--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/apps/waybar/waybar.conf b/apps/waybar/waybar.conf
index 570ba22..bb765e5 100644
--- a/apps/waybar/waybar.conf
+++ b/apps/waybar/waybar.conf
@@ -139,7 +139,7 @@
       "default": ["", "", ""]
     },
 		"scroll-step": 5,
-		"on-click": "easyeffects"
+		"on-click": "pavucontrol"
 	},
 
   "tray": {
diff --git a/nix/home/hyprland/hyprland-execution.nix b/nix/home/hyprland/hyprland-execution.nix
index b1508d6..09d92af 100644
--- a/nix/home/hyprland/hyprland-execution.nix
+++ b/nix/home/hyprland/hyprland-execution.nix
@@ -35,16 +35,16 @@
     exec-once = ~/.dotfiles/apps/hyprland/startup/nextcloud_desktop.sh
 
     # center apps
-    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "solaar" --title "solaar"
-    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "clipse" --title "Alacritty"
-    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "nostt" --title "Alacritty"
-    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "nmtui" --title "Alacritty"
-    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "Rofi"  --title "rofi -   Apps"
-    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "scratchbox" --title "Alacritty"
     exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "blueman-manager" --title "Bluetooth Devices"
+    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "clipse" --title "Alacritty"
     exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "com.gabm.satty" --title "satty"
     exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "dev.deedles.Trayscale" --title "Trayscale"
-    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "com.github.wwmm.easyeffects" --title "Easy Effects"
+    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "nmtui" --title "Alacritty"
+    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "nostt" --title "Alacritty"
+    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "pavucontrol" --title "Volume Control"
+    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "Rofi"  --title "rofi -   Apps"
+    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "scratchbox" --title "Alacritty"
+    exec = ~/.dotfiles/apps/hyprland/centre_app.sh --class "solaar" --title "solaar"
 
     # start default apps
     exec-once = [workspace 1 silent] bitwarden
diff --git a/nix/home/hyprland/hyprland-window_rules.nix b/nix/home/hyprland/hyprland-window_rules.nix
index f164086..62a2722 100644
--- a/nix/home/hyprland/hyprland-window_rules.nix
+++ b/nix/home/hyprland/hyprland-window_rules.nix
@@ -74,9 +74,9 @@
     windowrulev2 = move center, class:(dev.deedles.Trayscale), title:(Trayscale)
 
     # volume control
-    windowrulev2 = float, title:(Easy Effects)
-    windowrulev2 = size 1000 800, title:(Easy Effects)
-    windowrulev2 = move center, title:(Easy Effects)
+    windowrulev2 = float, title:(Volume Control)
+    windowrulev2 = size 1000 800, title:(Volume Control)
+    windowrulev2 = move center, title:(Volume Control)
 
     # wofi
     windowrulev2 = forceinput, class:(wofi)
diff --git a/nix/systems/packages.nix b/nix/systems/packages.nix
index 39aebb3..3a0dc33 100644
--- a/nix/systems/packages.nix
+++ b/nix/systems/packages.nix
@@ -6,7 +6,6 @@
 
     # system
     btop
-    easyeffects
     fastfetch
     fwupd
     htop
@@ -15,7 +14,7 @@
     nerdfonts
     radeontop
     pciutils
-    pw-volume
+    pavucontrol
     powertop
     solaar
     spice-vdagent