Move pipewire configuration

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;
 

hosts/t480/configuration.nix

@@ -26,10 +26,6 @@
       ];
     };
 
-    core = {
-      pipewire.enable = true;
-    };
-
     desktop = {
       dconf.enable = true;
       dwm.enable = true;

hosts/t490/services/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./cron.nix
     ./interception-tools.nix
-    ./sound.nix
     ./udev.nix
     ./xserver.nix
   ];

hosts/t490/services/sound.nix

@@ -1,12 +0,0 @@
-{
-  services.pipewire = {
-    enable = true;
-
-    alsa = {
-      enable = true;
-      support32Bit = true;
-    };
-
-    pulse.enable = true;
-  };
-}

modules/nixos/default.nix

@@ -7,7 +7,6 @@
     ./gnupg.nix
     ./kanata.nix
     ./nixpad
-    ./pipewire.nix
     ./podman.nix
     ./st.nix
   ];

modules/nixos/pipewire.nix

@@ -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;
-    };
-  };
-}

modules2/sound/pipewire/alsa.nix

@@ -0,0 +1,6 @@
+{
+  flake.modules.nixos.pc.services.pipewire.alsa = {
+    enable = true;
+    support32Bit = true;
+  };
+}

modules2/sound/pipewire/enable.nix

@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.services.pipewire.enable = true;
+}

modules2/sound/pipewire/pulse.nix

@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.pc.services.pipewire.pulse.enable = true;
+}