From f68a00caca20cbc1a96a9a2add59c2037dd29f5a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 27 Nov 2021 18:28:37 +0100
Subject: yt-dlp: ...

---
 user-profiles/mpv/default.nix | 9 ---------
 user-profiles/yt-dlp.nix      | 7 +++----
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'user-profiles')

diff --git a/user-profiles/mpv/default.nix b/user-profiles/mpv/default.nix
index 642eb004..5c4012cb 100644
--- a/user-profiles/mpv/default.nix
+++ b/user-profiles/mpv/default.nix
@@ -7,15 +7,6 @@
     };
     config = {
       ytdl = true;
-      ytdl-format = lib.concatStringsSep "/" [
-        "bestvideo[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]"
-        "best[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]"
-        "best[protocol!=http_dash_segments]"
-      ];
-      ytdl-raw-options = lib.concatStringsSep "," [
-        "netrc="
-        "mark-watched="
-      ];
       sub = false;
       osd-font = "DejaVu Sans";
       vo = "gpu";
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix
index 946fd8d0..67b6adcb 100644
--- a/user-profiles/yt-dlp.nix
+++ b/user-profiles/yt-dlp.nix
@@ -6,12 +6,11 @@
       --netrc
       --mark-watched
       --format ${lib.concatStringsSep "/" [
-        "bestvideo[width<=1920][height<=1080][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]"
-        "best[width<=1920][height<=1080][fps<=60][protocol!=http_dash_segments]"
-        # "bestvideo[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]"
-        # "best[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]"
+        "bestvideo[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]"
+        "best[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]"
         "best[protocol!=http_dash_segments]"
       ]}
+      --sub-langs all,-live_chat
     '';
   };
 }
-- 
cgit v1.2.3