diff --git a/hosts/sakotop/configuration.nix b/hosts/sakotop/configuration.nix
index c59e3d86..aad3c505 100644
--- a/hosts/sakotop/configuration.nix
+++ b/hosts/sakotop/configuration.nix
@@ -48,6 +48,10 @@
       };
       zsh.enable = true;
     };
+    media = {
+      mpd.enable = true;
+      ncmpcpp.enable = true;
+    };
   };
 
   # Enable CUPS to print documents.
@@ -72,21 +76,6 @@
     ];
   };
 
-# mpd
-  services.mpd = {
-    enable = true;
-    # pipewire fix
-    user = "sako";
-    musicDirectory = "/home/sako/music";
-    extraConfig = builtins.readFile ../../config/mpd/mpd.conf;
-    startWhenNeeded = true;
-  };
-
-  # systemd fix pipewire
-  systemd.services.mpd.environment = {
-    XDG_RUNTIME_DIR = "/run/user/1000";
-  };
-
   # garbage collection
   nix.gc = {
       automatic = true;
@@ -94,19 +83,6 @@
       options = "--delete-older-than 7d";
   };
 
-
-  home-manager.useUserPackages = true;
-  home-manager.users.sako = { pkgs, ...}: {
-  xdg.configFile = {
-      ncmpcpp = {
-          source = ../../config/ncmpcpp;
-          recursive = true;
-      };
-    };
-  };
-
-  # List services that you want to enable:
-
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
diff --git a/modules/default.nix b/modules/default.nix
index 42792d16..90adbf2c 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -3,4 +3,5 @@
   shell = import ./shell;
   hardware = import ./hardware;
   dev = import ./dev;
+  media = import ./media;
 }