From f00e6bda8ecd4646b7b117f3faa14159c0267e2d Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Thu, 3 Feb 2022 19:38:54 +0000
Subject: [PATCH] Don't try to install a system mpv

---
 home/mpv.nix      | 9 ++++++++-
 sets/packages.nix | 4 ----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/home/mpv.nix b/home/mpv.nix
index 2561e10..c805b04 100644
--- a/home/mpv.nix
+++ b/home/mpv.nix
@@ -1,5 +1,12 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
+let
+  ffmpeg = pkgs.ffmpeg-full.override { nonfreeLicensing = true; fdkaacExtlib = true; };
+  scripts = with pkgs.mpvScripts; [ sponsorblock ];
+  mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { inherit ffmpeg; }) { inherit scripts; };
+in
+
 {
+  home.packages = [ ffmpeg ];
   programs.mpv = {
     enable = true;
     config = {
diff --git a/sets/packages.nix b/sets/packages.nix
index 41e0bf0..7e9a92f 100644
--- a/sets/packages.nix
+++ b/sets/packages.nix
@@ -1,18 +1,14 @@
 { config, pkgs, lib, ... }:
 let
   llvm = pkgs.llvmPackages_12;
-  ffmpeg-nonfree = pkgs.ffmpeg-full.override { nonfreeLicensing = true; fdkaacExtlib = true; };
-  mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { ffmpeg = ffmpeg-nonfree; }) { };
 in
 {
   environment.systemPackages = (with pkgs; [
     # Audiovisual
     darktable
     exiftool
-    ffmpeg-nonfree
     flac
     lame
-    mpv
     opusTools
     pavucontrol
     youtubeDL