diff --git a/hosts/home-personal.nix b/hosts/home-personal.nix
index eb4cc7d..a848dc5 100644
--- a/hosts/home-personal.nix
+++ b/hosts/home-personal.nix
@@ -35,10 +35,9 @@ inputs.home-manager.lib.homeManagerConfiguration {
       home.homeDirectory = /home/gabe;
       imports = [
         ../roles/home-manager/terminal.nix
+        ../roles/home-manager/music.nix
         ../modules/home-manager/common.nix
         ../modules/home-manager/syncthing.nix
-        ../modules/home-manager/beets.nix
-        ../modules/home-manager/mpd/mpd.nix
         ../modules/home-manager/email.nix
         ../modules/home-manager/terminal/voice.nix
       ];
diff --git a/modules/home-manager/mpd/mpd.nix b/modules/home-manager/mpd.nix
similarity index 100%
rename from modules/home-manager/mpd/mpd.nix
rename to modules/home-manager/mpd.nix
diff --git a/modules/home-manager/mpd/mpdevil-plattenalbum.nix b/modules/home-manager/mpd/mpdevil-plattenalbum.nix
deleted file mode 100644
index f729baa..0000000
--- a/modules/home-manager/mpd/mpdevil-plattenalbum.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  home.packages = with pkgs; [
-    mpdevil
-  ];
-}
diff --git a/roles/home-manager/music.nix b/roles/home-manager/music.nix
new file mode 100644
index 0000000..69a4341
--- /dev/null
+++ b/roles/home-manager/music.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  imports = [
+    ../../modules/home-manager/beets.nix
+    ../../modules/home-manager/mpd.nix
+    ../../modules/home-manager/beets.nix
+  ];
+  home.packages = with pkgs; (lib.mkIf config.host.gui.enable [
+    mpdevil
+  ]);
+}