diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index 6151d34..b2daccd 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -4,6 +4,7 @@ ./fan2go.nix ./fancontrol.nix ./sound.nix + ./pipewire.nix ./laptop-power.nix ./nvidia.nix ./amdgpu.nix diff --git a/modules/nixos/common/hardware/pipewire.nix b/modules/nixos/common/hardware/pipewire.nix new file mode 100644 index 0000000..89fb9a1 --- /dev/null +++ b/modules/nixos/common/hardware/pipewire.nix @@ -0,0 +1,26 @@ +{ lib +, config +, ... +}: +let + cfg = config.skyg.nixos.common.hardware.pipewire; +in +{ + options.skyg.nixos.common.hardware.pipewire = with lib; { + enable = mkEnableOption "pipewire"; + }; + + config = lib.mkIf cfg.enable { + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + wireplumber.enable = true; + pulse.enable = true; + systemWide = false; + }; + services.jack = { + alsa.enable = true; + }; + }; +} diff --git a/modules/nixos/common/hardware/sound.nix b/modules/nixos/common/hardware/sound.nix index 972f72b..b816102 100644 --- a/modules/nixos/common/hardware/sound.nix +++ b/modules/nixos/common/hardware/sound.nix @@ -11,16 +11,12 @@ in }; config = lib.mkIf cfg.enable { - # Enable sound with pipewire. hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { - enable = true; alsa.enable = true; alsa.support32Bit = true; jack.enable = true; - pulse.enable = true; - systemWide = false; }; services.jack = { alsa.enable = true;