From c755579395a47d25e747ab361d23c760b5079815 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 16 Jun 2022 23:22:21 +0200 Subject: audio: switch to pipewire --- system/settings/gaming.nix | 1 + system/settings/hardware/audio.nix | 15 +++++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/system/settings/gaming.nix b/system/settings/gaming.nix index e7a115da..69fba05e 100644 --- a/system/settings/gaming.nix +++ b/system/settings/gaming.nix @@ -5,6 +5,7 @@ hardware.steam-hardware.enable = true; hardware.opengl.driSupport32Bit = true; hardware.pulseaudio.support32Bit = true; + services.pipewire.alsa.support32Bit = true; systemd = { extraConfig = '' diff --git a/system/settings/hardware/audio.nix b/system/settings/hardware/audio.nix index b66f9d04..036fb37d 100644 --- a/system/settings/hardware/audio.nix +++ b/system/settings/hardware/audio.nix @@ -1,21 +1,16 @@ { config, pkgs, ... }: -{ hardware.pulseaudio = { +{ services.pipewire = { enable = true; - support32Bit = true; - daemon.config = { - flat-volumes = "no"; - avoid-resampling = "yes"; - }; - package = if config.hardware.bluetooth.enable - then pkgs.pulseaudioFull - else pkgs.pulseaudio; + audio.enable = true; + alsa.enable = true; + pulse.enable = true; }; sound.enable = true; environment.systemPackages = with pkgs; [ pamixer - pavucontrol + pipecontrol ]; } -- cgit 1.4.1