2 files changed, 28 insertions, 12 deletions
diff --git a/modules/by-name/mp/mpd/module.nix b/modules/by-name/mp/mpd/module.nix
index b7c7ab5a..474d81c4 100644
--- a/modules/by-name/mp/mpd/module.nix
+++ b/modules/by-name/mp/mpd/module.nix
@@ -62,6 +62,11 @@ in {
 
       services.mpd = {
         enable = true;
+
+        package = pkgs.mpd.override {
+          ffmpeg = pkgs.ffmpeg-headless;
+        };
+
         network = {
           listenAddress = socketPath;
         };
@@ -71,6 +76,7 @@ in {
 
         extraConfig = ''
           metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc,comment"
+
           # Updated by the beets `mpdupdate` plugin
           auto_update "no"
 
@@ -82,6 +88,8 @@ in {
           replaygain "track"
           replaygain_limit "yes"
 
+          sticker_file "${cfg.directories.data}/sticker.sql"
+
           #database {
           #       plugin "simple"
           #       path "~/.local/share/mpd/db
diff --git a/modules/by-name/mp/mpd/mpc.nix b/modules/by-name/mp/mpd/mpc.nix
index cd4a4ec0..5fbeddc5 100644
--- a/modules/by-name/mp/mpd/mpc.nix
+++ b/modules/by-name/mp/mpd/mpc.nix
@@ -14,10 +14,28 @@
   ...
 }: let
   cfg = config.soispha.services.mpd.mpc;
+
+  mpp = pkgs.mpp.override {
+    # Removes the currently playing song from the disk and storage
+    mpp-beetrm = pkgs.mpp-beetrm.override {
+      beets = cfg.beetsPkg;
+    };
+
+    # Works like normal `mpc searchadd` but uses the `beets` query syntax
+    mpp-searchadd = pkgs.mpp-searchadd.override {
+      beets = cfg.beetsPkg;
+    };
+  };
 in {
   options.soispha.services.mpd.mpc = {
     enable = lib.mkEnableOption "mpc with extensions";
 
+    mppPackage = lib.mkOption {
+      type = lib.types.package;
+      description = "The package to use, when calling `mpp`";
+      default = mpp;
+    };
+
     beetsPkg = lib.mkOption {
       type = lib.types.package;
       description = "The package to use, when calling `beet`";
@@ -26,18 +44,8 @@ in {
 
   config = lib.mkIf cfg.enable {
     home-manager.users.soispha.home.packages = [
-      pkgs.mpp # Wrapper around `mpc` that allows the usage of `mpc-{beetsrm,lyrics,searchadd}` (below) without the `-`
-
-      # Removes the currently playing song from the disk and storage
-      (pkgs.mpp-beetrm.override {
-        beets = cfg.beetsPkg;
-      })
-      # Works like normal `mpc searchadd` but uses the `beets` query syntax
-      (pkgs.mpp-searchadd.override {
-        beets = cfg.beetsPkg;
-      })
-      # Displays the lyrics of the currently playing song
-      pkgs.mpp-lyrics
+      # Wrapper around `mpc` that allows the usage of `mpc-{beetsrm,lyrics,searchadd}`
+      cfg.mppPackage
     ];
   };
 }