From 32e28379e2977debf31e054a952a713278548e70 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sat, 26 Jul 2025 01:14:17 +0100
Subject: [PATCH] Move pipewire configuration

---
 hosts/lemp11/services.nix          | 12 ------------
 hosts/t480/configuration.nix       |  4 ----
 hosts/t490/services/default.nix    |  1 -
 hosts/t490/services/sound.nix      | 12 ------------
 modules/nixos/default.nix          |  1 -
 modules/nixos/pipewire.nix         | 23 -----------------------
 modules2/sound/pipewire/alsa.nix   |  6 ++++++
 modules2/sound/pipewire/enable.nix |  3 +++
 modules2/sound/pipewire/pulse.nix  |  3 +++
 9 files changed, 12 insertions(+), 53 deletions(-)
 delete mode 100644 hosts/t490/services/sound.nix
 delete mode 100644 modules/nixos/pipewire.nix
 create mode 100644 modules2/sound/pipewire/alsa.nix
 create mode 100644 modules2/sound/pipewire/enable.nix
 create mode 100644 modules2/sound/pipewire/pulse.nix

diff --git a/hosts/lemp11/services.nix b/hosts/lemp11/services.nix
index e1e45889..90c3a9f2 100644
--- a/hosts/lemp11/services.nix
+++ b/hosts/lemp11/services.nix
@@ -4,18 +4,6 @@
     gvfs.enable = true;
     power-profiles-daemon.enable = false;
     thermald.enable = true;
-
-    pipewire = {
-      enable = true;
-
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-
-      pulse.enable = true;
-    };
-
     printing.enable = true;
     pulseaudio.enable = false;
 
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 7a2705b7..880ac0a2 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -26,10 +26,6 @@
       ];
     };
 
-    core = {
-      pipewire.enable = true;
-    };
-
     desktop = {
       dconf.enable = true;
       dwm.enable = true;
diff --git a/hosts/t490/services/default.nix b/hosts/t490/services/default.nix
index ffde7b0c..efbae4cc 100644
--- a/hosts/t490/services/default.nix
+++ b/hosts/t490/services/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./cron.nix
     ./interception-tools.nix
-    ./sound.nix
     ./udev.nix
     ./xserver.nix
   ];
diff --git a/hosts/t490/services/sound.nix b/hosts/t490/services/sound.nix
deleted file mode 100644
index 03ff2376..00000000
--- a/hosts/t490/services/sound.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  services.pipewire = {
-    enable = true;
-
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-
-    pulse.enable = true;
-  };
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 41012cf1..0c2ab44a 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -7,7 +7,6 @@
     ./gnupg.nix
     ./kanata.nix
     ./nixpad
-    ./pipewire.nix
     ./podman.nix
     ./st.nix
   ];
diff --git a/modules/nixos/pipewire.nix b/modules/nixos/pipewire.nix
deleted file mode 100644
index 557846bd..00000000
--- a/modules/nixos/pipewire.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.core.pipewire;
-in
-{
-  options.features.core.pipewire.enable = mkEnableOption "Enable pipewire";
-
-  config = mkIf cfg.enable {
-    services.pipewire = {
-      enable = true;
-
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-
-      pulse.enable = true;
-    };
-  };
-}
diff --git a/modules2/sound/pipewire/alsa.nix b/modules2/sound/pipewire/alsa.nix
new file mode 100644
index 00000000..ad5c1271
--- /dev/null
+++ b/modules2/sound/pipewire/alsa.nix
@@ -0,0 +1,6 @@
+{
+  flake.modules.nixos.pc.services.pipewire.alsa = {
+    enable = true;
+    support32Bit = true;
+  };
+}
diff --git a/modules2/sound/pipewire/enable.nix b/modules2/sound/pipewire/enable.nix
new file mode 100644
index 00000000..3160292b
--- /dev/null
+++ b/modules2/sound/pipewire/enable.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.services.pipewire.enable = true;
+}
diff --git a/modules2/sound/pipewire/pulse.nix b/modules2/sound/pipewire/pulse.nix
new file mode 100644
index 00000000..c3ee1c25
--- /dev/null
+++ b/modules2/sound/pipewire/pulse.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.services.pipewire.pulse.enable = true;
+}