From 00326bb8b657d4c3fd0eee91fbdcad2e0c4bb1b5 Mon Sep 17 00:00:00 2001
From: Harry Ying <lexugeyky@outlook.com>
Date: Tue, 17 Sep 2024 18:48:10 +0800
Subject: [PATCH] x1c7: switch back to pulseaudio

---
 cfgs/x1c7/services.nix | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/cfgs/x1c7/services.nix b/cfgs/x1c7/services.nix
index 314e9f1..98ab891 100644
--- a/cfgs/x1c7/services.nix
+++ b/cfgs/x1c7/services.nix
@@ -5,7 +5,7 @@
 
   hardware.bluetooth = {
     enable = true;
-    # disabledPlugins = [ "sap" ];
+    disabledPlugins = [ "sap" ];
   };
 
   # Don't suspend if lid is closed with computer on power.
@@ -15,27 +15,20 @@
 
   ### Sound and graphics
 
-  # allow realtime scheduling
-  security.rtkit.enable = true;
-  # Enable PulseAudio
-  services.pipewire = {
+  # This uses pipewire and conflicts with pulseaudio
+  services.gnome.gnome-remote-desktop.enable = false;
+  # Have to additionally disable pipewire: https://github.com/NixOS/nixpkgs/commit/438fd16359cf30090c66d3748727829afa90e814
+  services.pipewire.enable = false;
+  # Configuration of pulseaudio to facilitate bluetooth headphones and Steam.
+  hardware.pulseaudio = {
     enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
+    # 32 bit support for steam.
+    support32Bit = true;
+    # NixOS allows either a lightweight build (default) or full build of PulseAudio to be installed.
+    # Only the full build has Bluetooth support, so it must be selected here.
+    package = pkgs.pulseaudioFull;
   };
 
-  # Configuration of pulseaudio to facilitate bluetooth headphones and Steam.
-  # hardware.pulseaudio = {
-  #   enable = false;
-  #   # 32 bit support for steam.
-  #   support32Bit = true;
-  #   # NixOS allows either a lightweight build (default) or full build of PulseAudio to be installed.
-  #   # Only the full build has Bluetooth support, so it must be selected here.
-  #   package = pkgs.pulseaudioFull;
-  # };
-
   # OpenGL 32 bit support for steam
   hardware.graphics.enable32Bit = true;