From d4cd0d51c7560005bb488f3984fc957b722358a9 Mon Sep 17 00:00:00 2001 From: sudacode Date: Thu, 5 Feb 2026 20:52:13 -0800 Subject: [PATCH] Remove yt-dlp sponsorblock options from mpv configs - Remove sponsorblock-mark and sponsorblock-remove from default, WSL, and Darwin configs - Rely on sponsorblock.lua script instead, which handles skipping during playback - The ytdl-raw-options comma parsing was breaking the category list anyway --- .config/mpv/mpv.conf##default | 7 +-- .config/mpv/mpv.conf##os.Darwin | 5 -- .config/mpv/mpv.conf##os.WSL | 5 -- .config/nvim/lua/plugins/none-ls.lua | 75 ++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 15 deletions(-) create mode 100644 .config/nvim/lua/plugins/none-ls.lua diff --git a/.config/mpv/mpv.conf##default b/.config/mpv/mpv.conf##default index 1e99675..c36195d 100644 --- a/.config/mpv/mpv.conf##default +++ b/.config/mpv/mpv.conf##default @@ -37,9 +37,6 @@ audio-wait-open=0.1 # Shorten audio device warm-up for snappier playback # --- Networking & remote sources --- ytdl-format=bestvideo+bestaudio/best ytdl-raw-options=sub-langs=en.*,write-auto-subs= -ytdl-raw-options-append=sponsorblock-mark=all -ytdl-raw-options-append=sponsorblock-remove=sponsor,selfpromo,interaction - # --- Video output & decoding --- vo=gpu-next hwdec=nvdec @@ -111,7 +108,9 @@ demuxer-max-back-bytes=200MiB # Keep recent data handy for quick reverse seeks cache-secs=30 demuxer-readahead-secs=30 +# no, fatal, warn, info, v, debug, trace msg-level=subs2srs,animecards,mpvacious=error +msg-level=mpv-yomitan=warn [anime] profile-desc="Anime upscaling with ArtCNN" @@ -152,8 +151,6 @@ cookies=yes cookies-file=/truenas/sudacode/japanese/cookies.Japanese.txt ytdl-raw-options=mark-watched=,write-auto-subs=,sub-langs=ja.* ytdl-raw-options-append=cookies=/truenas/sudacode/japanese/cookies.Japanese.txt -ytdl-raw-options-append=sponsorblock-mark=all -ytdl-raw-options-append=sponsorblock-remove=sponsor,selfpromo,interaction ytdl-format=bestvideo+bestaudio/best sub-auto=fuzzy alang=ja,jp,jpn,japanese,en,eng,english,English,enUS,en-US diff --git a/.config/mpv/mpv.conf##os.Darwin b/.config/mpv/mpv.conf##os.Darwin index 7e1ca96..a79f219 100644 --- a/.config/mpv/mpv.conf##os.Darwin +++ b/.config/mpv/mpv.conf##os.Darwin @@ -31,9 +31,6 @@ sub-pos=90 # Networking & streaming ytdl-format=bestvideo+bestaudio/best ytdl-raw-options=sub-langs=en.*,write-auto-subs= -ytdl-raw-options-append=sponsorblock-mark=all -ytdl-raw-options-append=sponsorblock-remove=sponsor,selfpromo,interaction - # Stats & UI colors (Catppuccin Macchiato) background-color='#24273a' osd-back-color='#181926' @@ -185,8 +182,6 @@ cookies=yes cookies-file=/Volumes/sudacode/japanese/cookies.Japanese.txt ytdl-raw-options=mark-watched=,write-auto-subs=,sub-langs=ja.* ytdl-raw-options-append=cookies=/Volumes/sudacode/japanese/cookies.Japanese.txt -ytdl-raw-options-append=sponsorblock-mark=all -ytdl-raw-options-append=sponsorblock-remove=sponsor ytdl-format=bestvideo+bestaudio/best sub-auto=fuzzy alang=ja,jp,jpn,japanese,en,eng,english,English,enUS,en-US diff --git a/.config/mpv/mpv.conf##os.WSL b/.config/mpv/mpv.conf##os.WSL index ec1b54a..de945b6 100644 --- a/.config/mpv/mpv.conf##os.WSL +++ b/.config/mpv/mpv.conf##os.WSL @@ -41,9 +41,6 @@ audio-wait-open=0.1 # --- Networking --- ytdl-format=bestvideo+bestaudio/best ytdl-raw-options=sub-langs=en.*,write-auto-subs= -ytdl-raw-options-append=sponsorblock-mark=all -ytdl-raw-options-append=sponsorblock-remove=sponsor,selfpromo,interaction - # --- Video output & decoding --- vo=gpu-next hwdec=nvdec @@ -152,8 +149,6 @@ cookies=yes cookies-file="Z:/sudacode/japanese/cookies.Japanese.txt" ytdl-raw-options=mark-watched=,write-auto-subs=,sub-langs=ja.* ytdl-raw-options-append=cookies=Z:/sudacode/japanese/cookies.Japanese.txt -ytdl-raw-options-append=sponsorblock-mark=all -ytdl-raw-options-append=sponsorblock-remove=sponsor,selfpromo,interaction sub-auto=fuzzy alang=ja,jp,jpn,japanese,en,eng,english slang=ja,jp,jpn,japanese,en,eng,english diff --git a/.config/nvim/lua/plugins/none-ls.lua b/.config/nvim/lua/plugins/none-ls.lua new file mode 100644 index 0000000..74038c5 --- /dev/null +++ b/.config/nvim/lua/plugins/none-ls.lua @@ -0,0 +1,75 @@ +return { + "nvimtools/none-ls.nvim", + config = function() + local null_ls = require("null-ls") + local helpers = require("null-ls.helpers") + -- syncronous formatting + local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) + + local sources = { + null_ls.builtins.completion.luasnip, + -- null_ls.builtins.diagnostics.mypy, + null_ls.builtins.diagnostics.pydoclint, + null_ls.builtins.diagnostics.markdownlint, + null_ls.builtins.formatting.black, + null_ls.builtins.formatting.isort, + null_ls.builtins.formatting.stylua, + null_ls.builtins.formatting.markdownlint, + null_ls.builtins.formatting.prettier, -- handled by lsp server + null_ls.builtins.formatting.shfmt.with({ + filetypes = { "sh", "bash" }, + extra_args = { "-i", "0", "-ci", "-sr" }, + }), + null_ls.builtins.formatting.gofmt, + null_ls.builtins.formatting.goimports, + null_ls.builtins.formatting.goimports_reviser, + null_ls.builtins.hover.printenv, + } + + require("null-ls").setup({ + border = "rounded", + cmd = { "nvim" }, + debounce = 250, + debug = false, + default_timeout = 5000, + diagnostic_config = { + virtual_text = false, + signs = true, + underline = true, + float = { border = "rounded", source = true }, + severity_sort = true, + }, + -- diagnostics_format = "#{m}", + diagnostics_format = "[#{c}] #{m} (#{s})", + fallback_severity = vim.diagnostic.severity.ERROR, + log_level = "warn", + notify_format = "[null-ls] %s", + on_init = nil, + on_exit = nil, + root_dir = require("null-ls.utils").root_pattern(".null-ls-root", "Makefile", ".git"), + root_dir_async = nil, + should_attach = nil, + sources = sources, + temp_dir = nil, + update_in_insert = false, + on_attach = function(client, bufnr) + if client.supports_method("textDocument/formatting") then + vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) + vim.api.nvim_create_autocmd("BufWritePre", { + group = augroup, + buffer = bufnr, + callback = function() + vim.lsp.buf.format({ + async = false, + bufnr = bufnr, + filter = function(client) + return client.name == "null-ls" + end, + }) + end, + }) + end + end, + }) + end, +}