summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2022-06-16 23:22:21 +0200
committerAlan Pearce2022-06-16 23:22:21 +0200
commitc755579395a47d25e747ab361d23c760b5079815 (patch)
treebdb6820a7c074cdcf4bb74c94ccf52fea7bfe68b
parenta846de8177cae01322f5f3af81e9ef64ecc963ba (diff)
downloadnixfiles-c755579395a47d25e747ab361d23c760b5079815.tar.lz
nixfiles-c755579395a47d25e747ab361d23c760b5079815.tar.zst
nixfiles-c755579395a47d25e747ab361d23c760b5079815.zip
audio: switch to pipewire
-rw-r--r--system/settings/gaming.nix1
-rw-r--r--system/settings/hardware/audio.nix15
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
   ];
 }