From f9bcec74d36068004caa646c377c9296bd2bb98a Mon Sep 17 00:00:00 2001
From: John Ogle <john@ogle.fyi>
Date: Sun, 16 Feb 2025 20:43:25 -0800
Subject: [PATCH] Revert "[audio] Setup squeezelite"

This reverts commit 1d0b3a0367cb560e4e254be5621aa21384b8821c.
---
 roles/audio/default.nix | 46 ++++++++++++++---------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/roles/audio/default.nix b/roles/audio/default.nix
index 3a5a755..68020c7 100644
--- a/roles/audio/default.nix
+++ b/roles/audio/default.nix
@@ -8,36 +8,9 @@ in
 {
   options.roles.audio = {
     enable = mkEnableOption "Enable the audio role";
-    pulseAudio = mkOption { type = types.bool; default = false; description = "Use PulseAudio exclusively instead of Pipewire"; };
   };
 
-  config = mkIf cfg.enable (mkMerge [
-    (mkIf cfg.pulseAudio {
-      services.pipewire.enable = false;
-      services.pulseaudio = {
-        enable = true;
-        package = pkgs.pulseaudioFull;
-        systemWide = true;
-        extraConfig = ''
-          load-module module-combine-sink
-          load-module module-switch-on-connect
-        '';
-      };
-      nixpkgs.config.pulseaudio = true;
-    })
-    (mkIf (!cfg.pulseAudio) {
-      services.pipewire = {
-        enable = true;
-        systemWide = true;
-        audio.enable = true;
-        pulse.enable = true;
-        alsa = {
-          enable = true;
-          support32Bit = true;
-        };
-        jack.enable = true;
-      };
-    })
+  config = mkIf cfg.enable
     {
       environment.systemPackages = with pkgs; [
         paprefs
@@ -45,10 +18,23 @@ in
         pulsemixer
       ];
 
+      services.pipewire = {
+        enable = true;
+        pulse.enable = true;
+      };
+
+      services.pulseaudio = {
+        package = pkgs.pulseaudioFull;
+        extraConfig = ''
+          load-module module-combine-sink
+          load-module module-switch-on-connect
+        '';
+      };
+
       services.squeezelite = {
         #enable = true;
         pulseAudio = true;
       };
-    }
-  ]);
+    };
+
 }