diff --git a/extra/bluetooth-audio.nix b/extra/bluetooth-audio.nix
index 0c9540d..deac344 100644
--- a/extra/bluetooth-audio.nix
+++ b/extra/bluetooth-audio.nix
@@ -10,10 +10,10 @@
       };
     };
   };
-  hardware.pulseaudio = {
-    enable = true;
-    extraModules = [ pkgs.pulseaudio-modules-bt ];
-    package = pkgs.pulseaudioFull;
-  };
+  #hardware.pulseaudio = {
+  #  enable = true;
+  #  extraModules = [ pkgs.pulseaudio-modules-bt ];
+  #  package = pkgs.pulseaudioFull;
+  #};
   services.blueman.enable = true;
 }
diff --git a/extra/sound.nix b/extra/sound.nix
index ff2f784..2f0d4dc 100644
--- a/extra/sound.nix
+++ b/extra/sound.nix
@@ -2,10 +2,22 @@
 
 {
   sound.enable = true;
-  hardware.pulseaudio.enable = true;
+  #hardware.pulseaudio.enable = true;
+
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    #jack.enable = true;
+  };
+
   environment.systemPackages = with pkgs; [
     noisetorch
     pavucontrol
     playerctl
+    pulseaudio # provide pactl to enable keyboard shortcuts
   ];
 }