diff --git a/config/etc/i3/config.nix b/config/etc/i3/config.nix
index 5d6fc18..d0fc5f4 100644
--- a/config/etc/i3/config.nix
+++ b/config/etc/i3/config.nix
@@ -17,7 +17,6 @@
 
   #exec compton -f
   exec ${pkgs.feh}/bin/feh --bg-scale $(xdg-user-dir PICTURES)/wallpaper.jpg
-  #exec pulseaudio -D
   exec fcitx5
   #exec conky -c $HOME/.my_little_conky/.conkyrc
   #exec xsnow -nosanta -norudolf -notrees
diff --git a/machines/Lilim/hardware-configuration.nix b/machines/Lilim/hardware-configuration.nix
index 09e5b28..4634717 100644
--- a/machines/Lilim/hardware-configuration.nix
+++ b/machines/Lilim/hardware-configuration.nix
@@ -129,16 +129,6 @@ in
       ];
     };
 
-    pulseaudio = {
-      enable = true;
-      support32Bit = true;
-      package = pkgs.pulseaudioFull;
-      zeroconf.discovery.enable = false;
-      extraClientConf = ''
-        autospawn = no
-      '';
-    };
-
     bluetooth = {
       enable = true;
       powerOnBoot = true;
diff --git a/services/pipewire.nix b/services/pipewire.nix
index 91d6b58..2ac9e34 100644
--- a/services/pipewire.nix
+++ b/services/pipewire.nix
@@ -2,13 +2,15 @@
 
 lib.mkIf (lib.elem "pipewire" config.machine.services) {
   security.rtkit.enable = true;
-  hardware.pulseaudio.enable = lib.mkForce false;
-  services.pipewire = {
-    enable = true;
-    wireplumber.enable = true;
-    audio.enable = true;
-    alsa.enable = true;
-    pulse.enable = true;
-    jack.enable = true;
+  services = {
+    pulseaudio.enable = false;
+    pipewire = {
+      enable = true;
+      wireplumber.enable = true;
+      audio.enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
   };
 }