diff --git a/modules/media/default.nix b/modules/media/default.nix
index f5aae6a2..5bd5e790 100644
--- a/modules/media/default.nix
+++ b/modules/media/default.nix
@@ -2,5 +2,6 @@
   imports = [
     ./mpd
     ./ncmpcpp
+    ./mopidy
   ];
 }
diff --git a/modules/media/mopidy/default.nix b/modules/media/mopidy/default.nix
new file mode 100644
index 00000000..d479e818
--- /dev/null
+++ b/modules/media/mopidy/default.nix
@@ -0,0 +1,28 @@
+{
+  outputs,
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib; let
+  cfg = config.modules.media.mopidy;
+in {
+  options.modules.media.mopidy = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+    services.mopidy = {
+      enable = true;
+      extensionPackages = [pkgs.mopidy-mpd pkgs.mopidy-jellyfin];
+      configuration = ''
+        [jellyfin]
+        hostname = https://jellyfin.sako.box
+        username = sako
+        password =
+      '';
+    };
+  };
+}
diff --git a/modules/media/mopidy/default.nix~ b/modules/media/mopidy/default.nix~
new file mode 100644
index 00000000..e69de29b