From 22fadf3a89d199a83cdaf8ce5b4366aee9a4f640 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sat, 28 May 2022 02:14:50 -0400 Subject: [PATCH] refactor(audio): replace pulseaudio with pipewire --- modules/modules/hardware/audio.nix | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/modules/modules/hardware/audio.nix b/modules/modules/hardware/audio.nix index 65b4b3e..06acbb3 100644 --- a/modules/modules/hardware/audio.nix +++ b/modules/modules/hardware/audio.nix @@ -12,7 +12,6 @@ in }; config = mkIf cfg.enable { - hardware.pulseaudio.enable = true; sound = { enable = true; mediaKeys = { @@ -21,21 +20,11 @@ in }; }; - # HACK Prevents ~/.esd_auth files by disabling the esound protocol module - # for pulseaudio, which I likely don't need. Is there a better way? - hardware.pulseaudio.configFile = - let inherit (pkgs) runCommand pulseaudio; - paConfigFile = - runCommand "disablePulseaudioEsoundModule" - { buildInputs = [ pulseaudio ]; } '' - mkdir "$out" - cp ${pulseaudio}/etc/pulse/default.pa "$out/default.pa" - sed -i -e 's|load-module module-esound-protocol-unix|# ...|' "$out/default.pa" - ''; - in - mkIf config.hardware.pulseaudio.enable - "${paConfigFile}/default.pa"; - - user.extraGroups = [ "audio" ]; + services.pipewire = { + enable = true; + wireplumber.enable = true; + pulse.enable = true; + alsa.enable = true; + }; }; }