mirror of
https://github.com/nix-community/nixvim.git
synced 2025-11-09 03:56:05 +01:00
plugins/gitsigns: remove settings declarations
Signed-off-by: saygo-png <saygo.mail@proton.me>
This commit is contained in:
saygo-png
Matt Sturgeon
parent
345eab65b3
commit
4668857405
2 changed files with 2 additions and 373 deletions
|
|
@ -42,7 +42,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
|
||||||
|
|
||||||
extraConfig = cfg: {
|
extraConfig = cfg: {
|
||||||
warnings = lib.nixvim.mkWarnings "plugins.gitsigns" {
|
warnings = lib.nixvim.mkWarnings "plugins.gitsigns" {
|
||||||
when = (cfg.settings.trouble == true) && !config.plugins.trouble.enable;
|
when = ((cfg.settings.trouble or false) == true) && !config.plugins.trouble.enable;
|
||||||
|
|
||||||
message = ''
|
message = ''
|
||||||
You have enabled `plugins.gitsigns.settings.trouble` but `plugins.trouble.enable` is `false`.
|
You have enabled `plugins.gitsigns.settings.trouble` but `plugins.trouble.enable` is `false`.
|
||||||
|
|
|
||||||
|
|
@ -1,87 +1,8 @@
|
||||||
lib:
|
lib:
|
||||||
let
|
let
|
||||||
inherit (lib) types mkOption;
|
inherit (lib.nixvim) defaultNullOpts mkNullOrLuaFn;
|
||||||
inherit (lib.nixvim) defaultNullOpts mkNullOrOption mkNullOrLuaFn;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
signs =
|
|
||||||
let
|
|
||||||
signOptions = defaults: {
|
|
||||||
text = defaultNullOpts.mkStr defaults.text ''
|
|
||||||
Specifies the character to use for the sign.
|
|
||||||
'';
|
|
||||||
|
|
||||||
show_count = defaultNullOpts.mkBool false ''
|
|
||||||
Showing count of hunk, e.g. number of deleted lines.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
add = signOptions {
|
|
||||||
hl = "GitSignsAdd";
|
|
||||||
text = "┃";
|
|
||||||
numhl = "GitSignsAddNr";
|
|
||||||
linehl = "GitSignsAddLn";
|
|
||||||
};
|
|
||||||
change = signOptions {
|
|
||||||
hl = "GitSignsChange";
|
|
||||||
text = "┃";
|
|
||||||
numhl = "GitSignsChangeNr";
|
|
||||||
linehl = "GitSignsChangeLn";
|
|
||||||
};
|
|
||||||
delete = signOptions {
|
|
||||||
hl = "GitSignsDelete";
|
|
||||||
text = "▁";
|
|
||||||
numhl = "GitSignsDeleteNr";
|
|
||||||
linehl = "GitSignsDeleteLn";
|
|
||||||
};
|
|
||||||
topdelete = signOptions {
|
|
||||||
hl = "GitSignsDelete";
|
|
||||||
text = "▔";
|
|
||||||
numhl = "GitSignsDeleteNr";
|
|
||||||
linehl = "GitSignsDeleteLn";
|
|
||||||
};
|
|
||||||
changedelete = signOptions {
|
|
||||||
hl = "GitSignsChange";
|
|
||||||
text = "~";
|
|
||||||
numhl = "GitSignsChangeNr";
|
|
||||||
linehl = "GitSignsChangeLn";
|
|
||||||
};
|
|
||||||
untracked = signOptions {
|
|
||||||
hl = "GitSignsAdd";
|
|
||||||
text = "┆";
|
|
||||||
numhl = "GitSignsAddNr";
|
|
||||||
linehl = "GitSignsAddLn";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
worktrees =
|
|
||||||
let
|
|
||||||
worktreeType = types.submodule {
|
|
||||||
freeformType = with types; attrsOf anything;
|
|
||||||
options = {
|
|
||||||
toplevel = mkOption {
|
|
||||||
type = with lib.types; maybeRaw str;
|
|
||||||
description = ''
|
|
||||||
Path to the top-level of the parent git repository.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
gitdir = mkOption {
|
|
||||||
type = with lib.types; maybeRaw str;
|
|
||||||
description = ''
|
|
||||||
Path to the git directory of the parent git repository (typically the `.git/` directory).
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
|
||||||
mkNullOrOption (types.listOf worktreeType) ''
|
|
||||||
Detached working trees.
|
|
||||||
If normal attaching fails, then each entry in the table is attempted with the work tree
|
|
||||||
details set.
|
|
||||||
'';
|
|
||||||
|
|
||||||
on_attach = mkNullOrLuaFn ''
|
on_attach = mkNullOrLuaFn ''
|
||||||
Callback called when attaching to a buffer. Mainly used to setup keymaps
|
Callback called when attaching to a buffer. Mainly used to setup keymaps
|
||||||
when `config.keymaps` is empty. The buffer number is passed as the first
|
when `config.keymaps` is empty. The buffer number is passed as the first
|
||||||
|
|
@ -103,135 +24,6 @@ in
|
||||||
```
|
```
|
||||||
'';
|
'';
|
||||||
|
|
||||||
watch_gitdir = {
|
|
||||||
enable = defaultNullOpts.mkBool true ''
|
|
||||||
When opening a file, a `libuv` watcher is placed on the respective `.git` directory to detect
|
|
||||||
when changes happen to use as a trigger to update signs.
|
|
||||||
'';
|
|
||||||
|
|
||||||
follow_files = defaultNullOpts.mkBool true ''
|
|
||||||
If a file is moved with `git mv`, switch the buffer to the new location.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
sign_priority = defaultNullOpts.mkUnsignedInt 6 ''
|
|
||||||
Priority to use for signs.
|
|
||||||
'';
|
|
||||||
|
|
||||||
signcolumn = defaultNullOpts.mkBool true ''
|
|
||||||
Enable/disable symbols in the sign column.
|
|
||||||
|
|
||||||
When enabled the highlights defined in `signs.*.hl` and symbols defined in `signs.*.text` are
|
|
||||||
used.
|
|
||||||
'';
|
|
||||||
|
|
||||||
numhl = defaultNullOpts.mkBool false ''
|
|
||||||
Enable/disable line number highlights.
|
|
||||||
|
|
||||||
When enabled the highlights defined in `signs.*.numhl` are used.
|
|
||||||
If the highlight group does not exist, then it is automatically defined and linked to the
|
|
||||||
corresponding highlight group in `signs.*.hl`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
linehl = defaultNullOpts.mkBool false ''
|
|
||||||
Enable/disable line highlights.
|
|
||||||
|
|
||||||
When enabled the highlights defined in `signs.*.linehl` are used.
|
|
||||||
If the highlight group does not exist, then it is automatically defined and linked to the
|
|
||||||
corresponding highlight group in `signs.*.hl`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
diff_opts =
|
|
||||||
let
|
|
||||||
diffOptType = types.submodule {
|
|
||||||
freeformType = with types; attrsOf anything;
|
|
||||||
options = {
|
|
||||||
algorithm =
|
|
||||||
defaultNullOpts.mkEnumFirstDefault
|
|
||||||
[
|
|
||||||
"myers"
|
|
||||||
"minimal"
|
|
||||||
"patience"
|
|
||||||
"histogram"
|
|
||||||
]
|
|
||||||
''
|
|
||||||
Diff algorithm to use. Values:
|
|
||||||
- "myers" the default algorithm
|
|
||||||
- "minimal" spend extra time to generate the smallest possible diff
|
|
||||||
- "patience" patience diff algorithm
|
|
||||||
- "histogram" histogram diff algorithm
|
|
||||||
'';
|
|
||||||
|
|
||||||
internal = defaultNullOpts.mkBool false ''
|
|
||||||
Use Neovim's built in `xdiff` library for running diffs.
|
|
||||||
'';
|
|
||||||
|
|
||||||
indent_heuristic = defaultNullOpts.mkBool false ''
|
|
||||||
Use the indent heuristic for the internal diff library.
|
|
||||||
'';
|
|
||||||
|
|
||||||
vertical = defaultNullOpts.mkBool true ''
|
|
||||||
Start diff mode with vertical splits.
|
|
||||||
'';
|
|
||||||
|
|
||||||
linematch = mkNullOrOption types.int ''
|
|
||||||
Enable second-stage diff on hunks to align lines.
|
|
||||||
Requires `internal=true`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
ignore_blank_lines = defaultNullOpts.mkBool true ''
|
|
||||||
Ignore changes where lines are blank.
|
|
||||||
'';
|
|
||||||
|
|
||||||
ignore_whitespace_change = defaultNullOpts.mkBool true ''
|
|
||||||
Ignore changes in amount of white space.
|
|
||||||
It should ignore adding trailing white space, but not leading white space.
|
|
||||||
'';
|
|
||||||
|
|
||||||
ignore_whitespace = defaultNullOpts.mkBool true ''
|
|
||||||
Ignore all white space changes.
|
|
||||||
'';
|
|
||||||
|
|
||||||
ignore_whitespace_change_at_eol = defaultNullOpts.mkBool true ''
|
|
||||||
Ignore white space changes at end of line.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
|
||||||
mkNullOrOption diffOptType ''
|
|
||||||
Diff options.
|
|
||||||
If set to null they are derived from the vim `diffopt`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
base = mkNullOrOption types.str ''
|
|
||||||
The object/revision to diff against.
|
|
||||||
See `|gitsigns-revision|`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
count_chars =
|
|
||||||
defaultNullOpts.mkAttrsOf types.str
|
|
||||||
{
|
|
||||||
"__unkeyed_1" = "1";
|
|
||||||
"__unkeyed_2" = "2";
|
|
||||||
"__unkeyed_3" = "3";
|
|
||||||
"__unkeyed_4" = "4";
|
|
||||||
"__unkeyed_5" = "5";
|
|
||||||
"__unkeyed_6" = "6";
|
|
||||||
"__unkeyed_7" = "7";
|
|
||||||
"__unkeyed_8" = "8";
|
|
||||||
"__unkeyed_9" = "9";
|
|
||||||
"+" = ">";
|
|
||||||
}
|
|
||||||
''
|
|
||||||
The count characters used when `signs.*.show_count` is enabled.
|
|
||||||
The `+` entry is used as a fallback. With the default, any count outside of 1-9 uses the `>`
|
|
||||||
character in the sign.
|
|
||||||
|
|
||||||
Possible use cases for this field:
|
|
||||||
- to specify unicode characters for the counts instead of 1-9.
|
|
||||||
- to define characters to be used for counts greater than 9.
|
|
||||||
'';
|
|
||||||
|
|
||||||
status_formatter = defaultNullOpts.mkLuaFn ''
|
status_formatter = defaultNullOpts.mkLuaFn ''
|
||||||
function(status)
|
function(status)
|
||||||
local added, changed, removed = status.added, status.changed, status.removed
|
local added, changed, removed = status.added, status.changed, status.removed
|
||||||
|
|
@ -248,167 +40,4 @@ in
|
||||||
return table.concat(status_txt, ' ')
|
return table.concat(status_txt, ' ')
|
||||||
end
|
end
|
||||||
'' "Function used to format `b:gitsigns_status`.";
|
'' "Function used to format `b:gitsigns_status`.";
|
||||||
|
|
||||||
max_file_length = defaultNullOpts.mkUnsignedInt 40000 ''
|
|
||||||
Max file length (in lines) to attach to.
|
|
||||||
'';
|
|
||||||
|
|
||||||
preview_config =
|
|
||||||
defaultNullOpts.mkAttrsOf types.anything
|
|
||||||
{
|
|
||||||
border = "single";
|
|
||||||
style = "minimal";
|
|
||||||
relative = "cursor";
|
|
||||||
row = 0;
|
|
||||||
col = 1;
|
|
||||||
}
|
|
||||||
''
|
|
||||||
Option overrides for the Gitsigns preview window.
|
|
||||||
Table is passed directly to `nvim_open_win`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
auto_attach = defaultNullOpts.mkBool true ''
|
|
||||||
Automatically attach to files.
|
|
||||||
'';
|
|
||||||
|
|
||||||
attach_to_untracked = defaultNullOpts.mkBool true ''
|
|
||||||
Attach to untracked files.
|
|
||||||
'';
|
|
||||||
|
|
||||||
update_debounce = defaultNullOpts.mkUnsignedInt 100 ''
|
|
||||||
Debounce time for updates (in milliseconds).
|
|
||||||
'';
|
|
||||||
|
|
||||||
current_line_blame = defaultNullOpts.mkBool false ''
|
|
||||||
Adds an unobtrusive and customisable blame annotation at the end of the current line.
|
|
||||||
The highlight group used for the text is `GitSignsCurrentLineBlame`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
current_line_blame_opts = {
|
|
||||||
virt_text = defaultNullOpts.mkBool true ''
|
|
||||||
Whether to show a virtual text blame annotation
|
|
||||||
'';
|
|
||||||
|
|
||||||
virt_text_pos =
|
|
||||||
defaultNullOpts.mkEnumFirstDefault
|
|
||||||
[
|
|
||||||
"eol"
|
|
||||||
"overlay"
|
|
||||||
"right_align"
|
|
||||||
]
|
|
||||||
''
|
|
||||||
Blame annotation position.
|
|
||||||
|
|
||||||
Available values:
|
|
||||||
- `eol` Right after eol character.
|
|
||||||
- `overlay` Display over the specified column, without shifting the underlying text.
|
|
||||||
- `right_align` Display right aligned in the window.
|
|
||||||
'';
|
|
||||||
|
|
||||||
delay = defaultNullOpts.mkUnsignedInt 1000 ''
|
|
||||||
Sets the delay (in milliseconds) before blame virtual text is displayed.
|
|
||||||
'';
|
|
||||||
|
|
||||||
ignore_whitespace = defaultNullOpts.mkBool false ''
|
|
||||||
Ignore whitespace when running blame.
|
|
||||||
'';
|
|
||||||
|
|
||||||
virt_text_priority = defaultNullOpts.mkUnsignedInt 100 ''
|
|
||||||
Priority of virtual text.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
current_line_blame_formatter = defaultNullOpts.mkStr " <author>, <author_time> - <summary> " ''
|
|
||||||
String or function used to format the virtual text of `current_line_blame`.
|
|
||||||
|
|
||||||
When a string, accepts the following format specifiers:
|
|
||||||
- `<abbrev_sha>`
|
|
||||||
- `<orig_lnum>`
|
|
||||||
- `<final_lnum>`
|
|
||||||
- `<author>`
|
|
||||||
- `<author_mail>`
|
|
||||||
- `<author_time>` or `<author_time:FORMAT>`
|
|
||||||
- `<author_tz>`
|
|
||||||
- `<committer>`
|
|
||||||
- `<committer_mail>`
|
|
||||||
- `<committer_time>` or `<committer_time:FORMAT>`
|
|
||||||
- `<committer_tz>`
|
|
||||||
- `<summary>`
|
|
||||||
- `<previous>`
|
|
||||||
- `<filename>`
|
|
||||||
|
|
||||||
For `<author_time:FORMAT>` and `<committer_time:FORMAT>`, `FORMAT` can be any valid date
|
|
||||||
format that is accepted by `os.date()` with the addition of `%R` (defaults to `%Y-%m-%d`):
|
|
||||||
- `%a` abbreviated weekday name (e.g., Wed)
|
|
||||||
- `%A` full weekday name (e.g., Wednesday)
|
|
||||||
- `%b` abbreviated month name (e.g., Sep)
|
|
||||||
- `%B` full month name (e.g., September)
|
|
||||||
- `%c` date and time (e.g., 09/16/98 23:48:10)
|
|
||||||
- `%d` day of the month (16) [01-31]
|
|
||||||
- `%H` hour, using a 24-hour clock (23) [00-23]
|
|
||||||
- `%I` hour, using a 12-hour clock (11) [01-12]
|
|
||||||
- `%M` minute (48) [00-59]
|
|
||||||
- `%m` month (09) [01-12]
|
|
||||||
- `%p` either "am" or "pm" (pm)
|
|
||||||
- `%S` second (10) [00-61]
|
|
||||||
- `%w` weekday (3) [0-6 = Sunday-Saturday]
|
|
||||||
- `%x` date (e.g., 09/16/98)
|
|
||||||
- `%X` time (e.g., 23:48:10)
|
|
||||||
- `%Y` full year (1998)
|
|
||||||
- `%y` two-digit year (98) [00-99]
|
|
||||||
- `%%` the character `%´
|
|
||||||
- `%R` relative (e.g., 4 months ago)
|
|
||||||
|
|
||||||
When a function:
|
|
||||||
|
|
||||||
Parameters:
|
|
||||||
- `{name}` Git user name returned from `git config user.name`
|
|
||||||
- `{blame_info}` Table with the following keys:
|
|
||||||
- `abbrev_sha`: string
|
|
||||||
- `orig_lnum`: integer
|
|
||||||
- `final_lnum`: integer
|
|
||||||
- `author`: string
|
|
||||||
- `author_mail`: string
|
|
||||||
- `author_time`: integer
|
|
||||||
- `author_tz`: string
|
|
||||||
- `committer`: string
|
|
||||||
- `committer_mail`: string
|
|
||||||
- `committer_time`: integer
|
|
||||||
- `committer_tz`: string
|
|
||||||
- `summary`: string
|
|
||||||
- `previous`: string
|
|
||||||
- `filename`: string
|
|
||||||
- `boundary`: true?
|
|
||||||
|
|
||||||
Note that the keys map onto the output of:
|
|
||||||
`git blame --line-porcelain`
|
|
||||||
|
|
||||||
Return:
|
|
||||||
The result of this function is passed directly to the `opts.virt_text` field of
|
|
||||||
`|nvim_buf_set_extmark|` and thus must be a list of `[text, highlight]` tuples.
|
|
||||||
'';
|
|
||||||
|
|
||||||
current_line_blame_formatter_nc = defaultNullOpts.mkStr " <author>" ''
|
|
||||||
String or function used to format the virtual text of `|gitsigns-config-current_line_blame|`
|
|
||||||
for lines that aren't committed.
|
|
||||||
|
|
||||||
See `|gitsigns-config-current_line_blame_formatter|` for more information.
|
|
||||||
'';
|
|
||||||
|
|
||||||
trouble = mkNullOrOption types.bool ''
|
|
||||||
When using setqflist() or setloclist(), open Trouble instead of the
|
|
||||||
quickfix/location list window.
|
|
||||||
|
|
||||||
Default: `pcall(require, 'trouble')`
|
|
||||||
'';
|
|
||||||
|
|
||||||
word_diff = defaultNullOpts.mkBool false ''
|
|
||||||
Highlight intra-line word differences in the buffer.
|
|
||||||
Requires `config.diff_opts.internal = true`.
|
|
||||||
'';
|
|
||||||
|
|
||||||
debug_mode = defaultNullOpts.mkBool false ''
|
|
||||||
Enables debug logging and makes the following functions available: `dump_cache`,
|
|
||||||
`debug_messages`, `clear_debug`.
|
|
||||||
'';
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue