nix-community/nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-12-08 18:11:07 +01:00
Code Activity

treewide: remove old deprecation warnings

Browse source
This commit is contained in:
Gaetan Lepage 2025-12-07 11:46:51 +01:00 • committed by Gaétan Lepage
parent 629f9d75f8
commit 8441008175
72 changed files with 4 additions and 1506 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/diagnostic.nix
View file

@ -19,17 +19,6 @@ in
};
};
imports = [
# TODO: Added 2025-04-26; remove after 25.05
(lib.mkRenamedOptionModule [ "diagnostics" ] [ "diagnostic" "settings" ])
# TODO: Added 2025-04-30;
# The above rename initially renamed `diagnostics` -> `diagnostic.config`
# This rename covers any users who migrated between 2025-04-26 and 2025-04-30
# We can consider removing this rename earlier than usual
(lib.mkRenamedOptionModule [ "diagnostic" "config" ] [ "diagnostic" "settings" ])
];
config = {
extraConfigLuaPre = lib.mkIf (cfg.settings != { }) ''
vim.diagnostic.config(${lib.nixvim.toLuaObject cfg.settings})

8
plugins/by-name/chatgpt/default.nix
View file

@ -8,14 +8,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "curl" ];
# TODO: added 2025-04-06, remove after 25.05
imports = [
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "chatgpt";
packageName = "curl";
})
];
settingsOptions = {
api_key_cmd = lib.nixvim.defaultNullOpts.mkStr null ''
The path and arguments to an executable that returns the API key via stdout.

7
plugins/by-name/clangd-extensions/default.nix
View file

@ -13,13 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.jolars ];
# All of those warnings were introduced on 08/22/2023.
# TODO: Remove them in ~2 months (Oct. 2023).
imports = [ ./deprecations.nix ];
# TODO: introduced 2025-01-08: remove after 25.05
optionsRenamedToSettings = import ./renamed-options.nix;
settingsOptions =
let
mkBorderOpt = defaultNullOpts.mkBorder "none" "clangd-extensions";

84
plugins/by-name/clangd-extensions/deprecations.nix
View file

@ -1,84 +0,0 @@
{ lib, ... }:
let
inherit (lib) mkRemovedOptionModule mkRenamedOptionModule;
basePluginPath = [
"plugins"
"clangd-extensions"
];
in
{
imports = [
(mkRemovedOptionModule (basePluginPath ++ [ "server" ]) ''
To configure the `clangd` language server options, please use
`plugins.lsp.servers.clangd.extraSettings`.
'')
(mkRemovedOptionModule (
basePluginPath
++ [
"extensions"
"autoSetHints"
]
) "")
]
++ (map
(
optionPath:
mkRenamedOptionModule (basePluginPath ++ [ "extensions" ] ++ optionPath) (
basePluginPath ++ optionPath
)
)
[
[
"inlayHints"
"inline"
]
[
"inlayHints"
"onlyCurrentLine"
]
[
"inlayHints"
"onlyCurrentLineAutocmd"
]
[
"inlayHints"
"showParameterHints"
]
[
"inlayHints"
"parameterHintsPrefix"
]
[
"inlayHints"
"otherHintsPrefix"
]
[
"inlayHints"
"maxLenAlign"
]
[
"inlayHints"
"maxLenAlignPadding"
]
[
"inlayHints"
"rightAlign"
]
[
"inlayHints"
"rightAlignPadding"
]
[
"inlayHints"
"highlight"
]
[
"inlayHints"
"priority"
]
[ "ast" ]
[ "memoryUsage" ]
[ "symbolInfo" ]
]
);
}

33
plugins/by-name/clangd-extensions/renamed-options.nix
View file

@ -1,33 +0,0 @@
let
inlayHintsOptions = [
"inline"
"onlyCurrentLine"
"onlyCurrentLineAutocmd"
"showParameterHints"
"parameterHintsPrefix"
"otherHintsPrefix"
"maxLenAlign"
"maxLenAlignPadding"
"rightAlign"
"rightAlignPadding"
"highlight"
"priority"
];
astOptions = [
"roleIcons"
"kindIcons"
"highlights"
];
in
[
"memoryUsage"
"symbolInfo"
]
++ map (oldOption: [
"inlayHints"
oldOption
]) inlayHintsOptions
++ map (oldOption: [
"ast"
oldOption
]) astOptions

68
plugins/by-name/colorizer/default.nix
View file

@ -13,74 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-07-06: remove after 25.05
imports =
let
oldPluginPath = [
"plugins"
"nvim-colorizer"
];
newPluginPath = [
"plugins"
"colorizer"
];
# {
# old = ["userDefaultOptions" "RGB"]; }
# new = ["settings" "user_default_options" "RGB"];
# }
userOptsRenames =
map
(name: {
old = [
"userDefaultOptions"
name
];
new = [
"settings"
"user_default_options"
name
];
})
[
"RGB"
"RRGGBB"
"names"
"RRGGBBAA"
"AARRGGBB"
"rgb_fn"
"hsl_fn"
"tailwind"
"sass"
"virtualtext"
"virtualtext_inline"
"virtualtext_mode"
"always_update"
];
in
lib.nixvim.mkSettingsRenamedOptionModules oldPluginPath newPluginPath (
[
"enable"
"package"
{
old = "fileTypes";
new = [
"settings"
"filetypes"
];
}
{
old = "bufTypes";
new = [
"settings"
"buftypes"
];
}
]
++ userOptsRenames
);
settingsOptions =
let
colorizerOptions = {

8
plugins/by-name/committia/default.nix
View file

@ -15,14 +15,6 @@ lib.nixvim.plugins.mkVimPlugin {
dependencies = [ "git" ];
imports = [
# TODO: added 2025-04-06, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "committia";
packageName = "git";
})
];
settingsOptions = {
open_only_vim_starting = defaultNullOpts.mkFlagInt 1 ''
If `0`, committia.vim always attempts to open committia's buffer when `COMMIT_EDITMSG` buffer is opened.

7
plugins/by-name/copilot-cmp/default.nix
View file

@ -14,13 +14,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-12-19: remove after 25.05
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"event"
"fixPairs"
];
settingsOptions = {
event =
defaultNullOpts.mkListOf types.str

13
plugins/by-name/copilot-lua/default.nix
View file

@ -158,15 +158,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
};
};
# TODO: introduced 2025-05-17: remove after 25.11
imports = [
(lib.mkRemovedOptionModule [
"plugins"
"copilot-lua"
"nodePackage"
] "Use `dependencies.nodejs.package` instead to change the Node.js package.")
];
extraConfig = {
assertions = lib.nixvim.mkAssertions "plugins.copilot-lua" {
assertion = !config.plugins.copilot-vim.enable;
@ -181,8 +172,4 @@ lib.nixvim.plugins.mkNeovimPlugin {
pkgs.vimPlugins.copilot-lsp
];
};
# TODO: introduced 2025-01-07: remove after 25.05
deprecateExtraOptions = true;
optionsRenamedToSettings = import ./renamed-options.nix;
}

58
plugins/by-name/copilot-lua/renamed-options.nix
View file

@ -1,58 +0,0 @@
let
panelOptions = [
"enabled"
"autoRefresh"
];
panelKeymapOptions = [
"jumpPrev"
"jumpNext"
"accept"
"refresh"
"open"
];
panelLayoutOptions = [
"position"
"ratio"
];
suggestionOptions = [
"enabled"
"autoTrigger"
"debounce"
];
suggestionKeymapOptions = [
"accept"
"acceptWord"
"acceptLine"
"next"
"prev"
"dismiss"
];
in
[
"filetypes"
"copilotNodeCommand"
"serverOptsOverrides"
]
++ map (oldOption: [
"panel"
oldOption
]) panelOptions
++ map (oldOption: [
"panel"
"keymap"
oldOption
]) panelKeymapOptions
++ map (oldOption: [
"panel"
"layout"
oldOption
]) panelLayoutOptions
++ map (oldOption: [
"suggestion"
oldOption
]) suggestionOptions
++ map (oldOption: [
"suggestion"
"keymap"
oldOption
]) suggestionKeymapOptions

8
plugins/by-name/cornelis/default.nix
View file

@ -14,14 +14,6 @@ lib.nixvim.plugins.mkVimPlugin {
dependencies = [ "cornelis" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "cornelis";
packageName = "cornelis";
})
];
settingsOptions = {
use_global_binary = defaultNullOpts.mkFlagInt 0 ''
Whether to use global binary instead of stack.

14
plugins/by-name/crates/default.nix
View file

@ -8,19 +8,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
imports = [
{ cmpSourcePlugins.crates = "crates"; }
]
++
# TODO introduced 2024-12-12: remove after 25.05
lib.nixvim.mkSettingsRenamedOptionModules [ "plugins" "crates-nvim" ]
[ "plugins" "crates" ]
[
"enable"
"package"
{
old = "extraOptions";
new = "settings";
}
];
];
settingsOptions = { };

8
plugins/by-name/direnv/default.nix
View file

@ -15,14 +15,6 @@ lib.nixvim.plugins.mkVimPlugin {
dependencies = [ "direnv" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "direnv";
packageName = "direnv";
})
];
settingsOptions = {
direnv_auto = defaultNullOpts.mkFlagInt 1 ''
It will not execute `:DirenvExport` automatically if the value is `0`.

8
plugins/by-name/distant/default.nix
View file

@ -19,14 +19,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "distant" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "distant";
packageName = "distant";
})
];
settingsOptions = {
buffer = {
watch = {

37
plugins/by-name/floaterm/default.nix
View file

@ -14,43 +14,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO: Added 2024-12-16; remove after 25.05
optionsRenamedToSettings = [
"autoclose"
"autohide"
"autoinsert"
"borderchars"
"giteditor"
"height"
"opener"
"position"
"rootmarkers"
"shell"
"title"
"width"
"wintype"
]
++
map
(name: {
old = [
"keymaps"
name
];
new = "keymap_${name}";
})
[
"first"
"hide"
"kill"
"last"
"new"
"next"
"prev"
"show"
"toggle"
];
settingsOptions = {
shell = mkNullOrStr ''
Which shell should floaterm use.

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

@ -12,14 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "flutter" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "flutter-tools";
packageName = "flutter";
})
];
extraConfig = cfg: {
warnings = lib.nixvim.mkWarnings "plugins.flutter-tools" {
when =

8
plugins/by-name/fugitive/default.nix
View file

@ -11,13 +11,5 @@ lib.nixvim.plugins.mkVimPlugin {
dependencies = [ "git" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "fugitive";
packageName = "git";
})
];
# In typical tpope fashion, this plugin has no config options
}

51
plugins/by-name/fzf-lua/default.nix
View file

@ -1,8 +1,4 @@
{
config,
lib,
...
}:
{ lib, ... }:
let
inherit (lib) types mkOption;
settingsOptions = {
@ -38,22 +34,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "fzf" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "fzf-lua";
packageName = "fzf";
})
];
extraOptions = {
# TODO: deprecated 2024-08-29 remove after 24.11
iconsEnabled = mkOption {
type = types.bool;
description = "Toggle icon support. Installs nvim-web-devicons.";
visible = false;
};
profile = lib.nixvim.defaultNullOpts.mkEnumFirstDefault [
"default"
"fzf-native"
@ -106,39 +87,11 @@ lib.nixvim.plugins.mkNeovimPlugin {
};
};
extraConfig = cfg: opts: {
extraConfig = cfg: {
dependencies.skim.enable = lib.mkIf (cfg.profile == "skim" || cfg.settings.fzf_bin == "sk") (
lib.mkDefault true
);
# TODO: deprecated 2024-08-29 remove after 24.11
warnings = lib.nixvim.mkWarnings "plugins.fzf-lua" {
when = opts.iconsEnabled.isDefined;
message = ''
The option definition `plugins.fzf-lua.iconsEnabled' in ${lib.showFiles opts.iconsEnabled.files} has been deprecated; please remove it.
'';
};
# TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons =
lib.mkIf
(
opts.iconsEnabled.isDefined
&& cfg.iconsEnabled
&& !(
(
config.plugins.mini.enable
&& config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
)
)
{
enable = lib.mkOverride 1490 true;
};
plugins.fzf-lua.settings.__unkeyed_profile = cfg.profile;
keymaps = lib.mapAttrsToList (

8
plugins/by-name/git-conflict/default.nix
View file

@ -8,14 +8,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "git" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "git-conflict";
packageName = "git";
})
];
settingsOptions = {
default_mappings =
lib.nixvim.defaultNullOpts.mkNullable (with lib.types; either bool (attrsOf str)) true

8
plugins/by-name/git-worktree/default.nix
View file

@ -15,14 +15,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "git" ];
# TODO: added 2025-04-06, remove after 25.05
imports = [
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "git-worktree";
packageName = "git";
})
];
settingsOptions = {
change_directory_command = defaultNullOpts.mkStr "cd" ''
The vim command used to change to the new worktree directory.

8
plugins/by-name/gitblame/default.nix
View file

@ -13,14 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = with lib.maintainers; [ GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "gitblame";
packageName = "git";
})
];
dependencies = [ "git" ];
settingsOptions = {

28
plugins/by-name/gitgutter/default.nix
View file

@ -15,34 +15,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-12-16: remove after 25.05
optionsRenamedToSettings = import ./renamed-options.nix lib;
imports =
let
basePluginPath = [
"plugins"
"gitgutter"
];
in
[
(lib.mkRemovedOptionModule (
basePluginPath ++ [ "grep" ]
) "Please, use `plugins.gitgutter.grepPackage` and/or `plugins.gitgutter.settings.grep`.")
(lib.mkRemovedOptionModule (
basePluginPath
++ [
"signs"
"modifiedAbove"
]
) "This option has been removed from upstream")
# TODO: added 2025-04-06, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "gitgutter";
packageName = "git";
})
];
dependencies = [ "git" ];
extraOptions = {

9
plugins/by-name/gitlab/default.nix
View file

@ -15,15 +15,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "nodejs" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "gitlab";
packageName = "nodejs";
oldPackageName = "node";
})
];
settingsOptions = {
gitlab_url = defaultNullOpts.mkStr "https://gitlab.com" ''
The GitLab instance url to use if not `https://gitlab.com`.

25
plugins/by-name/gitmessenger/default.nix
View file

@ -16,31 +16,6 @@ lib.nixvim.plugins.mkVimPlugin {
dependencies = [ "git" ];
# TODO: Added 2024-12-16; remove after 25.05
optionsRenamedToSettings = [
"closeOnCursorMoved"
"includeDiff"
"gitCommand"
"noDefaultMappings"
"intoPopupAfterShow"
"alwaysIntoPopup"
"extraBlameArgs"
"previewMods"
"maxPopupHeight"
"maxPopupWidth"
"dateFormat"
"concealWordDiffMarker"
"floatingWinOps"
"popupContentMargins"
];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "gitmessenger";
packageName = "git";
})
];
settingsOptions = {
close_on_cursor_moved = defaultNullOpts.mkBool true ''
A popup window is no longer closed automatically when moving a cursor after the window is

8
plugins/by-name/gitsigns/default.nix
View file

@ -10,14 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-06, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "gitsigns";
packageName = "git";
})
];
dependencies = [ "git" ];
settingsOptions = import ./settings-options.nix lib;

8
plugins/by-name/glow/default.nix
View file

@ -14,14 +14,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "glow" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "glow";
packageName = "glow";
})
];
settingsOptions = {
glow_path = defaultNullOpts.mkStr (lib.nixvim.literalLua "vim.fn.exepath('glow')") ''
Path to `glow` binary.

8
plugins/by-name/godot/default.nix
View file

@ -9,14 +9,6 @@ lib.nixvim.plugins.mkVimPlugin {
dependencies = [ "godot" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "godot";
packageName = "godot";
})
];
settingsOptions = {
executable = lib.nixvim.defaultNullOpts.mkStr "godot" ''
Path to the `godot` executable.

8
plugins/by-name/hex/default.nix
View file

@ -9,14 +9,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "hex";
packageName = "xxd";
})
];
extraConfig = {
dependencies.xxd.enable = lib.mkDefault true;
};

8
plugins/by-name/image/default.nix
View file

@ -14,14 +14,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO: option deprecations added 2025-03-20. Remove after 25.05
# TODO: curlPackage and ueberzugPackage deprecations added 2025-04-06. Remove after 25.05
inherit (import ./deprecations.nix lib)
deprecateExtraOptions
optionsRenamedToSettings
imports
;
settingsOptions = {
backend =
defaultNullOpts.mkEnumFirstDefault

30
plugins/by-name/image/deprecations.nix
View file

@ -1,30 +0,0 @@
lib: {
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"backend"
"maxWidth"
"maxHeight"
"maxWidthWindowPercentage"
"maxHeightWindowPercentage"
"windowOverlapClearEnabled"
"windowOverlapClearFtIgnore"
"editorOnlyRenderWhenFocused"
"tmuxShowOnlyInActiveWindow"
"hijackFilePatterns"
];
imports = [
(lib.mkRemovedOptionModule [ "plugins" "image" "integrations" ] ''
Nixvim(plugins.image): The option `integrations` has been renamed to `settings.integrations`.
Warning: sub-options now have the same name as upstream (`clear_in_insert_mode`...).
'')
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "image";
packageName = "curl";
})
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "image";
packageName = "ueberzug";
})
];
}

10
plugins/by-name/inc-rename/default.nix
View file

@ -14,16 +14,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.jolars ];
# TODO: introduced 2025-01-08: remove after 25.05
optionsRenamedToSettings = [
"cmdName"
"hlGroup"
"previewEmptyName"
"showMessage"
"inputBufferType"
"postHook"
];
settingsOptions = {
cmd_name = defaultNullOpts.mkStr "IncRename" "The name of the command.";

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

@ -10,12 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO: Added 2025-04-07; remove after 25.05
inherit (import ./deprecations.nix lib)
imports
deprecateExtraOptions
;
extraOptions = {
jdtLanguageServerPackage = lib.mkPackageOption pkgs "jdt-language-server" {
nullable = true;

49
plugins/by-name/jdtls/deprecations.nix
View file

@ -1,49 +0,0 @@
lib: {
deprecateExtraOptions = true;
imports =
let
oldPluginPath = [
"plugins"
"nvim-jdtls"
];
newPluginPath = [
"plugins"
"jdtls"
];
settingsOptions = {
cmd = "cmd";
rootDir = "root_dir";
settings = "settings";
initOptions = "init_options";
};
renamedOptions = lib.nixvim.mkSettingsRenamedOptionModules oldPluginPath newPluginPath (
[
"enable"
"package"
{
old = "jdtLanguageServerPackage";
new = "jdtLanguageServerPackage";
}
]
++ (lib.mapAttrsToList (old: new_: {
inherit old;
new = [
"settings"
new_
];
}) settingsOptions)
);
in
renamedOptions
++ [
(lib.mkRemovedOptionModule (oldPluginPath ++ [ "data" ]) ''
Please, directly add the necessary `"-data"` flag and its argument to `plugins.jdtls.settings.cmd`
'')
(lib.mkRemovedOptionModule (oldPluginPath ++ [ "configuration" ]) ''
Please, directly add the necessary `"-configuration"` flag and its argument to `plugins.jdtls.settings.cmd`
'')
];
}

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

@ -19,18 +19,6 @@ lib.nixvim.plugins.mkVimPlugin {
"lazygit"
];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "lazygit";
packageName = "git";
})
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "lazygit";
packageName = "lazygit";
})
];
settingsOptions = {
floating_window_winblend = defaultNullOpts.mkNullable (types.ints.between 0 100) 0 ''
Set the transparency of the floating window.

11
plugins/by-name/lean/default.nix
View file

@ -14,14 +14,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "lean" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "lean";
packageName = "lean";
})
];
settingsOptions = {
stderr = {
on_lines = defaultNullOpts.mkLuaFn "nil" ''
@ -59,7 +51,4 @@ lib.nixvim.plugins.mkNeovimPlugin {
};
};
};
# TODO: Deprecated in 2025-01-31
inherit (import ./deprecations.nix) deprecateExtraOptions optionsRenamedToSettings;
}

109
plugins/by-name/lean/deprecations.nix
View file

@ -1,109 +0,0 @@
{
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"lsp"
[
"ft"
"default"
]
[
"ft"
"nomodifiable"
]
[
"abbreviations"
"enable"
]
[
"abbreviations"
"extra"
]
[
"abbreviations"
"leader"
]
"mappings"
[
"infoview"
"autoopen"
]
[
"infoview"
"autopause"
]
[
"infoview"
"width"
]
[
"infoview"
"height"
]
[
"infoview"
"horizontalPosition"
]
[
"infoview"
"separateTab"
]
[
"infoview"
"indicators"
]
[
"infoview"
"lean3"
"showFilter"
]
[
"infoview"
"lean3"
"mouseEvents"
]
[
"infoview"
"showProcessing"
]
[
"infoview"
"showNoInfoMessage"
]
[
"infoview"
"useWidgets"
]
[
"infoview"
"mappings"
]
[
"progressBars"
"enable"
]
[
"progressBars"
"priority"
]
[
"stderr"
"enable"
]
[
"stderr"
"height"
]
[
"stderr"
"onLines"
]
[
"lsp3"
"enable"
]
[
"lsp3"
"onAttach"
]
];
}

8
plugins/by-name/ledger/default.nix
View file

@ -10,14 +10,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "ledger";
packageName = "ledger";
})
];
dependencies = [ "ledger" ];
settingsExample = {

9
plugins/by-name/llm/default.nix
View file

@ -12,15 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "llm-ls" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "llm";
packageName = "llm-ls";
oldPackageName = "llmLs";
})
];
extraConfig = {
# If not setting this option, llm.nvim will try to download the llm-ls binary from the internet.
plugins.llm.settings.lsp.bin_path =

8
plugins/by-name/lualine/default.nix
View file

@ -10,14 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ];
imports = [
# TODO: added 2025-04-06, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "lualine";
packageName = "git";
})
];
dependencies = [ "git" ];
settingsOptions =

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

@ -9,18 +9,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "neogit";
packageName = "git";
})
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "neogit";
packageName = "which";
})
];
dependencies = [
"git"
{

37
plugins/by-name/neorg/default.nix
View file

@ -19,43 +19,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-12-12: remove after 25.05
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"lazyLoading"
[
"logger"
"plugin"
]
[
"logger"
"useConsole"
]
[
"logger"
"highlights"
]
[
"logger"
"useFile"
]
[
"logger"
"level"
]
[
"logger"
"floatPrecision"
]
{
old = "modules";
new = "load";
}
];
imports = [
./deprecations.nix
];
extraOptions = {
telescopeIntegration = {
enable = lib.mkEnableOption "`neorg-telescope` plugin for telescope integration.";

25
plugins/by-name/neorg/deprecations.nix
View file

@ -1,25 +0,0 @@
{ lib, ... }:
let
basePluginPath = [
"plugins"
"neorg"
];
in
{
imports = [
(lib.mkRemovedOptionModule (
basePluginPath
++ [
"logger"
"modes"
]
) "Please use `settings.logger.modes` but you now need to provide a list of submodules.")
(lib.mkRenamedOptionModule (basePluginPath ++ [ "neorgTelescopePackage" ]) (
basePluginPath
++ [
"telescopeIntegration"
"package"
]
))
];
}

6
plugins/by-name/nvim-tree/deprecations.nix
View file

@ -17,12 +17,6 @@ lib: {
"root_folder_label"
] (config: !lib.getAttrFromPath oldOptPath config)
)
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "nvim-tree";
packageName = "git";
})
];
# Deprecations after mkNeovimPlugin migration, added 2025-07-21

8
plugins/by-name/octo/default.nix
View file

@ -15,14 +15,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "gh" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "octo";
packageName = "gh";
})
];
settingsOptions = {
use_local_fs = defaultNullOpts.mkBool false ''
Use local files on right side of reviews.

3
plugins/by-name/openscad/default.nix
View file

@ -19,9 +19,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO: Added 2024-12-17; remove after 25.05
optionsRenamedToSettings = import ./renamed-options.nix;
settingsOptions = {
fuzzy_finder = defaultNullOpts.mkStr "skim" ''
Fuzzy finder to find documentation.

48
plugins/by-name/openscad/renamed-options.nix
View file

@ -1,48 +0,0 @@
[
"fuzzyFinder"
"cheatsheetWindowBlend"
"loadSnippets"
"autoOpen"
{
old = [
"keymaps"
"enabled"
];
new = "default_mappings";
}
{
old = [
"keymaps"
"cheatsheetToggle"
];
new = "cheatsheet_toggle_key";
}
{
old = [
"keymaps"
"helpTrigger"
];
new = "help_trig_key";
}
{
old = [
"keymaps"
"helpManualTrigger"
];
new = "help_manual_trig_key";
}
{
old = [
"keymaps"
"execOpenSCADTrigger"
];
new = "exec_openscad_trig_key";
}
{
old = [
"keymaps"
"topToggle"
];
new = "top_toggle";
}
]

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

@ -9,12 +9,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
# papis.nvim is an nvim-cmp source too
imports = [
{ cmpSourcePlugins.papis = "papis"; }
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "yq";
packageName = "yq";
})
];
dependencies = [ "yq" ];

8
plugins/by-name/pckr/default.nix
View file

@ -14,14 +14,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "git" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "pckr";
packageName = "git";
})
];
extraOptions = {
plugins = lib.mkOption {
default = [ ];

25
plugins/by-name/persistence/default.nix
View file

@ -9,31 +9,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.jolars ];
# TODO: introduced 2025-01-08: remove after 25.05
optionsRenamedToSettings = [
"dir"
];
imports =
let
basePluginPath = [
"plugins"
"persistence"
];
in
map
(
option:
lib.mkRemovedOptionModule (basePluginPath ++ [ option ]) ''
This option has been deprecated upstream. The plugin now provides
user events to hook into instead.
''
)
[
"options"
"preSave"
"saveEmpty"
];
settingsOptions = {
branch = defaultNullOpts.mkBool true ''
Use git branch to save session.

8
plugins/by-name/plantuml-syntax/default.nix
View file

@ -12,14 +12,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "plantuml-syntax";
packageName = "plantuml";
})
];
dependencies = [ "plantuml" ];
settingsOptions = {

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

@ -1,6 +1,6 @@
{ config, lib, ... }:
let
inherit (lib) mkRemovedOptionModule types;
inherit (lib) types;
inherit (lib.nixvim) defaultNullOpts;
in
lib.nixvim.plugins.mkNeovimPlugin {
@ -11,51 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-04-07: remove 2024-06-07
deprecateExtraOptions = true;
optionsRenamedToSettings = import ./renamed-options.nix;
imports =
let
basePluginPath = [
"plugins"
"rest"
];
in
[
(mkRemovedOptionModule
(
basePluginPath
++ [
"result"
"showStatistics"
]
)
''
Use `plugins.rest.settings.result.behavior.statistics.{enable,stats}` instead.
Refer to the documentation for more information.
''
)
# TODO: added 2025-04-06: remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "rest";
packageName = "curl";
})
]
++
map
(
option:
mkRemovedOptionModule (basePluginPath ++ [ option ]) ''
This option has been deprecated upstream.
''
)
[
"jumpToRequest"
"yankDryRun"
"searchBack"
];
dependencies = [ "curl" ];
settingsOptions = {

105
plugins/by-name/rest/renamed-options.nix
View file

@ -1,105 +0,0 @@
[
"envFile"
"encodeUrl"
"skipSslVerification"
"customDynamicVariables"
[
"highlight"
"timeout"
]
{
old = "resultSplitHorizontal";
new = [
"result"
"split"
"horizontal"
];
}
{
old = "resultSplitInPlace";
new = [
"result"
"split"
"in_place"
];
}
{
old = "stayInCurrentWindowAfterSplit";
new = [
"result"
"split"
"stay_in_current_window_after_split"
];
}
{
old = [
"result"
"showUrl"
];
new = [
"result"
"behavior"
"show_info"
"url"
];
}
{
old = [
"result"
"showHeaders"
];
new = [
"result"
"behavior"
"show_info"
"headers"
];
}
{
old = [
"result"
"showHttpInfo"
];
new = [
"result"
"behavior"
"show_info"
"http_info"
];
}
{
old = [
"result"
"showCurlCommand"
];
new = [
"result"
"behavior"
"show_info"
"curl_command"
];
}
{
old = [
"result"
"formatters"
];
new = [
"result"
"behavior"
"formatters"
];
}
{
old = [
"highlight"
"enabled"
];
new = [
"highlight"
"enable"
];
}
]

8
plugins/by-name/rustaceanvim/default.nix
View file

@ -10,14 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
dependencies = [ "rust-analyzer" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "godot";
packageName = "rust-analyzer";
oldPackageName = "rustAnalyzer";
})
];
settingsOptions = import ./settings-options.nix { inherit lib; };

9
plugins/by-name/sg/default.nix
View file

@ -16,15 +16,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "nodejs" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "sg";
packageName = "nodejs";
oldPackageName = "node";
})
];
extraConfig = {
plugins.sg.settings.node_executable = lib.mkIf config.dependencies.nodejs.enable (
lib.mkDefault (lib.getExe config.dependencies.nodejs.package)

15
plugins/by-name/spectre/default.nix
View file

@ -13,21 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "spectre";
packageName = "ripgrep";
oldPackageName = "find";
})
(lib.mkRemovedOptionModule [ "plugins" "spectre" "replacePackage" ] ''
If you have set `plugins.spectre.settings.default.find.cmd` to "sed" (or "sd" respectively), Nixvim will automatically enable `dependencies.sed.enable` (or `sd` respectively).
- If you want to disable automatic installation of the replace tool, set `dependencies.s[e]d.enable` to `false`.
- If you want to override which package is installed by Nixvim, set the `dependencies.s[e]d.package` option.
'')
];
dependencies =
let
defaults = config.plugins.spectre.settings.default;

11
plugins/by-name/tagbar/default.nix
View file

@ -9,17 +9,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-02-12: remove 2024-04-12
deprecateExtraConfig = true;
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "tagbar";
packageName = "ctags";
oldPackageName = "tags";
})
];
dependencies = [ "ctags" ];
settingsExample = {

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

@ -21,12 +21,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
imports = [
./extensions
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "telescope";
packageName = "bat";
})
];
dependencies = [ "bat" ];

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

@ -14,19 +14,6 @@ mkExtension {
dependencies = [ "ripgrep" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = [
"telescope"
"extensions"
"live-grep-args"
];
packageName = "ripgrep";
oldPackageName = "grep";
})
];
settingsOptions = {
auto_quoting = defaultNullOpts.mkBool true ''
Enable or disable auto quoting of searches.

12
plugins/by-name/telescope/extensions/manix.nix
View file

@ -11,18 +11,6 @@ mkExtension {
name = "manix";
package = "telescope-manix";
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = [
"telescope"
"extensions"
"manix"
];
packageName = "manix";
})
];
dependencies = [ "manix" ];
settingsOptions = {

8
plugins/by-name/texpresso/default.nix
View file

@ -9,12 +9,4 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.nickhu ];
dependencies = [ "texpresso" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "texpresso";
packageName = "texpresso";
})
];
}

8
plugins/by-name/todo-comments/default.nix
View file

@ -22,14 +22,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "ripgrep" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "todo-comments";
packageName = "ripgrep";
})
];
settingsOptions = {
signs = defaultNullOpts.mkBool true "Show icons in the signs column.";

28
plugins/by-name/treesitter/default.nix
View file

@ -180,34 +180,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ];
imports =
let
basePluginPath = [
"plugins"
"treesitter"
];
in
[
(lib.mkRenamedOptionModule (basePluginPath ++ [ "moduleConfig" ]) (
basePluginPath ++ [ "settings" ]
))
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "treesitter";
packageName = "gcc";
})
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "treesitter";
packageName = "nodejs";
})
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "treesitter";
packageName = "tree-sitter";
oldPackageName = "treesitter";
})
];
dependencies = lib.map (name: {
inherit name;
enable = !config.plugins.treesitter.nixGrammars;

12
plugins/by-name/typst-preview/default.nix
View file

@ -10,18 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "typst-preview";
packageName = "tinymist";
})
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "typst-preview";
packageName = "websocat";
})
];
dependencies = [
"tinymist"
"websocat"

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

@ -12,14 +12,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "typst-vim";
packageName = "typst";
})
];
dependencies = [ "typst" ];
extraOptions = {

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

@ -14,43 +14,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
# TODO: Added 2024-12-16; remove after 25.05
optionsRenamedToSettings = import ./renamed-options.nix;
imports =
let
basePluginPath = [
"plugins"
"vim-matchup"
];
in
[
(lib.mkRenamedOptionModule
(
basePluginPath
++ [
"matchParen"
"deffered"
]
)
(
basePluginPath
++ [
"settings"
"matchparen_deferred"
]
)
)
]
++ (lib.nixvim.mkSettingsRenamedOptionModules (basePluginPath ++ [ "treesitterIntegration" ])
(basePluginPath ++ [ "treesitter" ])
[
"enable"
"disable"
"disableVirtualText"
"includeMatchWords"
]
);
extraOptions = {
treesitter = lib.nixvim.mkSettingsOption {
description = ''

130
plugins/by-name/vim-matchup/renamed-options.nix
View file

@ -1,130 +0,0 @@
[
{
old = "enableSurround";
new = "surround_enabled";
}
{
old = "enableTransmute";
new = "transmute_enabled";
}
"delimStopline"
{
old = "delimNoSkips";
new = "delim_noskips";
}
{
old = [
"motion"
"enable"
];
new = "motion_enabled";
}
{
old = [
"motion"
"cursorEnd"
];
new = "motion_cursor_end";
}
{
old = [
"motion"
"overrideNPercent"
];
new = "motion_override_Npercent";
}
{
old = [
"textObj"
"enable"
];
new = "text_obj_enabled";
}
{
old = [
"textObj"
"linewiseOperators"
];
new = "text_obj_linewise_operators";
}
{
old = [
"matchParen"
"enable"
];
new = "matchparen_enabled";
}
{
old = [
"matchParen"
"fallback"
];
new = "matchparen_fallback";
}
{
old = [
"matchParen"
"singleton"
];
new = "matchparen_singleton";
}
{
old = [
"matchParen"
"offscreen"
];
new = "matchparen_offscreen";
}
{
old = [
"matchParen"
"stopline"
];
new = "matchparen_stopline";
}
{
old = [
"matchParen"
"timeout"
];
new = "matchparen_timeout";
}
{
old = [
"matchParen"
"insertTimeout"
];
new = "matchparen_insert_timeout";
}
{
old = [
"matchParen"
"deferred"
"enable"
];
new = "matchparen_deferred";
}
{
old = [
"matchParen"
"deferred"
"showDelay"
];
new = "matchparen_deferred_show_delay";
}
{
old = [
"matchParen"
"deferred"
"hideDelay"
];
new = "matchparen_deferred_hide_delay";
}
{
old = [
"matchParen"
"hiSurroundAlways"
];
new = "matchparen_deferred_hi_surround_always";
}
]

8
plugins/by-name/vimux/default.nix
View file

@ -8,14 +8,6 @@ lib.nixvim.plugins.mkVimPlugin {
dependencies = [ "tmux" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "tmux";
packageName = "tmux";
})
];
settingsOptions = import ./settings-options.nix lib;
settingsExample = {

8
plugins/by-name/wezterm/default.nix
View file

@ -14,14 +14,6 @@ lib.nixvim.plugins.neovim.mkNeovimPlugin {
dependencies = [ "wezterm" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "wezterm";
packageName = "wezterm";
})
];
settingsOptions = {
create_commands = defaultNullOpts.mkBool true ''
Whether to create plugin commands.

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

@ -22,14 +22,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "yazi" ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "yazi";
packageName = "yazi";
})
];
settingsOptions = {
log_level = defaultNullOpts.mkLogLevel' {
pluginDefault = "off";

8
plugins/by-name/zk/default.nix
View file

@ -13,14 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ];
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "zk";
packageName = "zk";
})
];
dependencies = [ "zk" ];
settingsOptions = {

7
plugins/cmp/sources/default.nix
View file

@ -53,13 +53,6 @@ let
pluginName = "cmp-fish";
sourceName = "fish";
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "cmp-fish";
packageName = "fish";
})
];
extraConfig = {
dependencies.fish.enable = lib.mkDefault true;
};

11
plugins/lsp/language-servers/default.nix
View file

@ -15,17 +15,6 @@ let
settings = cfg: { dart = cfg; };
};
gopls = {
imports = [
# TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = [
"lsp"
"servers"
"gopls"
];
packageName = "go";
})
];
extraConfig = {
dependencies.go.enable = lib.mkDefault true;
};