From 8ed3171affa45fc8fba4fba63b697c5ef622ae90 Mon Sep 17 00:00:00 2001 From: karitham Date: Mon, 27 Apr 2026 09:36:48 +0200 Subject: [PATCH] rnnoise fixes following mou's code --- modules/desktop/audio/default.nix | 7 +---- modules/desktop/audio/rnnoise.nix | 46 ------------------------------- modules/desktop/sound.nix | 40 ++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 53 deletions(-) delete mode 100644 modules/desktop/audio/rnnoise.nix diff --git a/modules/desktop/audio/default.nix b/modules/desktop/audio/default.nix index 90e9a78..c8e837d 100644 --- a/modules/desktop/audio/default.nix +++ b/modules/desktop/audio/default.nix @@ -1,6 +1 @@ -{ - imports = [ - ./easyeffects.nix - ./rnnoise.nix - ]; -} +{ imports = [ ./easyeffects.nix ]; } diff --git a/modules/desktop/audio/rnnoise.nix b/modules/desktop/audio/rnnoise.nix deleted file mode 100644 index c752c0a..0000000 --- a/modules/desktop/audio/rnnoise.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - osConfig, - lib, - pkgs, - ... -}: -{ - config = lib.mkIf osConfig.desktop.audio.enable { - xdg.configFile."pipewire/pipewire.conf.d/99-input-denoising.conf".text = builtins.toJSON { - "context.modules" = [ - { - "name" = "libpipewire-module-filter-chain"; - "args" = { - "node.description" = "Noise Canceling source"; - "media.name" = "Noise Canceling source"; - "filter.graph" = { - "nodes" = [ - { - "type" = "ladspa"; - "name" = "rnnoise"; - "plugin" = "${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; - "label" = "noise_suppressor_stereo"; - "control" = { - "VAD Threshold (%)" = 30.0; - }; - } - ]; - }; - "audio.position" = [ - "FL" - "FR" - ]; - "capture.props" = { - "node.name" = "effect_input.rnnoise"; - "node.passive" = true; - }; - "playback.props" = { - "node.name" = "effect_output.rnnoise"; - "media.class" = "Audio/Source"; - }; - }; - } - ]; - }; - }; -} diff --git a/modules/desktop/sound.nix b/modules/desktop/sound.nix index 90d7622..f2fc2b1 100644 --- a/modules/desktop/sound.nix +++ b/modules/desktop/sound.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + pkgs, + ... +}: { config = lib.mkIf config.desktop.enable { services = { @@ -9,6 +14,39 @@ alsa.support32Bit = true; pulse.enable = true; wireplumber.enable = true; + extraLadspaPackages = [ pkgs.rnnoise-plugin ]; + extraConfig.pipewire."99-rnnoise" = { + "context.modules" = [ + { + "name" = "libpipewire-module-filter-chain"; + "args" = { + "node.description" = "RNNoise Source"; + "media.name" = "RNNoise Source"; + "filter.graph" = { + "nodes" = [ + { + "type" = "ladspa"; + "name" = "rnnoise"; + "plugin" = "librnnoise_ladspa"; + "label" = "noise_suppressor_mono"; + "control" = { + "VAD Threshold (%)" = 20.0; + }; + } + ]; + }; + "capture.props" = { + "node.name" = "capture.rnnoise_source"; + "node.passive" = true; + }; + "playback.props" = { + "node.name" = "rnnoise_source"; + "media.class" = "Audio/Source"; + }; + }; + } + ]; + }; }; }; }; -- knotmirror 0.0.1