1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-11-08 19:46:06 +01:00

plugins: remove deprecations "after 24.11" or less

Signed-off-by: saygo-png <saygo.mail@proton.me>
This commit is contained in:
saygo-png 2025-10-18 03:34:02 +02:00 committed by Matt Sturgeon
parent be72c48997
commit 29ec33e1a8
86 changed files with 27 additions and 3578 deletions

View file

@ -3,10 +3,6 @@
config,
...
}:
let
inherit (lib) flatten mapAttrsToList mkRemovedOptionModule;
inherit (lib.nixvim) mkDeprecatedSubOptionModule;
in
lib.nixvim.plugins.mkNeovimPlugin {
name = "gitsigns";
package = "gitsigns-nvim";
@ -14,72 +10,13 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO: introduced 2024-03-12, remove on 2024-05-12
deprecateExtraOptions = true;
optionsRenamedToSettings = import ./renamed-options.nix;
imports =
let
basePluginPaths = [
"plugins"
"gitsigns"
];
settingsPath = basePluginPaths ++ [ "settings" ];
highlights = {
add = "Add";
change = "Change";
delete = "Delete";
topdelete = "Topdelete";
changedelete = "Changedelete";
untracked = "Untracked";
};
subHighlights = {
hl = "";
linehl = "Ln";
numhl = "Nr";
};
highlightRemovals = flatten (
mapAttrsToList (
opt: hlg:
mapAttrsToList (subOpt: subHlg: {
optionPath = settingsPath ++ [
"signs"
opt
subOpt
];
hlg = "GitSigns${hlg}${subHlg}";
}) subHighlights
) highlights
);
in
(map (
{ optionPath, hlg }:
mkDeprecatedSubOptionModule optionPath "Please define the `${hlg}` highlight group instead."
) highlightRemovals)
++ [
(mkRemovedOptionModule (
basePluginPaths
++ [
"watchGitDir"
"interval"
]
) "The option has been removed from upstream.")
(mkDeprecatedSubOptionModule (
settingsPath
++ [
"yadm"
"enable"
]
) "yadm support was removed upstream.")
# TODO: added 2025-04-06, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "gitsigns";
packageName = "git";
})
];
imports = [
# TODO: added 2025-04-06, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "gitsigns";
packageName = "git";
})
];
dependencies = [ "git" ];

View file

@ -1,156 +0,0 @@
[
[
"signs"
"add"
"text"
]
[
"signs"
"add"
"showCount"
]
[
"signs"
"change"
"text"
]
[
"signs"
"change"
"showCount"
]
[
"signs"
"topdelete"
"text"
]
[
"signs"
"topdelete"
"showCount"
]
[
"signs"
"changedelete"
"text"
]
[
"signs"
"changedelete"
"showCount"
]
[
"signs"
"untracked"
"text"
]
[
"signs"
"untracked"
"showCount"
]
"worktrees"
"signPriority"
"signcolumn"
"numhl"
"linehl"
"showDeleted"
[
"diffOpts"
"algorithm"
]
[
"diffOpts"
"internal"
]
[
"diffOpts"
"indentHeuristic"
]
[
"diffOpts"
"vertical"
]
[
"diffOpts"
"linematch"
]
"base"
"countChars"
"maxFileLength"
"previewConfig"
"attachToUntracked"
"updateDebounce"
"currentLineBlame"
[
"currentLineBlameOpts"
"virtText"
]
[
"currentLineBlameOpts"
"virtTextPos"
]
[
"currentLineBlameOpts"
"delay"
]
[
"currentLineBlameOpts"
"ignoreWhitespace"
]
[
"currentLineBlameOpts"
"virtTextPriority"
]
"trouble"
"wordDiff"
"debugMode"
{
old = [
"onAttach"
"function"
];
new = "on_attach";
}
{
old = [
"watchGitDir"
"enable"
];
new = [
"watch_gitdir"
"enable"
];
}
{
old = [
"watchGitDir"
"followFiles"
];
new = [
"watch_gitdir"
"follow_files"
];
}
{
old = [
"statusFormatter"
"function"
];
new = "status_formatter";
}
{
old = [
"currentLineBlameFormatter"
"normal"
];
new = "current_line_blame_formatter";
}
{
old = [
"currentLineBlameFormatter"
"nonCommitted"
];
new = "current_line_blame_formatter_nc";
}
]