diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
new file mode 100644
index 0000000..a108220
--- /dev/null
+++ b/.config/mpd/mpd.conf
@@ -0,0 +1,26 @@
+# Read the user manual for documentation: http://www.musicpd.org/doc/user/
+
+playlist_directory		"~/.mpd/playlists"
+db_file			"~/.mpd/database"
+state_file			"~/.mpd/state"
+sticker_file			"~/.mpd/sticker.sql"
+
+log_file		"syslog"
+
+bind_to_address		"~/.mpd/socket"
+restore_paused "yes"
+save_absolute_paths_in_playlists	"yes"
+#
+# This setting defines a list of tag types that will be extracted during the
+# audio file discovery process. The complete list of possible values can be
+# found in the user manual.
+#metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
+
+audio_output {
+	type		"pulse"
+	name		"My Pulse Output"
+}
+
+
+replaygain			"auto"
+#volume_normalization		"no"
diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config
new file mode 100644
index 0000000..2086886
--- /dev/null
+++ b/.config/ncmpcpp/config
@@ -0,0 +1,2 @@
+mpd_host = /home/diablo/.mpd/socket
+media_library_primary_tag = album_artist
diff --git a/.config/river/init b/.config/river/init
index 5bc9b81..5b8ca47 100755
--- a/.config/river/init
+++ b/.config/river/init
@@ -14,6 +14,7 @@ riverctl spawn "syncthing -no-browser"
 riverctl spawn "river-tag-overlay"
 # yambar spawned by load-colors
 riverctl spawn "kanshi"
+riverctl spawn "start-mpd"
 
 riverctl spawn 'swayidle -w \
     timeout 250 "brillo -O; brillo -S 5" resume "brillo -I" \
diff --git a/.local/bin/start-mpd b/.local/bin/start-mpd
new file mode 100755
index 0000000..8d27239
--- /dev/null
+++ b/.local/bin/start-mpd
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mkdir -p ~/.mpd
+mkdir -p ~/.mpd/playlists
+
+mpd