diff --git a/flake.lock b/flake.lock
index eb3116e..9fbfebe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -185,6 +185,25 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-mopidy": {
+      "flake": false,
+      "info": {
+        "lastModified": 1579858055,
+        "narHash": "sha256-cbaNod+gStC32dcF15rUSsAWUa5ODXQhv0drnUpUz8I="
+      },
+      "locked": {
+        "owner": "NickHU",
+        "repo": "nixpkgs",
+        "rev": "fde5fd4beb6398e59bb639c003c6841dc2fa8579",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NickHU",
+        "ref": "mopidy",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-old": {
       "flake": false,
       "info": {
@@ -299,6 +318,7 @@
         "nheko": "nheko",
         "nix": "nix",
         "nixpkgs": "nixpkgs_4",
+        "nixpkgs-mopidy": "nixpkgs-mopidy",
         "nixpkgs-old": "nixpkgs-old",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
diff --git a/flake.nix b/flake.nix
index 9c38973..0f04930 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,13 @@
   edition = 201909;
 
   inputs = {
+    nixpkgs-mopidy = {
+      type = "github";
+      owner = "NickHU";
+      repo = "nixpkgs";
+      ref = "mopidy";
+      flake = false;
+    };
     NUR = {
       type = "github";
       owner = "nix-community";
diff --git a/modules/packages.nix b/modules/packages.nix
index a64e628..d7a3428 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -105,6 +105,12 @@ in {
         grub2 = super.pkgsi686Linux.grub2;
       } else
         { }))
+    (self: super: builtins.mapAttrs (_: v: pkgs.callPackage v.override { }) {
+      inherit (import inputs.nixpkgs-mopidy {
+        localSystem.system = "x86_64-linux";
+      })
+        mopidy mopidy-gmusic mopidy-mpd mopidy-mpris mopidy-youtube;
+    })
   ];
   nixpkgs.config = {
     allowUnfree = true;
diff --git a/modules/workspace/mopidy.nix b/modules/workspace/mopidy.nix
index 14bd44e..ff82347 100644
--- a/modules/workspace/mopidy.nix
+++ b/modules/workspace/mopidy.nix
@@ -2,7 +2,7 @@
 {
   services.mopidy = {
     enable = true;
-    extensionPackages = with pkgs; [ mopidy-mpd mopidy-gmusic mopidy-youtube ];
+    extensionPackages = with pkgs; [ mopidy-mpd mopidy-gmusic ];
     configuration = (if (!isNull config.secrets.gpmusic) then ''
       [gmusic]
       username = ${config.secrets.gpmusic.user}