From 1c465fd3932ab6b679178f8cd38695356e968f1a Mon Sep 17 00:00:00 2001
From: Ranomier <>
Date: Tue, 15 Apr 2025 18:04:50 +0200
Subject: [PATCH] make audio_video a folder

---
 modules/software/audio_video.nix              | 62 -------------------
 modules/software/audio_video/audio_video.nix  | 30 +++++++++
 modules/software/audio_video/default.nix      |  6 ++
 modules/software/audio_video/noise_cancel.nix | 38 ++++++++++++
 4 files changed, 74 insertions(+), 62 deletions(-)
 delete mode 100644 modules/software/audio_video.nix
 create mode 100644 modules/software/audio_video/audio_video.nix
 create mode 100644 modules/software/audio_video/default.nix
 create mode 100644 modules/software/audio_video/noise_cancel.nix

diff --git a/modules/software/audio_video.nix b/modules/software/audio_video.nix
deleted file mode 100644
index 49df916..0000000
--- a/modules/software/audio_video.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{pkgs, ...}: {
-  # Enable sound with pipewire
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    jack.enable = true;
-    extraConfig.pipewire."99-input-denoise" = {
-      "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 (%)" = 75.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";
-            };
-          };
-        }
-      ];
-    };
-  };
-  environment.systemPackages = with pkgs; [
-    helvum
-    pwvucontrol
-    lxqt.pavucontrol-qt
-
-    qpwgraph
-    easyeffects
-    non
-
-    roc-toolkit
-  ];
-}
diff --git a/modules/software/audio_video/audio_video.nix b/modules/software/audio_video/audio_video.nix
new file mode 100644
index 0000000..e878b5a
--- /dev/null
+++ b/modules/software/audio_video/audio_video.nix
@@ -0,0 +1,30 @@
+{pkgs, ...}: {
+  # Enable sound with pipewire
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+
+  services.pipewire = {
+    enable = true;
+
+    # If you want to use JACK applications, uncomment this
+    jack.enable = true;
+    pulse.enable = true;
+
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    helvum
+    pwvucontrol
+    lxqt.pavucontrol-qt
+
+    qpwgraph
+    easyeffects
+    non
+
+    roc-toolkit
+  ];
+}
diff --git a/modules/software/audio_video/default.nix b/modules/software/audio_video/default.nix
new file mode 100644
index 0000000..2b439c3
--- /dev/null
+++ b/modules/software/audio_video/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./audio_video.nix
+    ./noise_cancel.nix
+  ];
+}
diff --git a/modules/software/audio_video/noise_cancel.nix b/modules/software/audio_video/noise_cancel.nix
new file mode 100644
index 0000000..4dd4386
--- /dev/null
+++ b/modules/software/audio_video/noise_cancel.nix
@@ -0,0 +1,38 @@
+{pkgs, ...}: {
+  services.pipewire.extraConfig.pipewire."99-input-denoise" = {
+    "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 (%)" = 75.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";
+          };
+        };
+      }
+    ];
+  };
+}