1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-12-07 01:21:05 +01:00

treewide: remove internal use of helpers module arg

This commit is contained in:
Matt Sturgeon 2025-11-19 11:39:41 +00:00
parent 7add68e918
commit dad19c1238
68 changed files with 687 additions and 758 deletions

View file

@ -1,7 +1,6 @@
{
lib,
config,
helpers,
...
}:
with lib;
@ -50,7 +49,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
let
mkEngineOption =
type:
helpers.mkNullOrOption
lib.nixvim.mkNullOrOption
(
with types;
attrsOf (submodule {
@ -61,11 +60,11 @@ lib.nixvim.plugins.mkNeovimPlugin {
description = "Executable to run.";
};
args = helpers.defaultNullOpts.mkListOf types.str [ ] ''
args = lib.nixvim.defaultNullOpts.mkListOf types.str [ ] ''
List of arguments to provide to the engine.
'';
options = helpers.defaultNullOpts.mkAttrsOf (types.submodule {
options = lib.nixvim.defaultNullOpts.mkAttrsOf (types.submodule {
options = {
value = mkOption {
type = types.str;
@ -79,7 +78,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
description = "The option icon.";
};
desc = helpers.mkNullOrStr ''
desc = lib.nixvim.mkNullOrStr ''
The description for this option.
'';
};
@ -94,31 +93,31 @@ lib.nixvim.plugins.mkNeovimPlugin {
'';
in
{
color_devicons = helpers.defaultNullOpts.mkBool true ''
color_devicons = lib.nixvim.defaultNullOpts.mkBool true ''
Whether to enable color devicons.
'';
open_cmd = helpers.defaultNullOpts.mkStr "vnew" ''
open_cmd = lib.nixvim.defaultNullOpts.mkStr "vnew" ''
The open command.
'';
live_update = helpers.defaultNullOpts.mkBool false ''
live_update = lib.nixvim.defaultNullOpts.mkBool false ''
Auto execute search again when you write to any file in vim.
'';
lnum_for_results = helpers.defaultNullOpts.mkBool false ''
lnum_for_results = lib.nixvim.defaultNullOpts.mkBool false ''
Show line number for search/replace results.
'';
line_sep_start = helpers.defaultNullOpts.mkStr "" "Start of the line separator";
line_sep_start = lib.nixvim.defaultNullOpts.mkStr "" "Start of the line separator";
result_padding = helpers.defaultNullOpts.mkStr " " ''
result_padding = lib.nixvim.defaultNullOpts.mkStr " " ''
Result padding string.
'';
line_sep = helpers.defaultNullOpts.mkStr "" "Line separator.";
line_sep = lib.nixvim.defaultNullOpts.mkStr "" "Line separator.";
highlight = helpers.defaultNullOpts.mkAttrsOf types.str {
highlight = lib.nixvim.defaultNullOpts.mkAttrsOf types.str {
headers = "SpectreHeader";
ui = "SpectreBody";
filename = "SpectreFile";
@ -129,7 +128,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
} "Highlight groups.";
mapping =
helpers.mkNullOrOption
lib.nixvim.mkNullOrOption
(
with types;
attrsOf (submodule {
@ -145,7 +144,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
example = "<cmd>lua require('spectre').tab()<cr>";
};
desc = helpers.mkNullOrStr ''
desc = lib.nixvim.mkNullOrStr ''
Description for this mapping.
'';
};
@ -163,39 +162,39 @@ lib.nixvim.plugins.mkNeovimPlugin {
default = {
find = {
cmd = helpers.defaultNullOpts.mkStr "rg" ''
cmd = lib.nixvim.defaultNullOpts.mkStr "rg" ''
Which find engine to use. Pick one from the `find_engine` list.
'';
options = helpers.defaultNullOpts.mkListOf types.str [ "ignore-case" ] ''
options = lib.nixvim.defaultNullOpts.mkListOf types.str [ "ignore-case" ] ''
Options to use for this engine.
'';
};
replace = {
cmd = helpers.defaultNullOpts.mkStr "rg" ''
cmd = lib.nixvim.defaultNullOpts.mkStr "rg" ''
Which find engine to use. Pick one from the `replace_engine` list.
'';
options = helpers.defaultNullOpts.mkListOf types.str [ ] ''
options = lib.nixvim.defaultNullOpts.mkListOf types.str [ ] ''
Options to use for this engine.
'';
};
};
replace_vim_cmd = helpers.defaultNullOpts.mkStr "cdo" ''
replace_vim_cmd = lib.nixvim.defaultNullOpts.mkStr "cdo" ''
The replace command to use within vim.
'';
is_open_target_win = helpers.defaultNullOpts.mkBool true ''
is_open_target_win = lib.nixvim.defaultNullOpts.mkBool true ''
Open file on opener window.
'';
is_insert_mode = helpers.defaultNullOpts.mkBool false ''
is_insert_mode = lib.nixvim.defaultNullOpts.mkBool false ''
Start open panel in insert mode.
'';
is_block_ui_break = helpers.defaultNullOpts.mkBool false ''
is_block_ui_break = lib.nixvim.defaultNullOpts.mkBool false ''
Mapping backspace and enter key to avoid ui break.
'';
};