From 7959abe5f080348f2d18445be4187dafdd590227 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 10 Jul 2021 12:44:09 +0200
Subject: [PATCH] pipewire: Init and replace pulseaudio

---
 modules/default.nix    |  2 +-
 modules/pipewire.nix   | 24 ++++++++++++++++++++++++
 modules/pulseaudio.nix | 29 -----------------------------
 3 files changed, 25 insertions(+), 30 deletions(-)
 create mode 100644 modules/pipewire.nix
 delete mode 100644 modules/pulseaudio.nix

diff --git a/modules/default.nix b/modules/default.nix
index 90a00d8..abaa67c 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -37,7 +37,7 @@
     ./office.nix
     ./prometheus/node_exporter.nix
     ./pubkeys.nix
-    ./pulseaudio.nix
+    ./pipewire.nix
     ./restic
     ./secrets.nix
     ./ssh.nix
diff --git a/modules/pipewire.nix b/modules/pipewire.nix
new file mode 100644
index 0000000..ac41d53
--- /dev/null
+++ b/modules/pipewire.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+let
+  bluetoothSupport = config.sbruder.full;
+in
+lib.mkIf config.sbruder.gui.enable {
+  sound.enable = true;
+  services.pipewire = {
+    enable = true;
+
+    pulse.enable = true;
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
+  };
+
+  environment.systemPackages = with pkgs; [
+    pavucontrol
+    pulseaudio # pacmd and pactl
+  ];
+
+  hardware.bluetooth.enable = lib.mkDefault bluetoothSupport;
+  services.blueman.enable = lib.mkDefault bluetoothSupport;
+}
diff --git a/modules/pulseaudio.nix b/modules/pulseaudio.nix
deleted file mode 100644
index ff4b5c8..0000000
--- a/modules/pulseaudio.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  bluetoothSupport = config.sbruder.full;
-in
-lib.mkIf config.sbruder.gui.enable {
-  sound.enable = true;
-  hardware.pulseaudio = {
-    enable = true;
-    daemon.config = {
-      "default-sample-format" = "s16le";
-      "default-sample-rate" = "48000";
-      "alternate-sample-rate" = "44100";
-      "resample-method" = "soxr-hq";
-      "flat-volumes" = "no";
-    };
-  } // lib.optionalAttrs bluetoothSupport {
-    package = pkgs.pulseaudioFull;
-    extraModules = [
-      pkgs.pulseaudio-modules-bt # Non-standard codecs for bluetooth
-    ];
-  };
-
-  environment.systemPackages = with pkgs; [
-    pavucontrol
-  ];
-
-  hardware.bluetooth.enable = lib.mkDefault bluetoothSupport;
-  services.blueman.enable = lib.mkDefault bluetoothSupport;
-}