diff --git a/modules/services/mpd.nix b/modules/home/mpd.nix
similarity index 78%
rename from modules/services/mpd.nix
rename to modules/home/mpd.nix
index 232ef62..137183d 100644
--- a/modules/services/mpd.nix
+++ b/modules/home/mpd.nix
@@ -5,10 +5,19 @@
   ...
 }:
 {
+  home.packages = with pkgs; [
+    mpc
+    mpdris2
+    ncmpcpp
+  ];
+
   services.mpd = {
     enable = true;
-    musicDirectory = "/home/liv/Music";
+    musicDirectory = "/home/${username}/Music";
+    playlistDirectory = "/home/${username}/Music/.playlists";
     extraConfig = ''
+      restore_paused "yes"
+      auto_update "yes"
       audio_output {
         type "pipewire"
       	name "pipewire"
@@ -23,9 +32,4 @@
     # see: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609
     XDG_RUNTIME_DIR = "/run/user/${toString config.users.users.${username}.uid}"; # User-id must match above user. MPD will look inside this directory for the PipeWire socket.
   };
-
-  environment.systemPackages = with pkgs; [
-    mpdris2
-    ncmpcpp
-  ];
 }