3 files changed, 60 insertions, 37 deletions
diff --git a/modules/by-name/mp/mpd/module.nix b/modules/by-name/mp/mpd/module.nix
index 37c648c6..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;
         };
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
     ];
   };
 }
diff --git a/modules/by-name/mp/mpv/module.nix b/modules/by-name/mp/mpv/module.nix
index 4416b295..496dcd47 100644
--- a/modules/by-name/mp/mpv/module.nix
+++ b/modules/by-name/mp/mpv/module.nix
@@ -19,36 +19,46 @@ in {
     enable = lib.mkEnableOption "mpv";
   };
 
-  config.home-manager.users.soispha = lib.mkIf cfg.enable {
-    programs.mpv = {
-      enable = true;
+  config = lib.mkIf cfg.enable {
+    soispha.services.unison.pathsToSync = [
+      "~/.local/state/mpv"
+    ];
 
-      bindings = {
-        q = "quit 0";
-        "Ctrl+c" = "quit 1";
-        "Shift+q" = "quit-watch-later 1";
-      };
-      config = {
-        osd-bar = true;
+    home-manager.users.soispha = {
+      programs.mpv = {
+        enable = true;
 
-        border = false;
-      };
-      scriptOpts = {
-        osc = {
-          scalewindowed = 0.8;
-          hidetimeout = 300;
+        package = pkgs.mpv.override {
+          mpv-unwrapped = pkgs.mpv-unwrapped.override {
+            ffmpeg = pkgs.ffmpeg-headless;
+          };
+        };
+
+        bindings = {
+          q = "quit 0";
+          "Ctrl+c" = "quit 1";
+          "Shift+q" = "quit-watch-later 1";
+        };
+
+        config = {
+          osd-bar = true;
+
+          border = false;
         };
-        thumbfast = {
-          hwdec = true;
-          network = false;
-          spawn_first = false;
-          max_height = 250;
-          max_width = 250;
+        scriptOpts = {
+          osc = {
+            scalewindowed = 0.8;
+            hidetimeout = 300;
+          };
+          thumbfast = {
+            hwdec = true;
+            network = false;
+            spawn_first = false;
+            max_height = 250;
+            max_width = 250;
+          };
         };
       };
-      scripts = [
-        pkgs.mpvScripts.thumbfast
-      ];
     };
   };
 }