4 files changed, 20 insertions, 7 deletions

diff --git a/user-profiles/mpv/default.nix b/user-profiles/mpv/default.nix
index 94f241c8..8cf330e8 100644
--- a/user-profiles/mpv/default.nix
+++ b/user-profiles/mpv/default.nix
@@ -105,7 +105,8 @@
       };
       config = {
         ytdl = true;
-        ytdl-raw-options = "sub-langs=\"${config.programs.yt-dlp.settings.sub-langs}\"";
+        ytdl-format = "ytdl";
+        # ytdl-raw-options = "sub-langs=\"${config.programs.yt-dlp.settings.sub-langs}\"";
         subs-with-matching-audio = false;
         audio-display = false;
         osd-font = "Fira Sans";
diff --git a/user-profiles/tmux/default.nix b/user-profiles/tmux/default.nix
index dc4e791f..7ea0c0d5 100644
--- a/user-profiles/tmux/default.nix
+++ b/user-profiles/tmux/default.nix
@@ -16,8 +16,8 @@
 
         installPhase = ''
           substitute $src $out \
-            --subst-var-by zsh ${config.programs.zsh.package} \
-            --subst-var-by man ${config.programs.man.package}
+            --subst-var-by zsh ${lib.getExe config.programs.zsh.package} \
+            --subst-var-by man ${lib.getExe config.programs.man.package}
         '';
       });
     };
diff --git a/user-profiles/utils.nix b/user-profiles/utils.nix
index da79e336..edf6da11 100644
--- a/user-profiles/utils.nix
+++ b/user-profiles/utils.nix
@@ -46,6 +46,8 @@ in {
       lesspipe.enable = true;
 
       man.enable = true;
+
+      vim.enable = true;
     };
 
     home.sessionVariables = {
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix
index ef0be87e..eefa673f 100644
--- a/user-profiles/yt-dlp.nix
+++ b/user-profiles/yt-dlp.nix
@@ -7,17 +7,26 @@
         cookies-from-browser = "firefox::none";
         mark-watched = true;
         format = lib.concatStringsSep "/" [
+          "bestvideo*[width<=2560][height<=1440][fps<=60][vcodec!*=av01][width>=1920]+bestaudio"
+          "best[width<=2560][height<=1440][fps<=60][vcodec!*=av01][width>=1920]"
+          "bestvideo*[vcodec!*=av01][width>=1920]+bestaudio"
+          "best[vcodec!*=av01][width>=1920]"
+          "bestvideo*[width<=2560][height<=1440][fps<=60][vcodec!*=av01][height>=1080]+bestaudio"
+          "best[width<=2560][height<=1440][fps<=60][vcodec!*=av01][height>=1080]"
+          "bestvideo*[vcodec!*=av01][height>=1080]+bestaudio"
+          "best[vcodec!*=av01][height>=1080]"
           "bestvideo*[width<=2560][height<=1440][fps<=60]+bestaudio"
           "best[width<=2560][height<=1440][fps<=60]"
           "bestvideo*+bestaudio"
           "best"
         ];
-        embed-subs = true;
+        # embed-subs = true;
+        embed-thumbnail = true;
+        embed-metadata = true;
         # write-subs = true;
-        write-auto-subs = true;
-        sub-langs = "en(-(gb|us|orig))?,de(-(de|orig))?,-live_chat,-rechat";
+        # write-auto-subs = true;
+        # sub-langs = "en(-(gb|us|orig))?,de(-(de|orig))?,-live_chat,-rechat";
         prefer-free-formats = true;
-        embed-metadata = true;
         # downloader = "${pkgs.axel}/bin/axel";
         concurrent-fragments = 12;
         buffer-size = "16K";
@@ -29,6 +38,7 @@
         # ];
         remux-video = "mp4>mkv";
         output = lib.mkDefault "\"%(modified_date>%Y%m%d,release_date>%Y%m%d,upload_date>%Y%m%d)s %(title)s [%(uploader)s %(webpage_url)s].%(ext)s\"";
+        audio-multistreams = true;
       };
     };
   };