nix/12.nixvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

treewide: apply updated treefmt

Browse source
This commit is contained in:
Gaetan Lepage 2026-01-20 14:25:43 +01:00 • committed by Matt Sturgeon
parent e2e83389cc
commit c245cec5af
17 changed files with 63 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ci/rust-analyzer/default.nix
View file

@ -64,9 +64,7 @@ let
in
{
kind = "oneOf";
subTypes = builtins.map (
t: mkRustAnalyzerOptionType nullable "${property_name}-sub" t
) possibleTypes;
subTypes = map (t: mkRustAnalyzerOptionType nullable "${property_name}-sub" t) possibleTypes;
}
else
(
@ -87,7 +85,7 @@ let
inner
else
let
innerTypes = builtins.map (
innerTypes = map (
t: mkRustAnalyzerOptionType nullable "${property_name}-inner" (property // { type = t; })
) type;
in
@ -141,8 +139,6 @@ let
minimum ? null,
maximum ? null,
items ? null,
# TODO: add this in the documentation ?
uniqueItems ? null,
type ? null,
}:
let
@ -161,9 +157,7 @@ let
enumDesc =
values: descriptions:
let
valueDesc = builtins.map ({ fst, snd }: ''- ${fst}: ${snd}'') (
lib.lists.zipLists values descriptions
);
valueDesc = map ({ fst, snd }: "- ${fst}: ${snd}") (lib.lists.zipLists values descriptions);
in
''
${filteredMarkdownDesc}
@ -215,7 +209,7 @@ let
};
rustAnalyzerOptions = builtins.map (
rustAnalyzerOptions = map (
v:
let
props = lib.attrsToList v.properties;

4
plugins/by-name/arrow/default.nix
View file

@ -122,9 +122,9 @@ lib.nixvim.plugins.mkNeovimPlugin {
If true will display arrow index in scrollbar at every update.
'';
overlap = lib.nixvim.defaultNullOpts.mkBool false '''';
overlap = lib.nixvim.defaultNullOpts.mkBool false "";
priority = lib.nixvim.defaultNullOpts.mkInt 1000 '''';
priority = lib.nixvim.defaultNullOpts.mkInt 1000 "";
};
zindex = lib.nixvim.defaultNullOpts.mkInt 50 ''

2
plugins/by-name/blink-cmp/provider-config.nix
View file

@ -48,7 +48,7 @@ types.submodule {
'';
transform_items = defaultNullOpts.mkRaw' {
pluginDefault = ''function(_, items) return items end'';
pluginDefault = "function(_, items) return items end";
description = ''
Function to transform the items before they're returned.
'';

2
plugins/by-name/coq-nvim/default.nix
View file

@ -59,7 +59,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
preConfig = ''
local coq = require 'coq'
'';
setupWrappers = [ (s: ''coq.lsp_ensure_capabilities(${s})'') ];
setupWrappers = [ (s: "coq.lsp_ensure_capabilities(${s})") ];
};
};
}

6
plugins/by-name/lightline/default.nix
View file

@ -61,7 +61,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
component =
defaultNullOpts.mkAttrsOf types.str
{
mode = ''%{lightline#mode()}'';
mode = "%{lightline#mode()}";
absolutepath = "%F";
relativepath = "%f";
filename = "%t";
@ -81,7 +81,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
line = "%l";
column = "%c";
close = "%999X X ";
winnr = ''%{winnr()}'';
winnr = "%{winnr()}";
}
''
Lightline component definitions. Uses 'statusline' syntax.
@ -151,7 +151,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
"filename"
"modified"
];
} ''A dictionary to store the tab components in each tabs.'';
} "A dictionary to store the tab components in each tabs.";
mode_map =
defaultNullOpts.mkAttrsOf types.str

2
plugins/by-name/nvim-autopairs/default.nix
View file

@ -126,7 +126,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
Whether the cursor should be placed before or after the substitution.
'';
keys = lib.nixvim.defaultNullOpts.mkStr "qwertyuiopzxcvbnmasdfghjkl" '''';
keys = lib.nixvim.defaultNullOpts.mkStr "qwertyuiopzxcvbnmasdfghjkl" "";
highlight = lib.nixvim.defaultNullOpts.mkStr "Search" ''
Which highlight group to use for the match.

2
plugins/by-name/overseer/default.nix
View file

@ -77,7 +77,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
"q" = "Close";
};
}
''The task list displays all tasks that have been created. It shows the task status, name, and a summary of the task output.'';
"The task list displays all tasks that have been created. It shows the task status, name, and a summary of the task output.";
task_editor = {
bindings =

2
plugins/by-name/rest/default.nix
View file

@ -128,7 +128,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
set_compressed = false;
};
};
} ''Table of client configurations.'';
} "Table of client configurations.";
cookies = {
enable = defaultNullOpts.mkBool true ''

4
plugins/by-name/web-devicons/default.nix
View file

@ -27,7 +27,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
cterm_color = defaultNullOpts.mkStr null "Cterm color of the icon.";
name = defaultNullOpts.mkStr null "Name to replace with icon.";
};
}) { } ''Custom overrides for icons.'';
}) { } "Custom overrides for icons.";
defaultIcon = mkNullOrOption (lib.types.submodule {
options = {
@ -35,7 +35,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
color = defaultNullOpts.mkStr null "Color of the icon.";
cterm_color = defaultNullOpts.mkStr null "Cterm color of the icon.";
};
}) ''Set the default icon when none is found.'';
}) "Set the default icon when none is found.";
};
extraConfig = cfg: {

12
plugins/lsp/language-servers/pylsp.nix
View file

@ -548,35 +548,35 @@ in
with cfg.pythonPackage.pkgs;
{
pylsp_mypy = pylsp-mypy.overridePythonAttrs (old: {
postPatch = old.postPatch or '''' + ''
postPatch = old.postPatch or "" + ''
substituteInPlace setup.cfg \
--replace-fail "python-lsp-server >=1.7.0" ""
'';
});
isort = pyls-isort.overridePythonAttrs (old: {
postPatch = old.postPatch or '''' + ''
postPatch = old.postPatch or "" + ''
substituteInPlace setup.py \
--replace-fail 'install_requires=["python-lsp-server", "isort"],' 'install_requires=["isort"],'
'';
});
black = python-lsp-black.overridePythonAttrs (old: {
postPatch = old.postPatch or '''' + ''
postPatch = old.postPatch or "" + ''
substituteInPlace setup.cfg \
--replace-fail "python-lsp-server>=1.4.0" ""
'';
});
memestra = pyls-memestra.overridePythonAttrs (old: {
postPatch = old.postPatch or '''' + ''
postPatch = old.postPatch or "" + ''
sed -i '/python-lsp-server/d' requirements.txt
'';
});
rope = pylsp-rope.overridePythonAttrs (old: {
postPatch = old.postPatch or '''' + ''
postPatch = old.postPatch or "" + ''
sed -i '/python-lsp-server/d' setup.cfg
'';
});
ruff = python-lsp-ruff.overridePythonAttrs (old: {
postPatch = old.postPatch or '''' + ''
postPatch = old.postPatch or "" + ''
sed -i '/python-lsp-server/d' pyproject.toml
'';

12
tests/lib-tests.nix
View file

@ -105,7 +105,7 @@ let
};
};
};
expected = ''{ a = { b = 1, c = 2, d = { e = 3 } } }'';
expected = "{ a = { b = 1, c = 2, d = { e = 3 } } }";
};
testToLuaObjectNestedList = {
@ -133,7 +133,7 @@ let
d = false;
e = null;
};
expected = ''{ a = 1.0, b = 2, c = true, d = false }'';
expected = "{ a = 1.0, b = 2, c = true, d = false }";
};
testToLuaObjectNilPrim = {
@ -175,7 +175,7 @@ let
f = { };
};
};
expected = ''{ }'';
expected = "{ }";
};
testToLuaObjectAttrListFilters = {
@ -224,7 +224,7 @@ let
]
];
};
expected = ''{ { { }, { }, { { }, { } } }, g = { { }, { } } }'';
expected = "{ { { }, { }, { { }, { } } }, g = { { }, { } } }";
};
testToLuaObjectEmptyTable = {
@ -240,7 +240,7 @@ let
g = helpers.emptyTable;
};
};
expected = ''{ c = { }, d = { g = { } } }'';
expected = "{ c = { }, d = { g = { } } }";
};
testToLuaObjectEmptyListEntries = {
@ -554,7 +554,7 @@ else
runCommandLocal "lib-tests-failure"
{
results = lib.concatStringsSep "\n" (
builtins.map (result: ''
map (result: ''
${result.name}:
expected: ${lib.generators.toPretty { } result.expected}
result: ${lib.generators.toPretty { } result.result}

6
tests/test-sources/plugins/by-name/arrow/default.nix
View file

@ -30,9 +30,9 @@
prev_item = "[";
};
custom_actions = {
open = ''function(target_file_name, current_file_name) end'';
split_vertical = ''function(target_file_name, current_file_name) end'';
split_horizontal = ''function(target_file_name, current_file_name) end'';
open = "function(target_file_name, current_file_name) end";
split_vertical = "function(target_file_name, current_file_name) end";
split_horizontal = "function(target_file_name, current_file_name) end";
};
window = {
width = "auto";

44
tests/test-sources/plugins/by-name/glance/default.nix
View file

@ -37,31 +37,31 @@
};
mappings = {
list = {
"j".__raw = ''require('glance').actions.next'';
"k".__raw = ''require('glance').actions.previous'';
"<Down>".__raw = ''require('glance').actions.next'';
"<Up>".__raw = ''require('glance').actions.previous'';
"<Tab>".__raw = ''require('glance').actions.next_location'';
"<S-Tab>".__raw = ''require('glance').actions.previous_location'';
"<C-u>".__raw = ''require('glance').actions.preview_scroll_win(5)'';
"<C-d>".__raw = ''require('glance').actions.preview_scroll_win(-5)'';
"v".__raw = ''require('glance').actions.jump_vsplit'';
"s".__raw = ''require('glance').actions.jump_split'';
"t".__raw = ''require('glance').actions.jump_tab'';
"<CR>".__raw = ''require('glance').actions.jump'';
"o".__raw = ''require('glance').actions.jump'';
"l".__raw = ''require('glance').actions.open_fold'';
"h".__raw = ''require('glance').actions.close_fold'';
"j".__raw = "require('glance').actions.next";
"k".__raw = "require('glance').actions.previous";
"<Down>".__raw = "require('glance').actions.next";
"<Up>".__raw = "require('glance').actions.previous";
"<Tab>".__raw = "require('glance').actions.next_location";
"<S-Tab>".__raw = "require('glance').actions.previous_location";
"<C-u>".__raw = "require('glance').actions.preview_scroll_win(5)";
"<C-d>".__raw = "require('glance').actions.preview_scroll_win(-5)";
"v".__raw = "require('glance').actions.jump_vsplit";
"s".__raw = "require('glance').actions.jump_split";
"t".__raw = "require('glance').actions.jump_tab";
"<CR>".__raw = "require('glance').actions.jump";
"o".__raw = "require('glance').actions.jump";
"l".__raw = "require('glance').actions.open_fold";
"h".__raw = "require('glance').actions.close_fold";
"<leader>l".__raw = ''require('glance').actions.enter_win("preview")'';
"q".__raw = ''require('glance').actions.close'';
"Q".__raw = ''require('glance').actions.close'';
"<Esc>".__raw = ''require('glance').actions.close'';
"<C-q>".__raw = ''require('glance').actions.quickfix'';
"q".__raw = "require('glance').actions.close";
"Q".__raw = "require('glance').actions.close";
"<Esc>".__raw = "require('glance').actions.close";
"<C-q>".__raw = "require('glance').actions.quickfix";
};
preview = {
"Q".__raw = ''require('glance').actions.close'';
"<Tab>".__raw = ''require('glance').actions.next_location'';
"<S-Tab>".__raw = ''require('glance').actions.previous_location'';
"Q".__raw = "require('glance').actions.close";
"<Tab>".__raw = "require('glance').actions.next_location";
"<S-Tab>".__raw = "require('glance').actions.previous_location";
"<leader>l".__raw = ''require('glance').actions.enter_win("list")'';
};
};

4
tests/test-sources/plugins/by-name/grug-far/default.nix
View file

@ -23,9 +23,9 @@
placeholders = {
enabled = true;
search = "ex: foo foo([a-z0-9]*) fun\\(";
replacement = ''ex: bar $${1}_foo $$MY_ENV_VAR'';
replacement = "ex: bar $${1}_foo $$MY_ENV_VAR";
replacement_lua = ''ex: if vim.startsWith(match; "use") \\n then return "employ" .. match \\n else return match end'';
filesFilter = ''ex: *.lua *.{css;js} **/docs/*.md (specify one per line)'';
filesFilter = "ex: *.lua *.{css;js} **/docs/*.md (specify one per line)";
flags = "ex: --help --ignore-case (-i) --replace= (empty replace) --multiline (-U)";
paths = "ex: /foo/bar ../ ./hello\\ world/ ./src/foo.lua ~/.config";
};

8
tests/test-sources/plugins/by-name/lightline/default.nix
View file

@ -11,7 +11,7 @@
colorscheme = "default";
component_function.__raw = "nil";
component = {
mode = ''%{lightline#mode()}'';
mode = "%{lightline#mode()}";
absolutepath = "%F";
relativepath = "%f";
filename = "%t";
@ -22,16 +22,16 @@
charvalue = "%b";
charvaluehex = "%B";
fileencoding = ''%{&fenc!=#""?&fenc:&enc}'';
fileformat = ''%{&ff}'';
fileformat = "%{&ff}";
filetype = ''%{&ft!=#""?&ft:"no ft"}'';
percent = "%3p%%";
percentwin = "%P";
spell = ''%{&spell?&spelllang:""}'';
lineinfo = ''%3l=%-2c'';
lineinfo = "%3l=%-2c";
line = "%l";
column = "%c";
close = "%999X X ";
winnr = ''%{winnr()}'';
winnr = "%{winnr()}";
};
active = {
left = [

6
tests/test-sources/plugins/by-name/rest/default.nix
View file

@ -18,7 +18,7 @@
skip_ssl_verification = false;
hooks = {
encode_url = true;
user_agent.__raw = ''"rest.nvim v" .. require("rest-nvim.api").VERSION'';
user_agent.__raw = "'rest.nvim v' .. require('rest-nvim.api').VERSION";
set_content_type = true;
};
};
@ -49,7 +49,7 @@
};
cookies = {
enable = true;
path.__raw = ''vim.fs.joinpath(vim.fn.stdpath("data") --[[@as string]], "rest-nvim.cookies")'';
path.__raw = "vim.fs.joinpath(vim.fn.stdpath('data') --[[@as string]], 'rest-nvim.cookies')";
};
env = {
enable = true;
@ -66,7 +66,7 @@
enable = true;
timeout = 750;
};
_log_level.__raw = ''vim.log.levels.WARN'';
_log_level.__raw = "vim.log.levels.WARN";
};
};
};

2
tests/test-sources/plugins/by-name/rzls/default.nix
View file

@ -14,7 +14,7 @@
return nil
end
'';
capabilities.__raw = ''vim.lsp.protocol.make_client_capabilities()'';
capabilities.__raw = "vim.lsp.protocol.make_client_capabilities()";
};
};
};