mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

treewide: format with latest nixfmt

Browse source
This commit is contained in:
Gaetan Lepage 2024-12-06 11:33:22 +01:00 • committed by Matt Sturgeon
parent c6080c206e
commit ae78face8d
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
22 changed files with 100 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

55
lib/vim-plugin.nix
View file

@ -75,33 +75,36 @@
}; };
}; };
options.${namespace}.${name} = { options.${namespace}.${name} =
enable = lib.mkEnableOption originalName; {
package = enable = lib.mkEnableOption originalName;
if lib.isOption package then package =
package if lib.isOption package then
else package
lib.mkPackageOption pkgs originalName { else
default = lib.mkPackageOption pkgs originalName {
if builtins.isList package then default =
package if builtins.isList package then
else
[
"vimPlugins"
package package
]; else
}; [
packageDecorator = lib.mkOption { "vimPlugins"
type = lib.types.functionTo lib.types.package; package
default = lib.id; ];
defaultText = lib.literalExpression "x: x"; };
description = '' packageDecorator = lib.mkOption {
Additional transformations to apply to the final installed package. type = lib.types.functionTo lib.types.package;
The result of these transformations is **not** visible in the `package` option's value. default = lib.id;
''; defaultText = lib.literalExpression "x: x";
internal = true; description = ''
}; Additional transformations to apply to the final installed package.
} // settingsOption // extraOptions; The result of these transformations is **not** visible in the `package` option's value.
'';
internal = true;
};
}
// settingsOption
// extraOptions;
config = lib.mkIf cfg.enable ( config = lib.mkIf cfg.enable (
lib.mkMerge [ lib.mkMerge [

54
plugins/by-name/auto-session/default.nix
View file

@ -62,61 +62,33 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
"enabled" "enabled"
] ]
) (settingsPath ++ [ "auto_restore" ])) ) (settingsPath ++ [ "auto_restore" ]))
(lib.mkRenamedOptionModule (basePluginPath ++ [ "bypassSessionSaveFileTypes" ]) (
(lib.mkRenamedOptionModule ( settingsPath ++ [ "bypass_save_filetypes" ]
basePluginPath ))
++ [
"bypassSessionSaveFileTypes"
]
) (settingsPath ++ [ "bypass_save_filetypes" ]))
(lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "enableLastSession" ]) ( (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "enableLastSession" ]) (
settingsPath settingsPath ++ [ "auto_restore_last_session" ]
++ [
"auto_restore_last_session"
]
)) ))
(lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "rootDir" ]) ( (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "rootDir" ]) (
settingsPath settingsPath ++ [ "root_dir" ]
++ [
"root_dir"
]
)) ))
(lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "enabled" ]) ( (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "enabled" ]) (
settingsPath settingsPath ++ [ "enabled" ]
++ [
"enabled"
]
)) ))
(lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "createEnabled" ]) ( (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "createEnabled" ]) (
settingsPath settingsPath ++ [ "auto_create" ]
++ [
"auto_create"
]
)) ))
(lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "suppressDirs" ]) ( (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "suppressDirs" ]) (
settingsPath settingsPath ++ [ "suppressed_dirs" ]
++ [
"suppressed_dirs"
]
)) ))
(lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "allowedDirs" ]) ( (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "allowedDirs" ]) (
settingsPath settingsPath ++ [ "allowed_dirs" ]
++ [
"allowed_dirs"
]
)) ))
(lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "useGitBranch" ]) ( (lib.mkRenamedOptionModule (nestedAutoSessionPluginPath ++ [ "useGitBranch" ]) (
settingsPath settingsPath ++ [ "use_git_branch" ]
++ [
"use_git_branch"
]
)) ))
(lib.mkRemovedOptionModule ( (lib.mkRemovedOptionModule (basePluginPath ++ [ "cwdChangeHandling" ]) ''
basePluginPath Please switch to `cwd_change_handling` with just a boolean value.
++ [ '')
"cwdChangeHandling"
]
) ''Please switch to `cwd_change_handling` with just a boolean value.'')
]; ];
settingsOptions = { settingsOptions = {

9
plugins/by-name/clipboard-image/default.nix
View file

@ -145,9 +145,12 @@ in
extraConfigLua = extraConfigLua =
let let
setupOptions = { setupOptions =
default = processPluginOptions cfg.default; {
} // cfg.filetypes // cfg.extraOptions; default = processPluginOptions cfg.default;
}
// cfg.filetypes
// cfg.extraOptions;
in in
'' ''
require('clipboard-image').setup(${helpers.toLuaObject setupOptions}) require('clipboard-image').setup(${helpers.toLuaObject setupOptions})

12
plugins/by-name/coverage/default.nix
View file

@ -183,13 +183,13 @@ in
''; '';
summary = { summary = {
widthPercentage = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 widthPercentage =
1.0 helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.7
) 0.7 "Width of the pop-up window."; "Width of the pop-up window.";
heightPercentage = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 heightPercentage =
1.0 helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5
) 0.5 "Height of the pop-up window."; "Height of the pop-up window.";
borders = mapAttrs (optionName: default: helpers.defaultNullOpts.mkStr default "") { borders = mapAttrs (optionName: default: helpers.defaultNullOpts.mkStr default "") {
topleft = "╭"; topleft = "╭";

4
plugins/by-name/dap/dap-go.nix
View file

@ -29,9 +29,7 @@ in
delve = { delve = {
path = helpers.defaultNullOpts.mkStr "dlv" "The path to the executable dlv which will be used for debugging."; path = helpers.defaultNullOpts.mkStr "dlv" "The path to the executable dlv which will be used for debugging.";
initializeTimeoutSec = initializeTimeoutSec = helpers.defaultNullOpts.mkInt 20 "Time to wait for delve to initialize the debug session.";
helpers.defaultNullOpts.mkInt 20
"Time to wait for delve to initialize the debug session.";
port = helpers.defaultNullOpts.mkStr "$\{port}" '' port = helpers.defaultNullOpts.mkStr "$\{port}" ''
A string that defines the port to start delve debugger. A string that defines the port to start delve debugger.

4
plugins/by-name/dap/dap-ui.nix
View file

@ -192,9 +192,7 @@ in
maxTypeLength = helpers.mkNullOrOption types.int "Maximum number of characters to allow a type name to fill before trimming."; maxTypeLength = helpers.mkNullOrOption types.int "Maximum number of characters to allow a type name to fill before trimming.";
maxValueLines = maxValueLines = helpers.defaultNullOpts.mkInt 100 "Maximum number of lines to allow a value to fill before trimming.";
helpers.defaultNullOpts.mkInt 100
"Maximum number of lines to allow a value to fill before trimming.";
}; };
selectWindow = helpers.defaultNullOpts.mkLuaFn null '' selectWindow = helpers.defaultNullOpts.mkLuaFn null ''

4
plugins/by-name/indent-o-matic/default.nix
View file

@ -7,9 +7,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
name = "indent-o-matic"; name = "indent-o-matic";
maintainers = [ lib.maintainers.alisonjenkins ]; maintainers = [ lib.maintainers.alisonjenkins ];
settingsOptions = { settingsOptions = {
max_lines = max_lines = defaultNullOpts.mkInt 2048 "Number of lines without indentation before giving up (use -1 for infinite)";
defaultNullOpts.mkInt 2048
"Number of lines without indentation before giving up (use -1 for infinite)";
skip_multiline = defaultNullOpts.mkBool false "Skip multi-line comments and strings (more accurate detection but less performant)"; skip_multiline = defaultNullOpts.mkBool false "Skip multi-line comments and strings (more accurate detection but less performant)";
standard_widths = defaultNullOpts.mkListOf types.ints.unsigned [ standard_widths = defaultNullOpts.mkListOf types.ints.unsigned [
2 2

12
plugins/by-name/lspsaga/default.nix
View file

@ -317,13 +317,13 @@ in
Auto save file when the rename is done. Auto save file when the rename is done.
''; '';
projectMaxWidth = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 projectMaxWidth =
1.0 helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5
) 0.5 "Width for the `project_replace` float window."; "Width for the `project_replace` float window.";
projectMaxHeight = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 projectMaxHeight =
1.0 helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.5
) 0.5 "Height for the `project_replace` float window."; "Height for the `project_replace` float window.";
keys = { keys = {
quit = mkKeymapOption "<C-k>" "Quit rename window or `project_replace` window."; quit = mkKeymapOption "<C-k>" "Quit rename window or `project_replace` window.";

26
plugins/by-name/markdown-preview/default.nix
View file

@ -33,30 +33,12 @@ mkVimPlugin {
]; ];
imports = [ imports = [
(mkRenamedOptionModule (mkRenamedOptionModule
[ [ "plugins" "markdown-preview" "fileTypes" ]
"plugins" [ "plugins" "markdown-preview" "settings" "filetypes" ]
"markdown-preview"
"fileTypes"
]
[
"plugins"
"markdown-preview"
"settings"
"filetypes"
]
) )
(mkRenamedOptionModule (mkRenamedOptionModule
[ [ "plugins" "markdown-preview" "browserFunc" ]
"plugins" [ "plugins" "markdown-preview" "settings" "browserfunc" ]
"markdown-preview"
"browserFunc"
]
[
"plugins"
"markdown-preview"
"settings"
"browserfunc"
]
) )
]; ];

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

@ -72,13 +72,15 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
evaluate_single = true; evaluate_single = true;
items = { items = {
"__unkeyed-1.buildtin_actions".__raw = "require('mini.starter').sections.builtin_actions()"; "__unkeyed-1.buildtin_actions".__raw = "require('mini.starter').sections.builtin_actions()";
"__unkeyed-2.recent_files_current_directory".__raw = "require('mini.starter').sections.recent_files(10, false)"; "__unkeyed-2.recent_files_current_directory".__raw =
"require('mini.starter').sections.recent_files(10, false)";
"__unkeyed-3.recent_files".__raw = "require('mini.starter').sections.recent_files(10, true)"; "__unkeyed-3.recent_files".__raw = "require('mini.starter').sections.recent_files(10, true)";
"__unkeyed-4.sessions".__raw = "require('mini.starter').sections.sessions(5, true)"; "__unkeyed-4.sessions".__raw = "require('mini.starter').sections.sessions(5, true)";
}; };
content_hooks = { content_hooks = {
"__unkeyed-1.adding_bullet".__raw = "require('mini.starter').gen_hook.adding_bullet()"; "__unkeyed-1.adding_bullet".__raw = "require('mini.starter').gen_hook.adding_bullet()";
"__unkeyed-2.indexing".__raw = "require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })"; "__unkeyed-2.indexing".__raw =
"require('mini.starter').gen_hook.indexing('all', { 'Builtin actions' })";
"__unkeyed-3.padding".__raw = "require('mini.starter').gen_hook.aligning('center', 'center')"; "__unkeyed-3.padding".__raw = "require('mini.starter').gen_hook.aligning('center', 'center')";
}; };
}; };

8
plugins/by-name/neo-tree/default.nix
View file

@ -104,13 +104,9 @@ in
gitStatusAsync = helpers.defaultNullOpts.mkBool true ""; gitStatusAsync = helpers.defaultNullOpts.mkBool true "";
gitStatusAsyncOptions = { gitStatusAsyncOptions = {
batchSize = batchSize = helpers.defaultNullOpts.mkInt 1000 "How many lines of git status results to process at a time";
helpers.defaultNullOpts.mkInt 1000
"How many lines of git status results to process at a time";
batchDelay = batchDelay = helpers.defaultNullOpts.mkInt 10 "delay in ms between batches. Spreads out the workload to let other processes run.";
helpers.defaultNullOpts.mkInt 10
"delay in ms between batches. Spreads out the workload to let other processes run.";
maxLines = helpers.defaultNullOpts.mkInt 10000 '' maxLines = helpers.defaultNullOpts.mkInt 10000 ''
How many lines of git status results to process. Anything after this will be dropped. How many lines of git status results to process. Anything after this will be dropped.

6
plugins/by-name/neogit/options.nix
View file

@ -44,8 +44,10 @@ in
git_services = helpers.defaultNullOpts.mkAttrsOf types.str { git_services = helpers.defaultNullOpts.mkAttrsOf types.str {
"github.com" = "https://github.com/$\{owner}/$\{repository}/compare/$\{branch_name}?expand=1"; "github.com" = "https://github.com/$\{owner}/$\{repository}/compare/$\{branch_name}?expand=1";
"bitbucket.org" = "https://bitbucket.org/$\{owner}/$\{repository}/pull-requests/new?source=$\{branch_name}&t=1"; "bitbucket.org" =
"gitlab.com" = "https://gitlab.com/$\{owner}/$\{repository}/merge_requests/new?merge_request[source_branch]=$\{branch_name}"; "https://bitbucket.org/$\{owner}/$\{repository}/pull-requests/new?source=$\{branch_name}&t=1";
"gitlab.com" =
"https://gitlab.com/$\{owner}/$\{repository}/merge_requests/new?merge_request[source_branch]=$\{branch_name}";
} "Used to generate URL's for branch popup action 'pull request'."; } "Used to generate URL's for branch popup action 'pull request'.";
fetch_after_checkout = helpers.defaultNullOpts.mkBool false '' fetch_after_checkout = helpers.defaultNullOpts.mkBool false ''

8
plugins/by-name/rust-tools/default.nix
View file

@ -48,15 +48,11 @@ in
maxLenAlign = lib.nixvim.defaultNullOpts.mkBool false "whether to align to the length of the longest line in the file"; maxLenAlign = lib.nixvim.defaultNullOpts.mkBool false "whether to align to the length of the longest line in the file";
maxLenAlignPadding = maxLenAlignPadding = lib.nixvim.defaultNullOpts.mkUnsignedInt 1 "padding from the left if max_len_align is true";
lib.nixvim.defaultNullOpts.mkUnsignedInt 1
"padding from the left if max_len_align is true";
rightAlign = lib.nixvim.defaultNullOpts.mkBool false "whether to align to the extreme right or not"; rightAlign = lib.nixvim.defaultNullOpts.mkBool false "whether to align to the extreme right or not";
rightAlignPadding = rightAlignPadding = lib.nixvim.defaultNullOpts.mkInt 7 "padding from the right if right_align is true";
lib.nixvim.defaultNullOpts.mkInt 7
"padding from the right if right_align is true";
highlight = lib.nixvim.defaultNullOpts.mkStr "Comment" "The color of the hints"; highlight = lib.nixvim.defaultNullOpts.mkStr "Comment" "The color of the hints";
}; };

3
plugins/by-name/telescope/extensions/live-greps-args.nix
View file

@ -48,7 +48,8 @@ mkExtension {
mappings = { mappings = {
i = { i = {
"<C-k>".__raw = ''require("telescope-live-grep-args.actions").quote_prompt()''; "<C-k>".__raw = ''require("telescope-live-grep-args.actions").quote_prompt()'';
"<C-i>".__raw = ''require("telescope-live-grep-args.actions").quote_prompt({ postfix = " --iglob " })''; "<C-i>".__raw =
''require("telescope-live-grep-args.actions").quote_prompt({ postfix = " --iglob " })'';
"<C-space>".__raw = ''require("telescope.actions").to_fuzzy_refine''; "<C-space>".__raw = ''require("telescope.actions").to_fuzzy_refine'';
}; };
}; };

8
plugins/by-name/vim-matchup/default.nix
View file

@ -77,13 +77,9 @@ with lib;
Set this conservatively since high values may cause performance issues. Set this conservatively since high values may cause performance issues.
''; '';
timeout = timeout = helpers.defaultNullOpts.mkInt 300 "Adjust timeouts in milliseconds for matchparen highlighting";
helpers.defaultNullOpts.mkInt 300
"Adjust timeouts in milliseconds for matchparen highlighting";
insertTimeout = insertTimeout = helpers.defaultNullOpts.mkInt 60 "Adjust timeouts in milliseconds for matchparen highlighting";
helpers.defaultNullOpts.mkInt 60
"Adjust timeouts in milliseconds for matchparen highlighting";
deferred = { deferred = {
enable = helpers.defaultNullOpts.mkBool false '' enable = helpers.defaultNullOpts.mkBool false ''

6
plugins/by-name/which-key/default.nix
View file

@ -377,9 +377,9 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
zindex = defaultNullOpts.mkUnsignedInt 1000 "Layer depth on the popup window."; zindex = defaultNullOpts.mkUnsignedInt 1000 "Layer depth on the popup window.";
wo = { wo = {
winblend = defaultNullOpts.mkNullableWithRaw (types.ints.between 0 winblend =
100 defaultNullOpts.mkNullableWithRaw (types.ints.between 0 100) 0
) 0 "`0` for fully opaque and `100` for fully transparent."; "`0` for fully opaque and `100` for fully transparent.";
}; };
}; };

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

@ -138,9 +138,7 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
NOTE: this only works if `use_ya_for_events_reading` is enabled, etc. NOTE: this only works if `use_ya_for_events_reading` is enabled, etc.
''; '';
floating_window_scaling_factor = floating_window_scaling_factor = defaultNullOpts.mkNum 0.9 "The floating window scaling factor. 1 means 100%, 0.9 means 90%, etc.";
defaultNullOpts.mkNum 0.9
"The floating window scaling factor. 1 means 100%, 0.9 means 90%, etc.";
yazi_floating_window_winblend = defaultNullOpts.mkNullableWithRaw' { yazi_floating_window_winblend = defaultNullOpts.mkNullableWithRaw' {
type = types.ints.between 0 100; type = types.ints.between 0 100;

13
plugins/colorschemes/catppuccin.nix
View file

@ -94,17 +94,8 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
( (
old: new: old: new:
lib.mkRenamedOptionModule lib.mkRenamedOptionModule
[ [ "colorschemes" "catppuccin" old ]
"colorschemes" [ "colorschemes" "catppuccin" "settings" new ]
"catppuccin"
old
]
[
"colorschemes"
"catppuccin"
"settings"
new
]
) )
{ {
showBufferEnd = "show_end_of_buffer"; showBufferEnd = "show_end_of_buffer";

23
plugins/deprecation.nix
View file

@ -48,28 +48,13 @@ in
] ]
) removed) ) removed)
++ (lib.mapAttrsToList ( ++ (lib.mapAttrsToList (
old: new: old: new: lib.mkRenamedOptionModule [ "plugins" old ] [ "plugins" new ]
lib.mkRenamedOptionModule
[
"plugins"
old
]
[
"plugins"
new
]
) renamed) ) renamed)
++ builtins.map ( ++ builtins.map (
name: name:
lib.mkRemovedOptionModule lib.mkRemovedOptionModule [ "plugins" name "iconsPackage" ] ''
[ Please use `plugins.web-devicons` or `plugins.mini.modules.icons` with `plugins.mini.mockDevIcons` instead.
"plugins" ''
name
"iconsPackage"
]
''
Please use `plugins.web-devicons` or `plugins.mini.modules.icons` with `plugins.mini.mockDevIcons` instead.
''
) iconsPackagePlugins ) iconsPackagePlugins
++ [ ++ [
( (

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

@ -22,8 +22,10 @@
disable_signs = false; disable_signs = false;
git_services = { git_services = {
"github.com" = "https://github.com/$\{owner}/$\{repository}/compare/$\{branch_name}?expand=1"; "github.com" = "https://github.com/$\{owner}/$\{repository}/compare/$\{branch_name}?expand=1";
"bitbucket.org" = "https://bitbucket.org/$\{owner}/$\{repository}/pull-requests/new?source=$\{branch_name}&t=1"; "bitbucket.org" =
"gitlab.com" = "https://gitlab.com/$\{owner}/$\{repository}/merge_requests/new?merge_request[source_branch]=$\{branch_name}"; "https://bitbucket.org/$\{owner}/$\{repository}/pull-requests/new?source=$\{branch_name}&t=1";
"gitlab.com" =
"https://gitlab.com/$\{owner}/$\{repository}/merge_requests/new?merge_request[source_branch]=$\{branch_name}";
}; };
telescope_sorter = null; telescope_sorter = null;
disable_insert_on_commit = "auto"; disable_insert_on_commit = "auto";

3
tests/test-sources/plugins/by-name/telescope/live-grep-args.nix
View file

@ -36,7 +36,8 @@
mappings = { mappings = {
i = { i = {
"<C-k>".__raw = ''require("telescope-live-grep-args.actions").quote_prompt()''; "<C-k>".__raw = ''require("telescope-live-grep-args.actions").quote_prompt()'';
"<C-i>".__raw = ''require("telescope-live-grep-args.actions").quote_prompt({ postfix = " --iglob " })''; "<C-i>".__raw =
''require("telescope-live-grep-args.actions").quote_prompt({ postfix = " --iglob " })'';
"<C-space>".__raw = ''require("telescope-live-grep-args.actions").to_fuzzy_refine''; "<C-space>".__raw = ''require("telescope-live-grep-args.actions").to_fuzzy_refine'';
}; };
}; };

11
wrappers/_shared.nix
View file

@ -53,16 +53,7 @@ in
# TODO: Added 2024-07-24; remove after 24.11 # TODO: Added 2024-07-24; remove after 24.11
imports = [ imports = [
(lib.mkRenamedOptionModule (lib.mkRenamedOptionModule [ "nixvim" "helpers" ] [ "lib" "nixvim" ])
[
"nixvim"
"helpers"
]
[
"lib"
"nixvim"
]
)
]; ];
config = mkMerge [ config = mkMerge [