From a208a817f7e907498b4c141dd199af2bb45def99 Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Wed, 5 Jan 2022 23:02:05 +0100
Subject: [PATCH] audio: rename pulseeffects to easyeffects, follow

upstream: https://github.com/wwmm/easyeffects
---
 modules/audio/default.nix              | 13 ++++++++++---
 modules/audio/easyeffects.service.nix  |  8 ++++++++
 modules/audio/pulseeffects.service.nix |  8 --------
 3 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 modules/audio/easyeffects.service.nix
 delete mode 100644 modules/audio/pulseeffects.service.nix

diff --git a/modules/audio/default.nix b/modules/audio/default.nix
index 68b3c19b..fcceefd3 100644
--- a/modules/audio/default.nix
+++ b/modules/audio/default.nix
@@ -15,26 +15,33 @@ in
   config = mkIf cfg.enable {
     home-manager = with pkgs; pkgs.lib.setAttrByPath [ "users" psCfg.user.name ] {
       home.packages = [
+        # easyeffects, e.g. for microphone noise filtering
+        easyeffects
         mu
         pavucontrol
         pa_applet
         playerctl
         # Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?)
         pulseaudio
-        # pulseeffects for microphone noise filtering
-        pulseeffects-pw
         vimpc
       ];
       xdg.configFile."vimpc/vimpcrc".source = ./.config/vimpc/vimpcrc;
-      systemd.user.services.pulseeffects = import ./pulseeffects.service.nix pkgs;
+      systemd.user.services.easyeffects = import ./easyeffects.service.nix pkgs;
     };
 
     # Enable sound using pipewire-pulse
     services.pipewire = {
+      enable = true;
       alsa.enable = true;
       alsa.support32Bit = true;
       pulse.enable = true;
 
+      config.pipewire = {
+        context.default.clock = {
+          allowed-rates = [ 44100 48000 88200 96000 ];
+          rate = 44100;
+        };
+      };
       config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
 
       # Bluetooth configuration for pipewire
diff --git a/modules/audio/easyeffects.service.nix b/modules/audio/easyeffects.service.nix
new file mode 100644
index 00000000..e94d0abd
--- /dev/null
+++ b/modules/audio/easyeffects.service.nix
@@ -0,0 +1,8 @@
+pkgs:
+{
+  Service = {
+    Type = "dbus";
+    BusName = "com.github.wwmm.easyeffects";
+    ExecStart = "${pkgs.easyeffects}/bin/easyeffects --gapplication-service";
+  };
+}
diff --git a/modules/audio/pulseeffects.service.nix b/modules/audio/pulseeffects.service.nix
deleted file mode 100644
index 632fbb54..00000000
--- a/modules/audio/pulseeffects.service.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-pkgs:
-{
-  Service = {
-    Type = "dbus";
-    BusName = "com.github.wwmm.pulseeffects";
-    ExecStart = "${pkgs.pulseeffects-pw}/bin/pulseeffects --gapplication-service";
-  };
-}