From 51abc532525e486176f9a7b24b17908c60017b54 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Fri, 6 Feb 2026 13:43:54 +0100 Subject: [PATCH] treewide: Fix occurences of ill-defined escapes --- plugins/by-name/dap/dapHelpers.nix | 6 +++--- plugins/by-name/lightline/default.nix | 4 ++-- plugins/by-name/markdown-preview/default.nix | 4 ++-- plugins/by-name/otter/default.nix | 2 +- plugins/by-name/rainbow/default.nix | 2 +- plugins/by-name/todo-comments/default.nix | 4 ++-- plugins/by-name/trim/default.nix | 2 +- plugins/by-name/vim-matchup/default.nix | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/by-name/dap/dapHelpers.nix b/plugins/by-name/dap/dapHelpers.nix index 1f3d7ad6..8bbd505b 100644 --- a/plugins/by-name/dap/dapHelpers.nix +++ b/plugins/by-name/dap/dapHelpers.nix @@ -55,9 +55,9 @@ rec { serverAdapterOption = mkAdapterType { host = lib.nixvim.defaultNullOpts.mkStr "127.0.0.1" "Host to connect to."; - port = mkNullOrOption (types.either types.int (types.enum [ "$\{port}" ])) '' + port = mkNullOrOption (types.either types.int (types.enum [ "\${port}" ])) '' Port to connect to. - If "$\{port}" dap resolves a free port. + If "$${port}" dap resolves a free port. This is intended to be used with `executable.args`. ''; @@ -78,7 +78,7 @@ rec { }; pipeAdapterOption = mkAdapterType { - pipe = lib.nixvim.defaultNullOpts.mkStr "$\{pipe}" "Pipe name."; + pipe = lib.nixvim.defaultNullOpts.mkStr "\${pipe}" "Pipe name."; executable = { command = mkNullOrOption types.str "Command that spawns the adapter."; diff --git a/plugins/by-name/lightline/default.nix b/plugins/by-name/lightline/default.nix index 154737e0..24245a86 100644 --- a/plugins/by-name/lightline/default.nix +++ b/plugins/by-name/lightline/default.nix @@ -161,11 +161,11 @@ lib.nixvim.plugins.mkNeovimPlugin { "R" = "REPLACE"; "v" = "VISUAL"; "V" = "V-LINE"; - "\" = "V-BLOCK"; + "" = "V-BLOCK"; "c" = "COMMAND"; "s" = "SELECT"; "S" = "S-LINE"; - "\" = "S-BLOCK"; + "" = "S-BLOCK"; "t" = "TERMINAL"; } '' diff --git a/plugins/by-name/markdown-preview/default.nix b/plugins/by-name/markdown-preview/default.nix index 4c532519..ad53117e 100644 --- a/plugins/by-name/markdown-preview/default.nix +++ b/plugins/by-name/markdown-preview/default.nix @@ -137,7 +137,7 @@ lib.nixvim.plugins.mkVimPlugin { Custom port to start server or empty for random. ''; - page_title = defaultNullOpts.mkStr "「\$\{name}」" '' + page_title = defaultNullOpts.mkStr "「\${name}」" '' Preview page title. `$${name}` will be replaced with the file name. ''; @@ -186,7 +186,7 @@ lib.nixvim.plugins.mkVimPlugin { markdown_css = "/Users/username/markdown.css"; highlight_css.__raw = "vim.fn.expand('~/highlight.css')"; port = "8080"; - page_title = "「\$\{name}」"; + page_title = "「\${name}」"; theme = "dark"; }; } diff --git a/plugins/by-name/otter/default.nix b/plugins/by-name/otter/default.nix index ca778db2..087177f3 100644 --- a/plugins/by-name/otter/default.nix +++ b/plugins/by-name/otter/default.nix @@ -64,7 +64,7 @@ lib.nixvim.plugins.mkNeovimPlugin { strip_wrapping_quote_characters = lib.nixvim.defaultNullOpts.mkListOf lib.types.str [ "'" "\"" - "\`" + "`" ] ""; handle_leading_whitespace = lib.nixvim.defaultNullOpts.mkBool false '' diff --git a/plugins/by-name/rainbow/default.nix b/plugins/by-name/rainbow/default.nix index 18bc2088..2a5a35a0 100644 --- a/plugins/by-name/rainbow/default.nix +++ b/plugins/by-name/rainbow/default.nix @@ -28,7 +28,7 @@ lib.nixvim.plugins.mkVimPlugin { haskell = { parentheses = [ "start=/\\[/ end=/\\]/ fold" - "start=/\v\{\ze[^-]/ end=/}/ fold" + "start=/\\v\\{\\ze[^-]/ end=/}/ fold" ]; }; css = 0; diff --git a/plugins/by-name/todo-comments/default.nix b/plugins/by-name/todo-comments/default.nix index 224a7507..67cbf588 100644 --- a/plugins/by-name/todo-comments/default.nix +++ b/plugins/by-name/todo-comments/default.nix @@ -255,8 +255,8 @@ lib.nixvim.plugins.mkNeovimPlugin { settingsExample = { highlight = { pattern = [ - ".*<(KEYWORDS)\s*:" - ".*<(KEYWORDS)\s*" + ".*<(KEYWORDS)\\s*:" + ".*<(KEYWORDS)\\s*" ]; }; }; diff --git a/plugins/by-name/trim/default.nix b/plugins/by-name/trim/default.nix index 4412f6c5..6183dbaa 100644 --- a/plugins/by-name/trim/default.nix +++ b/plugins/by-name/trim/default.nix @@ -11,7 +11,7 @@ lib.nixvim.plugins.mkNeovimPlugin { settingsExample = { ft_blocklist = [ "markdown" ]; - patterns = [ "[[%s/\(\n\n\)\n\+/\1/]]" ]; + patterns = [ "[[%s/\\(\\n\\n\\)\\n\\+/\\1/]]" ]; trim_on_write = false; highlight = true; }; diff --git a/plugins/by-name/vim-matchup/default.nix b/plugins/by-name/vim-matchup/default.nix index f414c13f..38f568f6 100644 --- a/plugins/by-name/vim-matchup/default.nix +++ b/plugins/by-name/vim-matchup/default.nix @@ -256,7 +256,7 @@ lib.nixvim.plugins.mkVimPlugin { matchparen_nomode = defaultNullOpts.mkStr' { pluginDefault = ""; - example = "vV\"; + example = "vV\\"; description = '' When not empty, match highlighting will be disabled in the specified modes, where each mode is a single character like in the `|mode()|` function.