diff --git a/.config/X11/xsession.d/80autostart b/.config/X11/xsession.d/80autostart
index 9e8db82c..92bf6b18 100755
--- a/.config/X11/xsession.d/80autostart
+++ b/.config/X11/xsession.d/80autostart
@@ -6,8 +6,10 @@ start() {
 }
 
 start xwallpaper --zoom "${XDG_DATA_HOME:-$HOME/.local/share}/bg"
+start pipewire
 start remaps -qd
 start checkup
+start playerctld daemon
 start picom --experimental-backends
 start unclutter -noevents
 start dunst
diff --git a/.gitignore b/.gitignore
index 1f938d1e..66f1042f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,27 +7,7 @@
 .local/share/xkb/compiled/default
 .config/nvim/lazy-lock.json
 .config/lazygit/state.yml
-.local/sv/pipewire/supervise/lock
-.local/sv/pipewire/supervise/pid
-.local/sv/pipewire/supervise/stat
-.local/sv/pipewire/supervise/status
-.local/sv/pipewire-pulse/supervise/lock
-.local/sv/pipewire-pulse/supervise/pid
-.local/sv/pipewire-pulse/supervise/stat
-.local/sv/pipewire-pulse/supervise/status
-.local/sv/playerctld/supervise/lock
-.local/sv/playerctld/supervise/pid
-.local/sv/playerctld/supervise/stat
-.local/sv/playerctld/supervise/status
-.local/sv/session-dbus/supervise/lock
-.local/sv/session-dbus/supervise/pid
-.local/sv/session-dbus/supervise/stat
-.local/sv/session-dbus/supervise/status
 .local/sv/syncthing/supervise/lock
 .local/sv/syncthing/supervise/pid
 .local/sv/syncthing/supervise/stat
 .local/sv/syncthing/supervise/status
-.local/sv/wireplumber/supervise/lock
-.local/sv/wireplumber/supervise/pid
-.local/sv/wireplumber/supervise/stat
-.local/sv/wireplumber/supervise/status
diff --git a/.local/sv/pipewire-pulse/run b/.local/sv/pipewire-pulse/run
deleted file mode 100755
index 420cbd68..00000000
--- a/.local/sv/pipewire-pulse/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-
-sv check session-dbus >/dev/null || exit 1
-
-DBUS_SESSION_BUS_ADDRESS="$(cat "$HOME"/.local/state/dbus_session_bus_address)"
-export DBUS_SESSION_BUS_ADDRESS
-
-exec pipewire -c pipewire-pulse.conf
diff --git a/.local/sv/pipewire/run b/.local/sv/pipewire/run
deleted file mode 100755
index 05d9160a..00000000
--- a/.local/sv/pipewire/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-
-sv check session-dbus >/dev/null || exit 1
-
-DBUS_SESSION_BUS_ADDRESS="$(cat "$HOME"/.local/state/dbus_session_bus_address)"
-export DBUS_SESSION_BUS_ADDRESS
-
-exec pipewire
diff --git a/.local/sv/playerctld/run b/.local/sv/playerctld/run
deleted file mode 100755
index ce478215..00000000
--- a/.local/sv/playerctld/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-
-sv check session-dbus >/dev/null || exit 1
-
-DBUS_SESSION_BUS_ADDRESS="$(cat "$HOME"/.local/state/dbus_session_bus_address)"
-export DBUS_SESSION_BUS_ADDRESS
-
-exec playerctld
diff --git a/.local/sv/session-dbus/check b/.local/sv/session-dbus/check
deleted file mode 100755
index 933779d1..00000000
--- a/.local/sv/session-dbus/check
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec dbus-send --bus="$(cat "$HOME"/.local/state/dbus_session_bus_address)" / org.freedesktop.DBus.Peer.Ping >/dev/null 2>&1
diff --git a/.local/sv/session-dbus/run b/.local/sv/session-dbus/run
deleted file mode 100755
index ab675c86..00000000
--- a/.local/sv/session-dbus/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec 3<> "$HOME/.local/state/dbus_session_bus_address"
-
-exec dbus-daemon --session --nofork --nopidfile --print-address=3
diff --git a/.local/sv/wireplumber/run b/.local/sv/wireplumber/run
deleted file mode 100755
index 7343de0a..00000000
--- a/.local/sv/wireplumber/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-
-sv check session-dbus >/dev/null || exit 1
-
-DBUS_SESSION_BUS_ADDRESS="$(cat "$HOME"/.local/state/dbus_session_bus_address)"
-export DBUS_SESSION_BUS_ADDRESS
-
-exec wireplumber