hardware/sound: modularize

modules/hardware/default.nix

@@ -4,5 +4,6 @@
 {
   imports = [
     ./nitrokey
+    ./sound
   ];
 }

modules/hardware/sound/default.nix

@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.hardware.sound;
+in
+{
+  options.my.hardware.sound = {
+    enable = lib.mkEnableOption "sound configuration with pipewire";
+  };
+
+  config = lib.mkIf cfg.enable {
+
+    # RealtimeKit is recommended
+    security.rtkit.enable = true;
+
+    services.pipewire = {
+      enable = true;
+
+      alsa = {
+        enable = true;
+        support32Bit = true;
+      };
+
+      pulse.enable = true;
+
+      jack.enable = true;
+    };
+
+    programs.noisetorch.enable = true;
+
+    environment.systemPackages = with pkgs; [
+      noisetorch
+      pavucontrol
+      playerctl
+      pulseaudio # provide pactl to enable keyboard shortcuts
+    ];
+  };
+}

nixos/modules/sound.nix

@@ -1,22 +0,0 @@
-{ config, pkgs, ... }:
-{
-  sound.enable = true;
-
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  # programs.noisetorch.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    # noisetorch
-    pavucontrol
-    playerctl
-    pulseaudio # provide pactl to enable keyboard shortcuts
-  ];
-}

nixos/thinkman/hardware-configuration.nix

@@ -8,5 +8,6 @@
 
   my.hardware = {
     nitrokey.enable = true;
+    sound.enable = true;
   };
 }