From f463055acf3552c68d88d290626f5f0456bf1b05 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 8 Jan 2022 21:41:30 +0000
Subject: [PATCH] ops/nixos: pipewire for everyone

---
 ops/nixos/lib/graphical-client.nix | 11 ++++++++++-
 ops/nixos/porcorosso/default.nix   | 12 ------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/ops/nixos/lib/graphical-client.nix b/ops/nixos/lib/graphical-client.nix
index 15cc947ce8..3d6f1a7275 100644
--- a/ops/nixos/lib/graphical-client.nix
+++ b/ops/nixos/lib/graphical-client.nix
@@ -21,7 +21,16 @@ in
     services.pcscd.enable = true;
 
     sound.enable = true;
-    hardware.pulseaudio.enable = true;
+    hardware.pulseaudio.enable = false;
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      jack.enable = true;
+      pulse.enable = true;
+
+      media-session.enable = true;
+    };
     security.rtkit.enable = true;
 
     services.dbus.packages = [ depot.nix.pkgs.flameshot ];
diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix
index 9a2255a495..0f94eabcda 100644
--- a/ops/nixos/porcorosso/default.nix
+++ b/ops/nixos/porcorosso/default.nix
@@ -187,18 +187,6 @@ in {
   hardware.acpilight.enable = true;
   hardware.bluetooth.enable = true;
 
-  # TODO(lukegb): finish evaluating pipewire
-  hardware.pulseaudio.enable = lib.mkForce false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    jack.enable = true;
-    pulse.enable = true;
-
-    media-session.enable = true;
-  };
-
   # Define a user account.
   users.users.lukegb = {
     extraGroups = [ "wheel" "networkmanager" "libvirtd" "lxd" "video" ];