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

plugins: remove deprecations "after 24.11" or less

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

39
plugins/by-name/airline/default.nix
View file

@ -13,45 +13,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"sectionA"
"sectionB"
"sectionC"
"sectionX"
"sectionY"
"sectionZ"
"experimental"
"leftSep"
"rightSep"
"detectModified"
"detectPaste"
"detectCrypt"
"detectSpell"
"detectSpelllang"
"detectIminsert"
"inactiveCollapse"
"inactiveAltSep"
"theme"
"themePatchFunc"
"powerlineFonts"
"symbolsAscii"
"modeMap"
"excludeFilenames"
"excludeFiletypes"
"filetypeOverrides"
"excludePreview"
"disableStatusline"
"skipEmptySections"
"highlightingCache"
"focuslostInactive"
"statuslineOntop"
"stlPathStyle"
"sectionCOnlyFilename"
"symbols"
];
settingsOptions = settingsOptions =
(lib.listToAttrs ( (lib.listToAttrs (
map map

60
plugins/by-name/auto-save/default.nix
View file

@ -10,30 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.braindefender ]; maintainers = [ lib.maintainers.braindefender ];
# TODO: introduced 2024-06-21, remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = [
[
"executionMessage"
"message"
]
[
"executionMessage"
"dim"
]
[
"executionMessage"
"cleaningInterval"
]
"triggerEvents"
"writeAllBuffers"
"debounceDelay"
{
old = "enableAutoSave";
new = "enabled";
}
];
imports = [ imports = [
(lib.mkRemovedOptionModule [ "plugins" "auto-save" "keymaps" ] '' (lib.mkRemovedOptionModule [ "plugins" "auto-save" "keymaps" ] ''
Use the top-level `keymaps` option to create a keymap that runs :ASToggle Use the top-level `keymaps` option to create a keymap that runs :ASToggle
@ -139,40 +115,4 @@ lib.nixvim.plugins.mkNeovimPlugin {
write_all_buffers = true; write_all_buffers = true;
debounce_delay = 1000; debounce_delay = 1000;
}; };
extraConfig = cfg: {
# TODO: introduced 2024-10-15: remove after 24.11
warnings =
let
definedOpts = lib.filter (opt: lib.hasAttrByPath (lib.toList opt) cfg.settings) [
[
"execution_message"
"enabled"
]
[
"execution_message"
"message"
]
[
"execution_message"
"dim"
]
[
"execution_message"
"cleaning_interval"
]
[
"trigger_events"
"cancel_defered_save"
]
];
in
lib.nixvim.mkWarnings "plugins.auto-save" {
when = definedOpts != [ ];
message = ''
The following settings options are no longer supported.
Check the plugin documentation for more details.:
${lib.concatMapStringsSep "\n" (opt: " - ${lib.showOption (lib.toList opt)}") definedOpts}
'';
};
};
} }

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

@ -13,15 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: added 204-10-05 remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = import ./renamed-options.nix;
imports = [
(lib.mkRemovedOptionModule [ "plugins" "auto-session" "cwdChangeHandling" ] ''
Please switch to `cwd_change_handling` with just a boolean value.
'')
];
settingsOptions = { settingsOptions = {
enabled = defaultNullOpts.mkBool true '' enabled = defaultNullOpts.mkBool true ''
Enables/disables auto creating, saving and restoring. Enables/disables auto creating, saving and restoring.

90
plugins/by-name/auto-session/renamed-options.nix
View file

@ -1,90 +0,0 @@
[
"logLevel"
[
"sessionLens"
"loadOnSetup"
]
[
"sessionLens"
"themeConf"
]
[
"sessionLens"
"previewer"
]
[
"sessionControl"
"controlDir"
]
[
"sessionControl"
"controlFilename"
]
{
old = [
"autoSave"
"enabled"
];
new = "auto_save";
}
{
old = [
"autoRestore"
"enabled"
];
new = "auto_auto_restore";
}
{
old = "bypassSessionSaveFileTypes";
new = "bypass_save_filetypes";
}
{
old = [
"autoSession"
"enableLastSession"
];
new = "auto_restore_last_session";
}
{
old = [
"autoSession"
"rootDir"
];
new = "root_dir";
}
{
old = [
"autoSession"
"enabled"
];
new = "enabled";
}
{
old = [
"autoSession"
"createEnabled"
];
new = "auto_create";
}
{
old = [
"autoSession"
"suppressDirs"
];
new = "suppressed_dirs";
}
{
old = [
"autoSession"
"allowedDirs"
];
new = "allowed_dirs";
}
{
old = [
"autoSession"
"useGitBranch"
];
new = "use_git_branch";
}
]

132
plugins/by-name/barbar/default.nix
View file

@ -53,138 +53,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-05-30, remove on 2024-07-30
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"animation"
"autoHide"
"clickable"
"focusOnClose"
[
"hide"
"alternate"
]
[
"hide"
"current"
]
[
"hide"
"extensions"
]
[
"hide"
"inactive"
]
[
"hide"
"visible"
]
"highlightAlternate"
"highlightInactiveFileIcons"
"highlightVisible"
[
"icons"
"bufferIndex"
]
[
"icons"
"bufferNumber"
]
[
"icons"
"button"
]
[
"icons"
"filetype"
"customColors"
]
[
"icons"
"separator"
"left"
]
[
"icons"
"separator"
"right"
]
"insertAtStart"
"insertAtEnd"
"maximumPadding"
"minimumPadding"
"maximumLength"
"semanticLetters"
"letters"
"sidebarFiletypes"
"noNameTitle"
"tabpages"
{
old = "excludeFileTypes";
new = "exclude_ft";
}
{
old = "excludeFileNames";
new = "exclude_name";
}
{
old = [
"icons"
"filetype"
"enable"
];
new = [
"icons"
"filetype"
"enabled"
];
}
];
imports =
let
basePluginPath = [
"plugins"
"barbar"
];
in
[
(mkRemovedOptionModule (
basePluginPath
++ [
"keymaps"
"silent"
]
) "Keymaps will be silent anyways. This option has always been useless.")
(mkRemovedOptionModule (
basePluginPath
++ [
"icons"
"diagnostics"
]
) "Use `settings.icons.diagnostics` instead, but pay attention as the keys have changed.")
]
++
map
(
name:
mkRemovedOptionModule (
basePluginPath
++ [
"icons"
name
]
) "Use `settings.icons.${name}` instead, but you should now use the real `snake_case` key names."
)
[
"alternate"
"current"
"inactive"
"modified"
"pinned"
"visible"
];
extraOptions = { extraOptions = {
keymaps = mapAttrs ( keymaps = mapAttrs (
optionName: funcName: optionName: funcName:

38
plugins/by-name/barbecue/default.nix
View file

@ -9,44 +9,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: added 2024-09-03 remove after 24.11
optionsRenamedToSettings = [
"attachNavic"
"createAutocmd"
"includeBuftypes"
"excludeFiletypes"
[
"modifiers"
"dirname"
]
[
"modifiers"
"basename"
]
"showDirname"
"showBasename"
"showModified"
"modified"
"showNavic"
"leadCustomSection"
"customSection"
"theme"
"contextFollowIconColor"
[
"symbols"
"modified"
]
[
"symbols"
"ellipsis"
]
[
"symbols"
"separator"
]
"kinds"
];
settingsOptions = { settingsOptions = {
attach_navic = defaultNullOpts.mkBool true '' attach_navic = defaultNullOpts.mkBool true ''
Whether to attach navic to language servers automatically. Whether to attach navic to language servers automatically.

25
plugins/by-name/better-escape/default.nix
View file

@ -12,31 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-07-23. Remove after 24.11 release.
deprecateExtraOptions = true;
optionsRenamedToSettings = [ "timeout" ];
imports =
let
basePluginPath = [
"plugins"
"better-escape"
];
in
[
(mkRemovedOptionModule (basePluginPath ++ [ "clearEmptyLines" ]) ''
This option has been removed upstream.
See the [upstream README](https://github.com/max397574/better-escape.nvim?tab=readme-ov-file#rewrite) for additional information.
'')
(mkRemovedOptionModule (basePluginPath ++ [ "keys" ]) ''
This option has been removed upstream.
See the [upstream README](https://github.com/max397574/better-escape.nvim?tab=readme-ov-file#rewrite) for additional information.
'')
(mkRemovedOptionModule (basePluginPath ++ [ "mapping" ]) ''
This option has been removed in favor of `plugins.better-escape.settings.mapping`.
See the [upstream README](https://github.com/max397574/better-escape.nvim?tab=readme-ov-file#rewrite) for additional information.
'')
];
settingsOptions = { settingsOptions = {
timeout = helpers.defaultNullOpts.mkStrLuaOr types.ints.unsigned "vim.o.timeoutlen" '' timeout = helpers.defaultNullOpts.mkStrLuaOr types.ints.unsigned "vim.o.timeoutlen" ''
The time in which the keys must be hit in ms. The time in which the keys must be hit in ms.

157
plugins/by-name/bufferline/default.nix
View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
let let
inherit (lib) types; inherit (lib) types;
inherit (lib.nixvim) defaultNullOpts mkSettingsRenamedOptionModules; inherit (lib.nixvim) defaultNullOpts;
in in
lib.nixvim.plugins.mkNeovimPlugin { lib.nixvim.plugins.mkNeovimPlugin {
name = "bufferline"; name = "bufferline";
@ -10,161 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: introduced 2024-08-12: remove after 24.11
#
# NOTE: Old options are equivalent to `settings.options` and
# the old highlight options are equivalent to `settings.highlight`,
# therefore we can't just use `optionsRenamedToSettings`.
imports =
let
oldOptions = [
"mode"
"themable"
"numbers"
"bufferCloseIcon"
"modifiedIcon"
"closeIcon"
"closeCommand"
"leftMouseCommand"
"rightMouseCommand"
"middleMouseCommand"
"indicator"
"leftTruncMarker"
"rightTruncMarker"
"separatorStyle"
"nameFormatter"
"truncateNames"
"tabSize"
"maxNameLength"
"colorIcons"
"showBufferIcons"
"showBufferCloseIcons"
"getElementIcon"
"showCloseIcon"
"showTabIndicators"
"showDuplicatePrefix"
"enforceRegularTabs"
"alwaysShowBufferline"
"persistBufferSort"
"maxPrefixLength"
"sortBy"
"diagnostics"
"diagnosticsIndicator"
"offsets"
[
"groups"
"items"
]
[
"groups"
"options"
"toggleHiddenOnEnter"
]
[
"hover"
"enabled"
]
[
"hover"
"reveal"
]
[
"hover"
"delay"
]
[
"debug"
"logging"
]
"customFilter"
{
old = "diagnosticsUpdateInInsert";
new = [
"diagnostics"
"update_in_insert"
];
}
];
oldHighlightOptions = [
"fill"
"background"
"tab"
"tabSelected"
"tabSeparator"
"tabSeparatorSelected"
"tabClose"
"closeButton"
"closeButtonVisible"
"closeButtonSelected"
"bufferVisible"
"bufferSelected"
"numbers"
"numbersVisible"
"numbersSelected"
"diagnostic"
"diagnosticVisible"
"diagnosticSelected"
"hint"
"hintVisible"
"hintSelected"
"hintDiagnostic"
"hintDiagnosticVisible"
"hintDiagnosticSelected"
"info"
"infoVisible"
"infoSelected"
"infoDiagnostic"
"infoDiagnosticVisible"
"infoDiagnosticSelected"
"warning"
"warningVisible"
"warningSelected"
"warningDiagnostic"
"warningDiagnosticVisible"
"warningDiagnosticSelected"
"error"
"errorVisible"
"errorSelected"
"errorDiagnostic"
"errorDiagnosticVisible"
"errorDiagnosticSelected"
"modified"
"modifiedVisible"
"modifiedSelected"
"duplicate"
"duplicateVisible"
"duplicateSelected"
"separator"
"separatorVisible"
"separatorSelected"
"indicatorVisible"
"indicatorSelected"
"pick"
"pickVisible"
"pickSelected"
"offsetSeparator"
{
old = "trunkMarker";
new = "trunc_marker";
}
];
basePluginPath = [
"plugins"
"bufferline"
];
settingsPath = basePluginPath ++ [ "settings" ];
optionsPath = settingsPath ++ [ "options" ];
oldHighlightsPath = basePluginPath ++ [ "highlights" ];
newHighlightsPath = settingsPath ++ [ "highlights" ];
in
[
(lib.mkRenamedOptionModule (basePluginPath ++ [ "extraOptions" ]) optionsPath)
]
++ mkSettingsRenamedOptionModules basePluginPath optionsPath oldOptions
++ mkSettingsRenamedOptionModules oldHighlightsPath newHighlightsPath oldHighlightOptions;
settingsOptions = { settingsOptions = {
options = { options = {
mode = mode =

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

@ -12,34 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-24: remove 2024-05-24
imports =
let
oldPluginPath = [
"plugins"
"comment-nvim"
];
newPluginPath = [
"plugins"
"comment"
];
settingsPath = newPluginPath ++ [ "settings" ];
optionsRenamedToSettings = import ./renamed-options.nix;
in
[
(mkRenamedOptionModule (oldPluginPath ++ [ "enable" ]) (newPluginPath ++ [ "enable" ]))
(mkRenamedOptionModule (oldPluginPath ++ [ "package" ]) (newPluginPath ++ [ "package" ]))
(mkRemovedOptionModule (
oldPluginPath
++ [
"mappings"
"extended"
]
) "This option has been removed upstream.")
]
++ (lib.nixvim.mkSettingsRenamedOptionModules oldPluginPath settingsPath optionsRenamedToSettings);
settingsOptions = { settingsOptions = {
padding = helpers.defaultNullOpts.mkBool true '' padding = helpers.defaultNullOpts.mkBool true ''
Add a space b/w comment and the line. Add a space b/w comment and the line.

29
plugins/by-name/conform-nvim/default.nix
View file

@ -18,35 +18,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
saygo-png saygo-png
]; ];
# TODO: added 2024-08-23 remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"formatters"
"formattersByFt"
"logLevel"
"notifyOnError"
];
imports =
map
(
optionName:
lib.mkRemovedOptionModule
[
"plugins"
"conform-nvim"
optionName
]
''
Please use `plugins.conform-nvim.settings.${lib.nixvim.toSnakeCase optionName}` instead.
Note that nested options will now be snake_case, as well, to match upstream plugin configuration.
''
)
[
"formatAfterSave"
"formatOnSave"
];
extraOptions = { extraOptions = {
autoInstall = { autoInstall = {
enable = lib.mkEnableOption '' enable = lib.mkEnableOption ''

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

@ -13,14 +13,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"nodeCommand"
"filetypes"
"proxy"
];
settingsOptions = { settingsOptions = {
node_command = mkOption { node_command = mkOption {
type = with types; nullOr str; type = with types; nullOr str;

20
plugins/by-name/coq-nvim/default.nix
View file

@ -29,26 +29,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
}; };
}; };
# TODO: Introduced 12-03-2022, remove 12-05-2022
optionsRenamedToSettings = [
"xdg"
"autoStart"
{
old = "recommendedKeymaps";
new = [
"keymap"
"recommended"
];
}
{
old = "alwaysComplete";
new = [
"completion"
"always"
];
}
];
callSetup = false; callSetup = false;
settingsOptions = { settingsOptions = {
auto_start = lib.nixvim.mkNullOrOption ( auto_start = lib.nixvim.mkNullOrOption (

80
plugins/by-name/dashboard/default.nix
View file

@ -11,86 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.MattSturgeon ]; maintainers = [ maintainers.MattSturgeon ];
# TODO introduced 2024-05-30: remove 2024-09-01
optionsRenamedToSettings = [
{
old = "header";
new = [
"config"
"header"
];
}
{
old = "footer";
new = [
"config"
"footer"
];
}
{
old = "center";
new = [
"config"
"shortcut"
];
}
{
old = "hideStatusline";
new = [
"hide"
"statusline"
];
}
{
old = "hideTabline";
new = [
"hide"
"tabline"
];
}
[
"preview"
"command"
]
{
old = [
"preview"
"file"
];
new = [
"preview"
"file_path"
];
}
{
old = [
"preview"
"height"
];
new = [
"preview"
"file_height"
];
}
{
old = [
"preview"
"width"
];
new = [
"preview"
"file_width"
];
}
];
imports = [
(mkRemovedOptionModule [
"plugins"
"dashboard"
"sessionDirectory"
] "This plugin no longer has session support.")
];
settingsExample = { settingsExample = {
theme = "hyper"; theme = "hyper";
change_to_vcs_root = true; change_to_vcs_root = true;

31
plugins/by-name/debugprint/default.nix
View file

@ -11,37 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-04-07: remove 2024-06-07
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"moveToDebugline"
"displayCounter"
"displaySnippet"
"ignoreTreesitter"
"printTag"
];
imports =
let
basePluginPath = [
"plugins"
"debugprint"
];
in
[
(mkRemovedOptionModule (basePluginPath ++ [ "createCommands" ]) ''
This option has been deprectaded upstream.
Learn more [here](https://github.com/andrewferrier/debugprint.nvim/blob/796d8d4528bc5882d287b26e69cc8d810a9147c8/doc/debugprint.nvim.txt#L203-L213).
'')
(mkRemovedOptionModule (basePluginPath ++ [ "createKeymaps" ]) ''
This option has been deprectaded upstream.
Learn more [here](https://github.com/andrewferrier/debugprint.nvim/blob/796d8d4528bc5882d287b26e69cc8d810a9147c8/doc/debugprint.nvim.txt#L203-L213).
'')
(mkRemovedOptionModule (basePluginPath ++ [ "filetypes" ]) ''
Please use `plugins.debugprint.settings.filetypes` instead.
The sub-module options for each filetype are `left`, `right`, `mid_var` and `right_var`.
'')
];
settingsOptions = { settingsOptions = {
keymaps = keymaps =
helpers.defaultNullOpts.mkAttrsOf (with lib.types; attrsOf (either str rawLua)) helpers.defaultNullOpts.mkAttrsOf (with lib.types; attrsOf (either str rawLua))

10
plugins/by-name/emmet/default.nix
View file

@ -14,16 +14,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-03-01: remove 2024-05-01
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"mode"
{
old = "leader";
new = "leader_key";
}
];
settingsOptions = { settingsOptions = {
mode = defaultNullOpts.mkStr "a" '' mode = defaultNullOpts.mkStr "a" ''
Choose modes, in which Emmet mappings will be created. Choose modes, in which Emmet mappings will be created.

83
plugins/by-name/flash/default.nix
View file

@ -14,89 +14,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
MattSturgeon MattSturgeon
]; ];
# TODO: Added 2024-06-17; remove 2024-09-17
deprecateExtraOptions = true;
optionsRenamedToSettings =
let
# Combine base option paths with nested mode option paths
merged = flatten [
opts
(mapAttrsToList (mode: extras: map (opt: "${mode}.${opt}") (opts ++ extras)) modes)
];
# Option paths that should be renamed
opts = [
"labels"
"search.multiWindow"
"search.forward"
"search.wrap"
"search.mode"
"search.incremental"
"search.exclude"
"search.trigger"
"search.maxLength"
"jump.jumplist"
"jump.pos"
"jump.history"
"jump.register"
"jump.nohlsearch"
"jump.autojump"
"jump.inclusive"
"jump.offset"
"label.uppercase"
"label.exclude"
"label.current"
"label.after"
"label.before"
"label.style"
"label.reuse"
"label.distance"
"label.minPatternLength"
"label.rainbow.enabled"
"label.rainbow.shade"
"label.format"
"highlight.backdrop"
"highlight.matches"
"highlight.priority"
"highlight.group.match"
"highlight.group.current"
"highlight.group.backdrop"
"highlight.group.label"
"action"
"pattern"
"continue"
"config"
"prompt.enabled"
"prompt.prefix"
"prompt.winConfig.relative"
"prompt.winConfig.width"
"prompt.winConfig.height"
"prompt.winConfig.row"
"prompt.winConfig.col"
"prompt.winConfig.zindex"
"remoteOp.restore"
"remoteOp.motion"
];
# "Modes" that should also be renamed
# `opts` will get added to the attr value
modes = {
search = [ "enabled" ];
char = [
"enabled"
"autohide"
"jumpLabels"
"multiLine"
"keys"
"charActions"
];
treesitter = [ ];
treesitterSearch = [ ];
remote = [ ];
};
in
map (splitString ".") merged;
imports = [ imports = [
# TODO: check automatic search config still works # TODO: check automatic search config still works
(mkRemovedOptionModule [ (mkRemovedOptionModule [

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

@ -13,18 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = with lib.maintainers; [ GaetanLepage ]; maintainers = with lib.maintainers; [ GaetanLepage ];
# TODO: introduce 2024-08-03. Remove after 24.11
optionsRenamedToSettings = [
"messageTemplate"
"dateFormat"
"messageWhenNotCommitted"
"highlightGroup"
"extmarkOptions"
"displayVirtualText"
"ignoredFiletypes"
"delay"
"virtualTextColumn"
];
imports = [ imports = [
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule { (lib.nixvim.mkRemovedPackageOptionModule {

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

@ -3,10 +3,6 @@
config, config,
... ...
}: }:
let
inherit (lib) flatten mapAttrsToList mkRemovedOptionModule;
inherit (lib.nixvim) mkDeprecatedSubOptionModule;
in
lib.nixvim.plugins.mkNeovimPlugin { lib.nixvim.plugins.mkNeovimPlugin {
name = "gitsigns"; name = "gitsigns";
package = "gitsigns-nvim"; package = "gitsigns-nvim";
@ -14,72 +10,13 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO: introduced 2024-03-12, remove on 2024-05-12 imports = [
deprecateExtraOptions = true; # TODO: added 2025-04-06, remove after 25.05
optionsRenamedToSettings = import ./renamed-options.nix; (lib.nixvim.mkRemovedPackageOptionModule {
imports = plugin = "gitsigns";
let packageName = "git";
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";
})
];
dependencies = [ "git" ]; dependencies = [ "git" ];

156
plugins/by-name/gitsigns/renamed-options.nix
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";
}
]

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

@ -13,17 +13,6 @@ mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-01: remove 2024-05-01
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"width"
"height"
{
old = "showLineNumbers";
new = "linenr";
}
];
settingsOptions = { settingsOptions = {
width = helpers.mkNullOrOption types.ints.unsigned "width"; width = helpers.mkNullOrOption types.ints.unsigned "width";

18
plugins/by-name/hardtime/default.nix
View file

@ -13,24 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.refaelsh ]; maintainers = [ lib.maintainers.refaelsh ];
# TODO: Added 2024-09-07; remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"enabled"
"hint"
"notification"
"hints"
"maxTime"
"maxCount"
"disableMouse"
"allowDifferentKey"
"resettingKeys"
"restrictedKeys"
"restrictionMode"
"disabledKeys"
"disabledFiletypes"
];
settingsOptions = { settingsOptions = {
max_time = defaultNullOpts.mkUnsignedInt 1000 '' max_time = defaultNullOpts.mkUnsignedInt 1000 ''
Maximum time (in milliseconds) to consider key presses as repeated. Maximum time (in milliseconds) to consider key presses as repeated.

97
plugins/by-name/indent-blankline/default.nix
View file

@ -12,103 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-10: remove 2024-05-10
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"debounce"
[
"viewportBuffer"
"min"
]
[
"viewportBuffer"
"max"
]
[
"indent"
"char"
]
[
"indent"
"tabChar"
]
[
"indent"
"highlight"
]
[
"indent"
"smartIndentCap"
]
[
"indent"
"priority"
]
[
"whitespace"
"highlight"
]
[
"whitespace"
"removeBlanklineTrail"
]
[
"scope"
"enabled"
]
[
"scope"
"char"
]
[
"scope"
"showStart"
]
[
"scope"
"showEnd"
]
[
"scope"
"showExactScope"
]
[
"scope"
"injectedLanguages"
]
[
"scope"
"highlight"
]
[
"scope"
"priority"
]
[
"scope"
"include"
"nodeType"
]
[
"scope"
"exclude"
"language"
]
[
"scope"
"exclude"
"nodeType"
]
[
"exclude"
"filetypes"
]
[
"exclude"
"buftypes"
]
];
settingsOptions = { settingsOptions = {
debounce = helpers.defaultNullOpts.mkUnsignedInt 200 '' debounce = helpers.defaultNullOpts.mkUnsignedInt 200 ''
Sets the amount indent-blankline debounces refreshes in milliseconds. Sets the amount indent-blankline debounces refreshes in milliseconds.

17
plugins/by-name/instant/default.nix
View file

@ -13,23 +13,6 @@ mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"username"
"onlyCwd"
"cursorHlGroupUser1"
"cursorHlGroupUser2"
"cursorHlGroupUser3"
"cursorHlGroupUser4"
"cursorHlGroupDefault"
"nameHlGroupUser1"
"nameHlGroupUser2"
"nameHlGroupUser3"
"nameHlGroupUser4"
"nameHlGroupDefault"
];
settingsOptions = { settingsOptions = {
username = helpers.mkNullOrStr '' username = helpers.mkNullOrStr ''
Username. Username.

7
plugins/by-name/julia-cell/default.nix
View file

@ -43,13 +43,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-02-19: remove 2024-04-19
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"delimitCellsBy"
"tag"
];
settingsOptions = { settingsOptions = {
delimit_cells_by = delimit_cells_by =
helpers.defaultNullOpts.mkEnumFirstDefault helpers.defaultNullOpts.mkEnumFirstDefault

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

@ -13,20 +13,6 @@ mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"detailedFirst"
"foldBlanks"
{
old = "maxWidth";
new = "maxwidth";
}
{
old = "fillString";
new = "fillstring";
}
];
imports = [ imports = [
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule { (lib.nixvim.mkRemovedPackageOptionModule {

10
plugins/by-name/lightline/default.nix
View file

@ -43,16 +43,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
``` ```
''; '';
# TODO: Added 2024-08-23, remove after 24.11
optionsRenamedToSettings = [
"colorscheme"
"componentFunction"
"component"
"active"
"inactive"
"modeMap"
];
settingsOptions = { settingsOptions = {
colorscheme = defaultNullOpts.mkStr "default" '' colorscheme = defaultNullOpts.mkStr "default" ''
The colorscheme to use for lightline. The colorscheme to use for lightline.

17
plugins/by-name/lsp-format/default.nix
View file

@ -9,23 +9,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: added 10-22-2024 remove after 24.11
deprecateExtraOptions = true;
imports = [
(lib.mkRenamedOptionModule
[
"plugins"
"lsp-format"
"setup"
]
[
"plugins"
"lsp-format"
"settings"
]
)
];
description = '' description = ''
A wrapper around Neovims native LSP formatting. A wrapper around Neovims native LSP formatting.

17
plugins/by-name/lsp-lines/default.nix
View file

@ -11,23 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.MattSturgeon ]; maintainers = [ maintainers.MattSturgeon ];
# TODO: Introduced 2024-06-25, remove after 24.11
imports = [
(mkRenamedOptionModule
[
"plugins"
"lsp-lines"
"currentLine"
]
[
"diagnostic"
"settings"
"virtual_lines"
"only_current_line"
]
)
];
extraConfig = { extraConfig = {
# Strongly recommended by the plugin, to avoid duplication. # Strongly recommended by the plugin, to avoid duplication.
diagnostic.settings.virtual_text = mkDefault false; diagnostic.settings.virtual_text = mkDefault false;

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

@ -1,6 +1,6 @@
{ lib, ... }: { lib, ... }:
let let
inherit (lib.nixvim) defaultNullOpts mkSettingsRenamedOptionModules; inherit (lib.nixvim) defaultNullOpts;
inherit (lib) types; inherit (lib) types;
in in
lib.nixvim.plugins.mkNeovimPlugin { lib.nixvim.plugins.mkNeovimPlugin {
@ -10,43 +10,13 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: Added 2024-09-05, remove after 24.11 imports = [
optionsRenamedToSettings = [ # TODO: added 2025-04-06, remove after 25.05
"extensions" (lib.nixvim.mkRemovedPackageOptionModule {
"sections" plugin = "lualine";
"inactiveSections" packageName = "git";
"tabline" })
"winbar"
"inactiveWinbar"
]; ];
imports =
let
basePluginPath = [
"plugins"
"lualine"
];
settingsPath = basePluginPath ++ [ "settings" ];
optionsPath = settingsPath ++ [ "options" ];
oldOptions = [
"theme"
"globalstatus"
"refresh"
"iconsEnabled"
"sectionSeparators"
"componentSeparators"
"disabledFiletypes"
"ignoreFocus"
"alwaysDivideMiddle"
];
in
(mkSettingsRenamedOptionModules basePluginPath optionsPath oldOptions)
++ [
# TODO: added 2025-04-06, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule {
plugin = "lualine";
packageName = "git";
})
];
dependencies = [ "git" ]; dependencies = [ "git" ];

12
plugins/by-name/magma-nvim/default.nix
View file

@ -13,18 +13,6 @@ mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"imageProvider"
"automaticallyOpenOutput"
"wrapOutput"
"outputWindowBorders"
"cellHighlightGroup"
"savePath"
"showMimetypeDebug"
];
settingsOptions = { settingsOptions = {
image_provider = image_provider =
helpers.defaultNullOpts.mkEnumFirstDefault helpers.defaultNullOpts.mkEnumFirstDefault

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

@ -189,6 +189,4 @@ lib.nixvim.plugins.mkVimPlugin {
page_title = "「\$\{name}」"; page_title = "「\$\{name}」";
theme = "dark"; theme = "dark";
}; };
inherit (import ./deprecations.nix) deprecateExtraConfig optionsRenamedToSettings;
} }

29
plugins/by-name/markdown-preview/deprecations.nix
View file

@ -1,29 +0,0 @@
{
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"autoStart"
"autoClose"
"refreshSlow"
"commandForGlobal"
"openToTheWorld"
"openIp"
"browser"
"echoPreviewUrl"
"previewOptions"
"markdownCss"
"highlightCss"
"port"
"pageTitle"
"theme"
{
old = "fileTypes";
new = "filetypes";
}
{
old = "browserFunc";
new = "browserfunc";
}
];
}

23
plugins/by-name/molten/default.nix
View file

@ -14,29 +14,6 @@ mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-01: remove 2024-05-01
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"autoOpenOutput"
"copyOutput"
"enterOutputBehavior"
"imageProvider"
"outputCropBorder"
"outputShowMore"
"outputVirtLines"
"outputWinBorder"
"outputWinCoverGutter"
"outputWinHideOnLeave"
"outputWinMaxHeight"
"outputWinMaxWidth"
"outputWinStyle"
"savePath"
"useBorderHighlights"
"virtLinesOffBy1"
"wrapOutput"
"showMimetypeDebug"
];
settingsOptions = { settingsOptions = {
auto_image_popup = helpers.defaultNullOpts.mkBool false '' auto_image_popup = helpers.defaultNullOpts.mkBool false ''
When true, cells that produce an image output will open the image output automatically with When true, cells that produce an image output will open the image output automatically with

21
plugins/by-name/navic/default.nix
View file

@ -10,27 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: added 2024-09-03 remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"icons"
[
"lsp"
"autoAttach"
]
[
"lsp"
"preference"
]
"highlight"
"separator"
"depthLimit"
"depthLimitIndicator"
"safeOutput"
"lazyUpdateContext"
"click"
];
settingsOptions = { settingsOptions = {
icons = lib.mapAttrs (name: default: defaultNullOpts.mkStr default "icon for ${name}.") { icons = lib.mapAttrs (name: default: defaultNullOpts.mkStr default "icon for ${name}.") {
File = "󰈙 "; File = "󰈙 ";

13
plugins/by-name/neoclip/default.nix
View file

@ -2,7 +2,6 @@
lib, lib,
config, config,
helpers, helpers,
options,
... ...
}: }:
with lib; with lib;
@ -236,18 +235,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
}; };
extraConfig = cfg: { extraConfig = cfg: {
# TODO: added 2024-09-14 remove after 24.11
plugins.sqlite-lua.enable = mkOverride 1490 true;
warnings = lib.nixvim.mkWarnings "plugins.neoclip" {
when =
(cfg.settings.enable_persistent_history == true)
&& options.plugins.sqlite-lua.enable.highestPrio == 1490;
message = ''
`sqlite-lua` automatic installation is deprecated. Please use `plugins.sqlite-lua.enable`.
'';
};
assertions = lib.nixvim.mkAssertions "plugins.neoclip" { assertions = lib.nixvim.mkAssertions "plugins.neoclip" {
assertion = (cfg.settings.enable_persistent_history == true) -> config.plugins.sqlite-lua.enable; assertion = (cfg.settings.enable_persistent_history == true) -> config.plugins.sqlite-lua.enable;
message = '' message = ''

58
plugins/by-name/noice/default.nix
View file

@ -20,64 +20,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
> vim, regex, lua, bash, markdown, markdown_inline > vim, regex, lua, bash, markdown, markdown_inline
''; '';
# TODO: added 2024-10-27 remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings =
let
mkOptionPaths = map (lib.splitString ".");
in
mkOptionPaths [
"cmdline.enabled"
"cmdline.view"
"cmdline.opts"
"cmdline.format"
"messages.enabled"
"messages.view"
"messages.viewError"
"messages.viewWarn"
"messages.viewHistory"
"messages.viewSearch"
"popupmenu.enabled"
"popupmenu.backend"
"popupmenu.kindIcons"
"redirect"
"commands"
"notify.enabled"
"notify.view"
"lsp.progress.enabled"
"lsp.progress.format"
"lsp.progress.formatDone"
"lsp.progress.throttle"
"lsp.progress.view"
"lsp.override"
"lsp.hover.enabled"
"lsp.hover.view"
"lsp.hover.opts"
"lsp.signature.enabled"
"lsp.signature.autoOpen.enabled"
"lsp.signature.autoOpen.trigger"
"lsp.signature.autoOpen.luasnip"
"lsp.signature.autoOpen.throttle"
"lsp.signature.view"
"lsp.signature.opts"
"lsp.message.enabled"
"lsp.message.view"
"lsp.message.opts"
"lsp.documentation.view"
"lsp.documentation.opts"
"markdown.hover"
"markdown.highlights"
"health.checker"
"smartMove.enabled"
"smartMove.excludedFiletypes"
"presets"
"throttle"
"views"
"routes"
"status"
"format"
];
settingsOptions = { settingsOptions = {
cmdline = { cmdline = {
enabled = defaultNullOpts.mkBool true "Enables `Noice` cmdline UI."; enabled = defaultNullOpts.mkBool true "Enables `Noice` cmdline UI.";

13
plugins/by-name/none-ls/_mk-source-plugin.nix
View file

@ -46,19 +46,6 @@ in
pkg; pkg;
}; };
# TODO: Added 2024-07-16; remove after 24.11
imports =
let
basePath = [
"plugins"
"none-ls"
"sources"
sourceType
sourceName
];
in
[ (lib.mkRenamedOptionModule (basePath ++ [ "withArgs" ]) (basePath ++ [ "settings" ])) ];
config = lib.mkIf (cfg.enable && cfg'.enable) { config = lib.mkIf (cfg.enable && cfg'.enable) {
plugins.none-ls.settings.sources = lib.mkDefault [ plugins.none-ls.settings.sources = lib.mkDefault [
( (

26
plugins/by-name/none-ls/default.nix
View file

@ -12,32 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.MattSturgeon ]; maintainers = [ lib.maintainers.MattSturgeon ];
# TODO: introduced 2024-06-18, remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"border"
"cmd"
"debounce"
"debug"
"defaultTimeout"
"diagnosticConfig"
"diagnosticsFormat"
"fallbackSeverity"
"logLevel"
"notifyFormat"
"onAttach"
"onInit"
"onExit"
"rootDir"
"shouldAttach"
"tempDir"
"updateInInsert"
{
old = "sourcesItems";
new = "sources";
}
];
imports = imports =
let let
namespace = "plugins"; namespace = "plugins";

34
plugins/by-name/nvim-autopairs/default.nix
View file

@ -11,40 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-03-27, remove on 2024-05-27
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"disableInMacro"
"disableInVisualblock"
"disableInReplaceMode"
"ignoredNextChar"
"enableMoveright"
"enableCheckBracketLine"
"enableBracketInQuote"
"enableAbbr"
"breakUndo"
"checkTs"
"tsConfig"
"mapCr"
"mapBs"
"mapCH"
"mapCW"
{
old = "disabledFiletypes";
new = "disable_filetype";
}
{
old = "enableAfterQuote";
new = "enable_afterquote";
}
];
imports = [
(mkRemovedOptionModule [ "plugins" "nvim-autopairs" "pairs" ] ''
This option was having no effect.
If you want to customize pairs, please use `luaConfig` to define them as described in the plugin documentation.
'')
];
settingsOptions = { settingsOptions = {
disable_filetype = helpers.defaultNullOpts.mkListOf types.str [ disable_filetype = helpers.defaultNullOpts.mkListOf types.str [
"TelescopePrompt" "TelescopePrompt"

20
plugins/by-name/nvim-lightbulb/default.nix
View file

@ -10,26 +10,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-02-15. Remove on 2024-03-15
imports =
map
(
optionName:
mkRemovedOptionModule [
"plugins"
"nvim-lightbulb"
optionName
] "Please use `plugins.nvim-lightbulb.settings` instead."
)
[
"ignore"
"sign"
"float"
"virtualText"
"statusText"
"autocmd"
];
settingsOptions = { settingsOptions = {
priority = helpers.defaultNullOpts.mkUnsignedInt 10 '' priority = helpers.defaultNullOpts.mkUnsignedInt 10 ''
Priority of the lightbulb for all handlers except float. Priority of the lightbulb for all handlers except float.

34
plugins/by-name/nvim-ufo/default.nix
View file

@ -13,40 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: added 2024-10-05 remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"openFoldHlTimeout"
"providerSelector"
"closeFoldKinds"
"foldVirtTextHandler"
"enableGetFoldVirtText"
[
"preview"
"winConfig"
"border"
]
[
"preview"
"winConfig"
"winblend"
]
[
"preview"
"winConfig"
"winhighlight"
]
[
"preview"
"winConfig"
"maxheight"
]
[
"preview"
"mappings"
]
];
settingsOptions = { settingsOptions = {
open_fold_hl_timeout = defaultNullOpts.mkUnsignedInt 400 '' open_fold_hl_timeout = defaultNullOpts.mkUnsignedInt 400 ''
Time in millisecond between the range to be highlgihted and to be cleared Time in millisecond between the range to be highlgihted and to be cleared

180
plugins/by-name/oil/default.nix
View file

@ -11,186 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-18: remove 2024-05-18
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"defaultFileExplorer"
[
"bufOptions"
"buflisted"
]
[
"bufOptions"
"bufhidden"
]
[
"winOptions"
"wrap"
]
[
"winOptions"
"signcolumn"
]
[
"winOptions"
"cursorcolumn"
]
[
"winOptions"
"foldcolumn"
]
[
"winOptions"
"spell"
]
[
"winOptions"
"list"
]
[
"winOptions"
"conceallevel"
]
[
"winOptions"
"concealcursor"
]
"deleteToTrash"
"skipConfirmForSimpleEdits"
"promptSaveOnSelectNewEntry"
"cleanupDelayMs"
"keymaps"
"useDefaultKeymaps"
[
"viewOptions"
"showHidden"
]
[
"viewOptions"
"isHiddenFile"
]
[
"viewOptions"
"isAlwaysHidden"
]
[
"float"
"padding"
]
[
"float"
"maxWidth"
]
[
"float"
"maxHeight"
]
[
"float"
"border"
]
[
"float"
"winOptions"
"winblend"
]
[
"preview"
"maxWidth"
]
[
"preview"
"minWidth"
]
[
"preview"
"width"
]
[
"preview"
"maxHeight"
]
[
"preview"
"minHeight"
]
[
"preview"
"height"
]
[
"preview"
"border"
]
[
"preview"
"winOptions"
"winblend"
]
[
"progress"
"maxWidth"
]
[
"progress"
"minWidth"
]
[
"progress"
"width"
]
[
"progress"
"maxHeight"
]
[
"progress"
"minHeight"
]
[
"progress"
"height"
]
[
"progress"
"border"
]
[
"progress"
"winOptions"
"winblend"
]
[
"progress"
"minimizedBorder"
]
{
old = "lspRenameAutosave";
new = [
"lsp_file_method"
"autosave_changes"
];
}
];
imports =
let
basePluginPath = [
"plugins"
"oil"
];
in
[
(mkRemovedOptionModule (
basePluginPath ++ [ "columns" ]
) "Use `plugins.oil.settings.columns` instead but beware, the format has changed.")
(mkRemovedOptionModule (
basePluginPath ++ [ "trashCommand" ]
) "This option has been deprecated by upstream.")
(mkRemovedOptionModule (
basePluginPath ++ [ "restoreWinOptions" ]
) "This option has been deprecated by upstream.")
];
settingsOptions = settingsOptions =
let let
dimensionType = dimensionType =

22
plugins/by-name/otter/default.nix
View file

@ -15,28 +15,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
# https://github.com/quarto-dev/quarto-nvim/issues/187 # https://github.com/quarto-dev/quarto-nvim/issues/187
configLocation = lib.mkOrder 900 "extraConfigLua"; configLocation = lib.mkOrder 900 "extraConfigLua";
imports = [
# TODO: introduced 2024-06-29; remove after 24.11
(lib.mkRemovedOptionModule
[
"plugins"
"otter"
"addCmpSources"
]
''
You should use the "cmp-nvim-lsp" source instead.
To quote upstream's README:
> If you previously used the otter nvim-cmp source, you can remove it, as the completion results now come directly via the cmp-nvim-lsp source together with other language servers.
''
)
# Register nvim-cmp association
# TODO: Otter is no longer a cmp-source
# Deprecated 2024-09-22; remove after 24.11
# Note: a warning is implemented in plugins/cmp/auto-enable.nix
{ cmpSourcePlugins.otter = "otter"; }
];
settingsOptions = { settingsOptions = {
lsp = { lsp = {
hover = { hover = {

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

@ -12,12 +12,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"setMakeprg"
"executableScript"
];
imports = [ imports = [
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule { (lib.nixvim.mkRemovedPackageOptionModule {

31
plugins/by-name/project-nvim/default.nix
View file

@ -13,37 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: added 2024-09-03 remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"manualMode"
"detectionMethods"
"patterns"
"ignoreLsp"
"excludeDirs"
"showHidden"
"silentChdir"
"scopeChdir"
"dataPath"
];
imports = [
# TODO: added 2024-03-13 remove after 24.11
(lib.mkRenamedOptionModule
[
"plugins"
"telescope"
"extensions"
"project-nvim"
"enable"
]
[
"plugins"
"project-nvim"
"enableTelescope"
]
)
];
settingsOptions = { settingsOptions = {
manual_mode = defaultNullOpts.mkBool false '' manual_mode = defaultNullOpts.mkBool false ''
Manual mode doesn't automatically change your root directory, so you have the option to Manual mode doesn't automatically change your root directory, so you have the option to

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

@ -12,15 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.MattSturgeon ]; maintainers = [ maintainers.MattSturgeon ];
# TODO: introduced 2024-05-24, remove on 2024-08-24
optionsRenamedToSettings = [
"promptFuncReturnType"
"promptFuncParamType"
"printVarStatements"
"printfStatements"
"extractVarStatements"
];
extraOptions = { extraOptions = {
enableTelescope = mkEnableOption "telescope integration"; enableTelescope = mkEnableOption "telescope integration";
}; };

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

@ -241,59 +241,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
} }
]; ];
# TODO: introduced 2024-09-23: remove after 24.11
warnings =
let
definedOpts = lib.filter (opt: lib.hasAttrByPath (lib.toList opt) cfg.settings) [
"client"
"env_file"
"env_pattern"
"env_edit_command"
"encode_url"
"keybinds"
"skip_ssl_verification"
[
"logs"
"level"
]
[
"logs"
"save"
]
[
"result"
"split"
]
[
"result"
"behavior"
]
[
"result"
"statistics"
]
[
"result"
"decode_url"
]
[
"result"
"formatters"
]
[
"result"
"keybinds"
]
];
in
lib.nixvim.mkWarnings "plugins.rest" {
when = definedOpts != [ ];
message = ''
The following v2 settings options are no longer supported in v3:
${lib.concatMapStringsSep "\n" (opt: " - ${lib.showOption (lib.toList opt)}") definedOpts}
'';
};
# TODO: There may be some interactions between this & telescope, maybe requiring #2292 # TODO: There may be some interactions between this & telescope, maybe requiring #2292
plugins.rest.luaConfig.post = lib.mkIf cfg.enableTelescope ''require("telescope").load_extension("rest")''; plugins.rest.luaConfig.post = lib.mkIf cfg.enableTelescope ''require("telescope").load_extension("rest")'';

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

@ -11,10 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-05-17, remove on 2024-02-17
deprecateExtraOptions = true;
optionsRenamedToSettings = import ./renamed-options.nix;
dependencies = [ "rust-analyzer" ]; dependencies = [ "rust-analyzer" ];
imports = [ imports = [
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
@ -63,20 +59,5 @@ lib.nixvim.plugins.mkNeovimPlugin {
Disable one of them otherwise you will have multiple clients attached to each buffer. Disable one of them otherwise you will have multiple clients attached to each buffer.
''; '';
}; };
# TODO: remove after 24.11
warnings = lib.nixvim.mkWarnings "plugins.rustaceanvim" {
when = hasAttrByPath [
"settings"
"server"
"settings"
] cfg;
message = ''
The `settings.server.settings' option has been renamed to `settings.server.default_settings'.
Note that if you supplied an attrset and not a function you need to set this attr set in:
`settings.server.default_settings.rust-analyzer'.
'';
};
}; };
} }

92
plugins/by-name/rustaceanvim/renamed-options.nix
View file

@ -1,92 +0,0 @@
[
[
"tools"
"executor"
]
[
"tools"
"testExecutors"
]
[
"tools"
"crateTestExecutor"
]
[
"tools"
"onInitialized"
]
[
"tools"
"reloadWorkspaceFromCargoToml"
]
[
"tools"
"hoverActions"
"replaceBuiltinHover"
]
[
"tools"
"floatWinConfig"
]
[
"tools"
"crateGraph"
"backend"
]
[
"tools"
"crateGraph"
"output"
]
[
"tools"
"crateGraph"
"full"
]
[
"tools"
"crateGraph"
"enabledGraphvizBackends"
]
[
"tools"
"crateGraph"
"pipe"
]
[
"tools"
"openUrl"
]
[
"server"
"autoAttach"
]
[
"server"
"onAttach"
]
[
"server"
"cmd"
]
[
"server"
"settings"
]
[
"server"
"standalone"
]
[
"server"
"logfile"
]
[
"dap"
"autoloadConfigurations"
]
[
"dap"
"adapter"
]
]

23
plugins/by-name/sniprun/default.nix
View file

@ -13,29 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
MattSturgeon MattSturgeon
]; ];
# TODO: Added 2024-06-17; remove 2024-09-17
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"selectedInterpreters"
"replEnable"
"replDisable"
"interpreterOptions"
"display"
"liveDisplay"
[
"displayOptions"
"terminalWidth"
]
[
"displayOptions"
"notificationTimeout"
]
"showNoOutput"
"snipruncolors"
"liveModeToggle"
"borders"
];
# https://michaelb.github.io/sniprun/sources/README.html#configuration # https://michaelb.github.io/sniprun/sources/README.html#configuration
settingsOptions = { settingsOptions = {
selected_interpreters = helpers.defaultNullOpts.mkListOf types.str [ ] '' selected_interpreters = helpers.defaultNullOpts.mkListOf types.str [ ] ''

43
plugins/by-name/specs/default.nix
View file

@ -11,49 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-06-10, remove on 2024-08-10
optionsRenamedToSettings = [
"show_jumps"
"min_jump"
{
old = "delay";
new = [
"popup"
"delay_ms"
];
}
{
old = "increment";
new = [
"popup"
"inc_ms"
];
}
{
old = "blend";
new = [
"popup"
"blend"
];
}
{
old = "width";
new = [
"popup"
"width"
];
}
];
imports =
lib.mapAttrsToList (old: message: mkRemovedOptionModule [ "plugins" "specs" old ] message)
{
color = "Please, use `settings.popup.winhl` directly.";
fader = "Please, use `settings.popup.fader` directly.";
resizer = "Please, use `settings.popup.resizer` directly.";
ignored_filetypes = "Please, use `settings.ignore_filetypes` instead.";
ignored_buffertypes = "Please, use `settings.ignore_buftypes` instead.";
};
settingsOptions = { settingsOptions = {
show_jumps = helpers.defaultNullOpts.mkBool true '' show_jumps = helpers.defaultNullOpts.mkBool true ''
Whether to show an animation each time the cursor jumps. Whether to show an animation each time the cursor jumps.

60
plugins/by-name/startify/default.nix
View file

@ -13,66 +13,6 @@ mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-01: remove 2024-05-01
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"sessionDir"
"lists"
"bookmarks"
"commands"
"filesNumber"
"sessionAutoload"
"sessionBeforeSave"
"sessionPersistence"
"sessionDeleteBuffers"
"changeToDir"
"changeToVcsRoot"
"changeCmd"
"paddingLeft"
"enableSpecial"
"enableUnsafe"
"sessionRemoveLines"
"sessionNumber"
"sessionSort"
"customIndices"
"customHeader"
"customFooter"
"relativePath"
"useEnv"
{
old = "updateOldFiles";
new = "update_oldfiles";
}
{
old = "skipList";
new = "skiplist";
}
{
old = "useUnicode";
new = "fortune_use_unicode";
}
{
old = "skipListServer";
new = "skiplist_server";
}
{
old = "sessionSaveVars";
new = "session_savevars";
}
{
old = "sessionCmds";
new = "session_savecmds";
}
{
old = "customQuotes";
new = "custom_header_quotes";
}
{
old = "disableAtVimEnter";
new = "disable_at_vimenter";
}
];
settingsOptions = import ./settings-options.nix { inherit lib helpers; }; settingsOptions = import ./settings-options.nix { inherit lib helpers; };
# TODO # TODO

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

@ -19,23 +19,9 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-24: remove 2024-05-24
deprecateExtraOptions = true;
optionsRenamedToSettings = [ "defaults" ];
imports = [ imports = [
./extensions ./extensions
# TODO introduced 2024-05-24: remove 2024-08-24
(mkRemovedOptionModule
[
"plugins"
"telescope"
"keymapsSilent"
]
"This option no longer has any effect now that the `plugin.telescope.keymaps` implementation uses `<cmd>`."
)
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule { (lib.nixvim.mkRemovedPackageOptionModule {
plugin = "telescope"; plugin = "telescope";

57
plugins/by-name/telescope/extensions/file-browser.nix
View file

@ -10,63 +10,6 @@ mkExtension {
extensionName = "file_browser"; extensionName = "file_browser";
package = "telescope-file-browser-nvim"; package = "telescope-file-browser-nvim";
# TODO: introduced 2024-03-24, remove on 2024-05-24
optionsRenamedToSettings = [
"theme"
"path"
"cwd"
"cwdToPath"
"grouped"
# "files" TODO this warning is causing an 'infinite recursion error'... No idea why
"addDirs"
"depth"
"autoDepth"
"selectBuffer"
"hidden"
"respectGitignore"
"browseFiles"
"browseFolders"
"hideParentDir"
"collapseDirs"
"quiet"
"dirIcon"
"dirIconHl"
"displayStat"
"hijackNetrw"
"useFd"
"gitStatus"
"promptPath"
];
imports = [
(mkRemovedOptionModule
[
"plugins"
"telescope"
"extensions"
"file-browser"
"mappings"
]
''
Use `plugins.telescope.extension.file-browser.settings.mappings` instead but beware, you need to specify the full name of the callback:
Example:
```
mappings = {
i = {
"<A-c>" = "require('telescope._extensions.file_browser.actions').create";
"<S-CR>" = "require('telescope._extensions.file_browser.actions').create_from_prompt";
"<A-r>" = "require('telescope._extensions.file_browser.actions').rename";
};
n = {
"c" = "require('telescope._extensions.file_browser.actions').create";
"r" = "require('telescope._extensions.file_browser.actions').rename";
"m" = "require('telescope._extensions.file_browser.actions').move";
};
}
```
''
)
];
settingsOptions = { settingsOptions = {
theme = mkNullOrStr '' theme = mkNullOrStr ''
Custom theme, will use your global theme by default. Custom theme, will use your global theme by default.

26
plugins/by-name/telescope/extensions/frecency.nix
View file

@ -8,32 +8,6 @@ mkExtension {
name = "frecency"; name = "frecency";
package = "telescope-frecency-nvim"; package = "telescope-frecency-nvim";
# TODO: introduced 2024-03-24, remove on 2024-05-24
optionsRenamedToSettings = [
"dbRoot"
"defaultWorkspace"
"ignorePatterns"
"showScores"
"workspaces"
];
imports =
let
basePluginPath = [
"plugins"
"telescope"
"extensions"
"frecency"
];
in
[
(mkRemovedOptionModule (
basePluginPath ++ [ "showUnindexed" ]
) "This option has been removed upstream.")
(mkRemovedOptionModule (
basePluginPath ++ [ "deviconsDisabled" ]
) "This option has been removed upstream.")
];
settingsOptions = { settingsOptions = {
auto_validate = defaultNullOpts.mkBool true '' auto_validate = defaultNullOpts.mkBool true ''
If true, it removes stale entries count over than `db_validate_threshold`. If true, it removes stale entries count over than `db_validate_threshold`.

6
plugins/by-name/telescope/extensions/fzy-native.nix
View file

@ -8,12 +8,6 @@ mkExtension {
extensionName = "fzy_native"; extensionName = "fzy_native";
package = "telescope-fzy-native-nvim"; package = "telescope-fzy-native-nvim";
# TODO: introduced 2024-03-24, remove on 2024-05-24
optionsRenamedToSettings = [
"overrideFileSorter"
"overrideGenericSorter"
];
settingsOptions = { settingsOptions = {
override_file_sorter = defaultNullOpts.mkBool true '' override_file_sorter = defaultNullOpts.mkBool true ''
Whether to override the file sorter. Whether to override the file sorter.

39
plugins/by-name/telescope/extensions/undo.nix
View file

@ -9,45 +9,6 @@ mkExtension {
name = "undo"; name = "undo";
package = "telescope-undo-nvim"; package = "telescope-undo-nvim";
# TODO: introduced 2024-03-24, remove on 2024-05-24
optionsRenamedToSettings = [
"useDelta"
"useCustomCommand"
"sideBySide"
"diffContextLines"
"entryFormat"
"timeFormat"
];
imports = [
(mkRemovedOptionModule
[
"plugins"
"telescope"
"extensions"
"undo"
"mappings"
]
''
Use `plugins.telescope.extension.undo.settings.mappings` instead but beware, you need to specify the full name of the callback:
Example:
```
mappings = {
i = {
"<cr>" = "require('telescope-undo.actions').yank_additions";
"<s-cr>" = "require('telescope-undo.actions').yank_deletions";
"<c-cr>" = "require('telescope-undo.actions').restore";
};
n = {
"y" = "require('telescope-undo.actions').yank_additions";
"Y" = "require('telescope-undo.actions').yank_deletions";
"u" = "require('telescope-undo.actions').restore";
};
}
```
''
)
];
settingsOptions = { settingsOptions = {
use_delta = defaultNullOpts.mkBool true '' use_delta = defaultNullOpts.mkBool true ''
When set to true, [delta](https://github.com/dandavison/delta) is used for fancy diffs in When set to true, [delta](https://github.com/dandavison/delta) is used for fancy diffs in

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

@ -24,13 +24,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
dependencies = [ "ripgrep" ]; dependencies = [ "ripgrep" ];
imports = [ imports = [
# TODO: Added 2023-11-06, remove after 24.11
(mkRemovedOptionModule [
"plugins"
"todo-comments"
"keymapsSilent"
] "Use `plugins.todo-comments.keymaps.<COMMAND>.options.silent`.")
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule { (lib.nixvim.mkRemovedPackageOptionModule {
plugin = "todo-comments"; plugin = "todo-comments";
@ -38,99 +31,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
}) })
]; ];
# TODO: Added 2024-08-16, remove after 24.11
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"signs"
"signPriority"
"keywords"
[
"guiStyle"
"bg"
]
[
"guiStyle"
"fg"
]
"mergeKeywords"
[
"highlight"
"multiline"
]
[
"highlight"
"multilinePattern"
]
[
"highlight"
"multilineContext"
]
[
"highlight"
"before"
]
[
"highlight"
"keyword"
]
[
"highlight"
"after"
]
[
"highlight"
"pattern"
]
[
"highlight"
"commentsOnly"
]
[
"highlight"
"maxLineLen"
]
[
"highlight"
"exclude"
]
[
"colors"
"error"
]
[
"colors"
"warning"
]
[
"colors"
"info"
]
[
"colors"
"hint"
]
[
"colors"
"default"
]
[
"colors"
"test"
]
[
"search"
"command"
]
[
"search"
"args"
]
[
"search"
"pattern"
]
];
settingsOptions = { settingsOptions = {
signs = defaultNullOpts.mkBool true "Show icons in the signs column."; signs = defaultNullOpts.mkBool true "Show icons in the signs column.";

67
plugins/by-name/toggleterm/default.nix
View file

@ -11,73 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-04-07, remove on 2024-06-07
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"size"
"onCreate"
"onOpen"
"onClose"
"onStdout"
"onStderr"
"onExit"
"hideNumbers"
"shadeFiletypes"
"autochdir"
"highlights"
"shadeTerminals"
"shadingFactor"
"startInInsert"
"insertMappings"
"terminalMappings"
"persistSize"
"persistMode"
"direction"
"closeOnExit"
"shell"
"autoScroll"
[
"floatOpts"
"border"
]
[
"floatOpts"
"width"
]
[
"floatOpts"
"height"
]
[
"floatOpts"
"winblend"
]
[
"floatOpts"
"zindex"
]
[
"winbar"
"enabled"
]
[
"winbar"
"nameFormatter"
]
];
imports = [
(mkRemovedOptionModule
[
"plugins"
"toggleterm"
"openMapping"
]
''
Please use `plugins.toggleterm.settings.open_mapping` instead but beware, you have to provide the value in this form: `"[[<c-\>]]"`.
''
)
];
settingsOptions = { settingsOptions = {
size = helpers.defaultNullOpts.mkStrLuaFnOr types.number 12 '' size = helpers.defaultNullOpts.mkStrLuaFnOr types.number 12 ''
Size of the terminal. Size of the terminal.

14
plugins/by-name/treesitter-context/default.nix
View file

@ -12,20 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-04-22: remove 2024-06-22
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"maxLines"
"minWindowHeight"
"lineNumbers"
"multilineThreshold"
"trimScope"
"mode"
"separator"
"zindex"
"onAttach"
];
settingsOptions = { settingsOptions = {
enable = helpers.defaultNullOpts.mkBool true '' enable = helpers.defaultNullOpts.mkBool true ''
Enable this plugin (Can be enabled/disabled later via commands) Enable this plugin (Can be enabled/disabled later via commands)

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

@ -174,56 +174,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO introduced 2024-07-06: remove after 24.11
optionsRenamedToSettings = [
"ensureInstalled"
"ignoreInstall"
"parserInstallDir"
[
"incrementalSelection"
"enable"
]
[
"incrementalSelection"
"keymaps"
"initSelection"
"nodeDecremental"
]
[
"incrementalSelection"
"keymaps"
"initSelection"
"nodeIncremental"
]
[
"incrementalSelection"
"keymaps"
"initSelection"
"scopeIncremental"
]
{
old = "customCaptures";
new = [
"highlight"
"custom_captures"
];
}
{
old = "disabledLanguages";
new = [
"highlight"
"disable"
];
}
{
old = "indent";
new = [
"indent"
"enable"
];
}
];
imports = imports =
let let
basePluginPath = [ basePluginPath = [

132
plugins/by-name/trouble/default.nix
View file

@ -13,107 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.loicreynier ]; maintainers = [ lib.maintainers.loicreynier ];
# TODO introduced 2024-03-15: remove 2024-05-15
optionsRenamedToSettings = [
"autoClose"
"autoFold"
"autoOpen"
"autoJump"
"autoPreview"
"foldClosed"
"foldOpen"
"group"
"height"
"icons"
"indentLines"
"mode"
"padding"
"position"
"width"
"useDiagnosticSigns"
[
"actionKeys"
"cancel"
]
[
"actionKeys"
"close"
]
[
"actionKeys"
"closeFolds"
]
[
"actionKeys"
"hover"
]
[
"actionKeys"
"jump"
]
[
"actionKeys"
"jumpClose"
]
[
"actionKeys"
"next"
]
[
"actionKeys"
"openFolds"
]
[
"actionKeys"
"openSplit"
]
[
"actionKeys"
"openTab"
]
[
"actionKeys"
"openVsplit"
]
[
"actionKeys"
"previous"
]
[
"actionKeys"
"refresh"
]
[
"actionKeys"
"toggleFold"
]
[
"actionKeys"
"toggleMode"
]
[
"actionKeys"
"togglePreview"
]
[
"signs"
"error"
]
[
"signs"
"hint"
]
[
"signs"
"other"
]
[
"signs"
"warning"
]
];
settingsOptions = { settingsOptions = {
auto_close = defaultNullOpts.mkBool false '' auto_close = defaultNullOpts.mkBool false ''
Automatically close the list when you have no diagnostics. Automatically close the list when you have no diagnostics.
@ -349,36 +248,7 @@ lib.nixvim.plugins.mkNeovimPlugin {
} "Define custom icons."; } "Define custom icons.";
}; };
extraConfig = cfg: { extraConfig = {
# TODO: introduced 2024-10-12: remove after 24.11
warnings =
let
definedOpts = lib.filter (opt: lib.hasAttrByPath (lib.toList opt) cfg.settings) [
"action_keys"
"position"
"height"
"width"
"mode"
"fold_open"
"fold_close"
"group"
"padding"
"cycle_results"
"indent_lines"
"win_config"
"include_declaration"
"signs"
"use_diagnostic_signs"
];
in
lib.nixvim.mkWarnings "plugins.trouble" {
when = definedOpts != [ ];
message = ''
The following v2 settings options are no longer supported in v3:
${lib.concatMapStringsSep "\n" (opt: " - ${lib.showOption (lib.toList opt)}") definedOpts}
'';
};
# TODO: added 2024-09-20 remove after 24.11 # TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = lib.mkIf ( plugins.web-devicons = lib.mkIf (
!( !(

23
plugins/by-name/ts-autotag/default.nix
View file

@ -13,29 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-06-17: remove 2024-08-17
deprecateExtraOptions = true;
imports =
map
(
optionName:
mkRemovedOptionModule
[
"plugins"
"ts-autotag"
optionName
]
''
The `ts-autotag` plugin is no longer configured using `nvim-treesitter.configs`.
Please, refer to upstream documentation:
https://github.com/windwp/nvim-ts-autotag#setup
''
)
[
"filetypes"
"skipTags"
];
extraConfig = { extraConfig = {
warnings = lib.nixvim.mkWarnings "plugins.ts-autotag" { warnings = lib.nixvim.mkWarnings "plugins.ts-autotag" {
when = !config.plugins.treesitter.enable; when = !config.plugins.treesitter.enable;

6
plugins/by-name/typescript-tools/default.nix
View file

@ -12,12 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO:: introduced 10-22-2024: remove after 24.11
optionsRenamedToSettings = [
"onAttach"
"handlers"
];
settingsOptions = { settingsOptions = {
on_attach = defaultNullOpts.mkLuaFn null "Function to call when tsserver attaches to a buffer."; on_attach = defaultNullOpts.mkLuaFn null "Function to call when tsserver attaches to a buffer.";

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

@ -11,14 +11,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-02-20: remove 2024-04-20
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"cmd"
"pdfViewer"
"concealMath"
"autoCloseToc"
];
imports = [ imports = [
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule { (lib.nixvim.mkRemovedPackageOptionModule {

69
plugins/by-name/undotree/default.nix
View file

@ -7,75 +7,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-02-22: remove 2024-04-22
deprecateExtraConfig = true;
optionsRenamedToSettings = [
{
old = "windowLayout";
new = "WindowLayout";
}
{
old = "shortIndicators";
new = "ShortIndicators";
}
{
old = "windowWidth";
new = "WindowWidth";
}
{
old = "diffHeight";
new = "DiffHeight";
}
{
old = "autoOpenDiff";
new = "AutoOpenDiff";
}
{
old = "focusOnToggle";
new = "FocusOnToggle";
}
{
old = "treeNodeShape";
new = "TreeNodeShape";
}
{
old = "diffCommand";
new = "DiffCommand";
}
{
old = "relativeTimestamp";
new = "RelativeTimestamp";
}
{
old = "highlightChangedText";
new = "HighlightChangedText";
}
{
old = "highlightChangesWithSign";
new = "HighlightChangesWithSign";
}
{
old = "highlightSyntaxAdd";
new = "HighlightSyntaxAdd";
}
{
old = "highlightSyntaxChange";
new = "HighlightSyntaxChange";
}
{
old = "highlightSyntaxDel";
new = "HighlightSyntaxDel";
}
{
old = "showHelpLine";
new = "ShowHelpLine";
}
{
old = "showCursorLine";
new = "ShowCursorLine";
}
];
settingsExample = { settingsExample = {
WindowLayout = 4; WindowLayout = 4;
ShortIndicators = false; ShortIndicators = false;

13
plugins/by-name/vim-slime/default.nix
View file

@ -12,19 +12,6 @@ mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"target"
"vimterminalCmd"
"noMappings"
"pasteFile"
"preserveCurpos"
"defaultConfig"
"dontAskDefault"
"bracketedPaste"
];
settingsOptions = { settingsOptions = {
target = helpers.defaultNullOpts.mkEnum [ target = helpers.defaultNullOpts.mkEnum [
"dtach" "dtach"

19
plugins/by-name/vimtex/default.nix
View file

@ -7,25 +7,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-02-20: remove 2024-04-20
deprecateExtraConfig = true;
optionsRenamedToSettings = [ "viewMethod" ];
imports =
let
basePluginPath = [
"plugins"
"vimtex"
];
in
[
(mkRemovedOptionModule (
basePluginPath ++ [ "installTexLive" ]
) "If you don't want `texlive` to be installed, set `plugins.vimtex.texlivePackage` to `null`.")
(mkRenamedOptionModule (basePluginPath ++ [ "texLivePackage" ]) (
basePluginPath ++ [ "texlivePackage" ]
))
];
settingsOptions = { settingsOptions = {
view_method = mkOption { view_method = mkOption {
type = types.str; type = types.str;

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

@ -2,7 +2,7 @@
with lib; with lib;
let let
inherit (lib) types; inherit (lib) types;
inherit (lib.nixvim) defaultNullOpts mkRaw toLuaObject; inherit (lib.nixvim) defaultNullOpts mkRaw;
specExamples = [ specExamples = [
# Basic group with custom icon # Basic group with custom icon
@ -76,69 +76,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.khaneliman ]; maintainers = [ lib.maintainers.khaneliman ];
# TODO: introduced 2024-08-05: remove after 24.11
optionsRenamedToSettings = import ./renamed-options.nix;
imports =
let
basePluginPath = [
"plugins"
"which-key"
];
in
[
(lib.mkRemovedOptionModule (basePluginPath ++ [ "triggers" ]) ''
Please use `plugins.which-key.settings.triggers` instead.
See the plugin documentation for more details about the new option signature:
https://github.com/folke/which-key.nvim#-triggers
'')
(lib.mkRemovedOptionModule
(
basePluginPath
++ [
"window"
"padding"
]
)
''
Please use `plugins.which-key.settings.win.padding` instead.
See the plugin documentation for more details about the new option:
https://github.com/folke/which-key.nvim#%EF%B8%8F-configuration
''
)
(lib.mkRemovedOptionModule
(
basePluginPath
++ [
"window"
"margin"
]
)
''
Please use `plugins.which-key.settings.layout` instead.
See the plugin documentation for more details about the new options:
https://github.com/folke/which-key.nvim#%EF%B8%8F-configuration
''
)
(lib.mkRemovedOptionModule
(
basePluginPath
++ [
"window"
"position"
]
)
''
Please use `plugins.which-key.settings.layout`, `plugins.which-key.settings.win.title_pos`, or `plugins.which-key.settings.win.footer_pos` instead.
See the plugin documentation for more details about the new options:
https://github.com/folke/which-key.nvim#%EF%B8%8F-configuration
''
)
];
settingsOptions = { settingsOptions = {
preset = defaultNullOpts.mkEnumFirstDefault [ preset = defaultNullOpts.mkEnumFirstDefault [
"classic" "classic"
@ -432,35 +369,4 @@ lib.nixvim.plugins.mkNeovimPlugin {
expand = 1; expand = 1;
}; };
# TODO: introduced 2024-07-29: remove after 24.11
extraOptions = {
registrations = mkOption {
type = with types; attrsOf anything;
description = ''
This option is deprecated, use `settings.spec` instead.
Note: the keymap format has changed in v3 of which-key.
'';
visible = false;
};
};
# TODO: introduced 2024-07-29: remove after 24.11
# NOTE: this may be upgraded to a mkRemoveOptionModule when which-key removes support
extraConfig =
cfg: opts:
lib.mkIf opts.registrations.isDefined {
warnings = lib.nixvim.mkWarnings "plugins.which-key" ''
The option definition `plugins.which-key.registrations' in ${showFiles opts.registrations.files} has been deprecated in which-key v3; please remove it.
You should use `plugins.which-key.settings.spec' instead.
Note: the spec format has changed in which-key v3
See: https://github.com/folke/which-key.nvim?tab=readme-ov-file#%EF%B8%8F-mappings
'';
plugins.which-key.luaConfig.content = lib.optionalString opts.registrations.isDefined ''
require("which-key").register(${toLuaObject cfg.registrations})
'';
};
} }

2
plugins/by-name/windsurf-vim/default.nix
View file

@ -41,7 +41,7 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-02-19: remove 2024-03-19 # TODO: introduced 2025-04-19
inherit ((import ./deprecations.nix { inherit lib; })) imports; inherit ((import ./deprecations.nix { inherit lib; })) imports;
settingsOptions = { settingsOptions = {

33
plugins/by-name/windsurf-vim/deprecations.nix
View file

@ -4,30 +4,15 @@
}: }:
{ {
imports = imports =
# TODO: introduced 2024-02-19: remove 2024-03-19
lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-vim" ] lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-vim" ]
[ "plugins" "windsurf-vim" "settings" ] [ "plugins" "windsurf-vim" ]
[ [
"bin" "package"
"filetypes" "settings"
"manual" "keymaps"
"noMapTab" {
"idleDelay" old = "extraConfig";
"render" new = "settings";
"tabFallback" }
"disableBindings" ];
]
# TODO: introduced 2025-04-19
++
lib.nixvim.deprecation.mkSettingsRenamedOptionModules [ "plugins" "codeium-vim" ]
[ "plugins" "windsurf-vim" ]
[
"package"
"settings"
"keymaps"
{
old = "extraConfig";
new = "settings";
}
];
} }

120
plugins/by-name/yanky/default.nix
View file

@ -2,7 +2,6 @@
lib, lib,
config, config,
helpers, helpers,
options,
... ...
}: }:
with lib; with lib;
@ -13,113 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-06-28. Remove after 24.11 release.
deprecateExtraOptions = true;
optionsRenamedToSettings = [
[
"ring"
"historyLength"
]
[
"ring"
"storage"
]
[
"ring"
"storagePath"
]
[
"ring"
"syncWithNumberedRegisters"
]
[
"ring"
"cancelEvent"
]
[
"ring"
"ignoreRegisters"
]
[
"ring"
"updateRegisterOnCycle"
]
[
"picker"
"telescope"
"useDefaultMappings"
]
[
"systemClipboard"
"syncWithRing"
]
[
"highlight"
"onPut"
]
[
"highlight"
"onYank"
]
[
"highlight"
"timer"
]
[
"preserveCursorPosition"
"enabled"
]
[
"textobj"
"enabled"
]
];
imports =
let
basePluginPath = [
"plugins"
"yanky"
];
in
[
(mkRemovedOptionModule
(
basePluginPath
++ [
"picker"
"select"
"action"
]
)
''
Please use `plugins.yanky.settings.picker.select.action` instead.
However, be careful as we do not perform any manipulation on the provided string.
''
)
(mkRenamedOptionModule (
basePluginPath
++ [
"picker"
"telescope"
"enable"
]
) (basePluginPath ++ [ "enableTelescope" ]))
(mkRemovedOptionModule
(
basePluginPath
++ [
"picker"
"telescope"
"mappings"
]
)
''
Please use `plugins.yanky.settings.picker.telescope.mappings` instead.
However, be careful as we do not perform any manipulation on the provided strings.
''
)
];
settingsDescription = '' settingsDescription = ''
Options provided to the `require('yanky').setup` function. Options provided to the `require('yanky').setup` function.
@ -347,18 +239,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
callSetup = false; callSetup = false;
extraConfig = cfg: { extraConfig = cfg: {
# TODO: Added 2024-09-14 remove after 24.11
plugins.sqlite-lua.enable = mkOverride 1490 true;
warnings = lib.nixvim.mkWarnings "plugins.yanky" {
when =
cfg.settings.ring.storage == "sqlite" && options.plugins.sqlite-lua.enable.highestPrio == 1490;
message = ''
`sqlite-lua` automatic installation is deprecated.
Please use `plugins.sqlite-lua.enable`.
'';
};
assertions = lib.nixvim.mkAssertions "plugins.yanky" [ assertions = lib.nixvim.mkAssertions "plugins.yanky" [
{ {
assertion = cfg.enableTelescope -> config.plugins.telescope.enable; assertion = cfg.enableTelescope -> config.plugins.telescope.enable;

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

@ -12,15 +12,6 @@ mkVimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO introduced 2024-03-02: remove 2024-05-02
deprecateExtraConfig = true;
optionsRenamedToSettings = [
{
old = "formatOnSave";
new = "fmt_autosave";
}
];
settingsOptions = { settingsOptions = {
fmt_autosave = lib.nixvim.defaultNullOpts.mkFlagInt 1 '' fmt_autosave = lib.nixvim.defaultNullOpts.mkFlagInt 1 ''
This plugin enables automatic code formatting on save by default using zig fmt. This plugin enables automatic code formatting on save by default using zig fmt.

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

@ -12,24 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
# TODO: introduced 2024-06-28. Remove after 24.11 release.
optionsRenamedToSettings = [
"picker"
[
"lsp"
"config"
]
[
"lsp"
"autoAttach"
"enabled"
]
[
"lsp"
"autoAttach"
"filetypes"
]
];
imports = [ imports = [
# TODO: added 2025-04-07, remove after 25.05 # TODO: added 2025-04-07, remove after 25.05
(lib.nixvim.mkRemovedPackageOptionModule { (lib.nixvim.mkRemovedPackageOptionModule {

8
plugins/cmp/auto-enable.nix
View file

@ -72,14 +72,6 @@ in
- Dismiss this warning by explicitly setting `autoEnableSources` to `false`; - Dismiss this warning by explicitly setting `autoEnableSources` to `false`;
''; '';
} }
# TODO: Added 2024-09-22; remove after 24.11
{
when = lib.elem "otter" enabledSources;
message = ''
"otter" is listed in `settings.sources`, however it is no longer a cmp source.
Instead, you should enable `plugins.otter` and use the "cmp-nvim-lsp" completion source.
'';
}
]; ];
# If the user has enabled the `foo` and `bar` sources, then `plugins` will look like: # If the user has enabled the `foo` and `bar` sources, then `plugins` will look like:

4
plugins/cmp/default.nix
View file

@ -58,13 +58,9 @@ lib.nixvim.plugins.mkNeovimPlugin {
''; '';
imports = [ imports = [
# Introduced on 2024 February 21
# TODO: remove ~June 2024
./deprecations.nix
./auto-enable.nix ./auto-enable.nix
./sources ./sources
]; ];
deprecateExtraOptions = true;
inherit (cmpOptions) settingsOptions settingsExample; inherit (cmpOptions) settingsOptions settingsExample;
extraOptions = { extraOptions = {

217
plugins/cmp/deprecations.nix
View file

@ -1,217 +0,0 @@
{ lib, ... }:
let
inherit (lib) mkRenamedOptionModule mkRemovedOptionModule;
oldPluginBasePath = [
"plugins"
"nvim-cmp"
];
newPluginBasePath = [
"plugins"
"cmp"
];
settingsPath = newPluginBasePath ++ [ "settings" ];
renamedOptions = [
[
"performance"
"debounce"
]
[
"performance"
"throttle"
]
[
"performance"
"fetchingTimeout"
]
[
"performance"
"asyncBudget"
]
[
"performance"
"maxViewEntries"
]
"mapping"
[
"completion"
"keywordLength"
]
[
"completion"
"keywordPattern"
]
[
"completion"
"autocomplete"
]
[
"completion"
"completeopt"
]
[
"confirmation"
"getCommitCharacters"
]
[
"formatting"
"expandableIndicator"
]
[
"formatting"
"fields"
]
[
"formatting"
"format"
]
[
"matching"
"disallowFuzzyMatching"
]
[
"matching"
"disallowFullfuzzyMatching"
]
[
"matching"
"disallowPartialFuzzyMatching"
]
[
"matching"
"disallowPartialMatching"
]
[
"matching"
"disallowPrefixUnmatching"
]
[
"sorting"
"priorityWeight"
]
[
"view"
"entries"
]
[
"view"
"docs"
"autoOpen"
]
[
"window"
"completion"
"border"
]
[
"window"
"completion"
"winhighlight"
]
[
"window"
"completion"
"zindex"
]
[
"window"
"completion"
"scrolloff"
]
[
"window"
"completion"
"colOffset"
]
[
"window"
"completion"
"sidePadding"
]
[
"window"
"completion"
"scrollbar"
]
[
"window"
"documentation"
"border"
]
[
"window"
"documentation"
"winhighlight"
]
[
"window"
"documentation"
"zindex"
]
[
"window"
"documentation"
"maxWidth"
]
[
"window"
"documentation"
"maxHeight"
]
"experimental"
];
renameWarnings =
lib.nixvim.mkSettingsRenamedOptionModules oldPluginBasePath settingsPath
renamedOptions;
in
{
imports = renameWarnings ++ [
(mkRenamedOptionModule (oldPluginBasePath ++ [ "enable" ]) (newPluginBasePath ++ [ "enable" ]))
(mkRenamedOptionModule (oldPluginBasePath ++ [ "autoEnableSources" ]) (
newPluginBasePath ++ [ "autoEnableSources" ]
))
(mkRemovedOptionModule (oldPluginBasePath ++ [ "preselect" ]) ''
Use `plugins.cmp.settings.preselect` option. But watch out, you now have to explicitly write `cmp.PreselectMode.<mode>`.
See the option documentation for more details.
'')
(mkRemovedOptionModule (oldPluginBasePath ++ [ "mappingPresets" ])
"If you want to have a complex mapping logic, express it in raw lua within the `plugins.cmp.settings.mapping` option."
)
(mkRemovedOptionModule
(
oldPluginBasePath
++ [
"snippet"
"expand"
]
)
''
Use `plugins.cmp.settings.snippet.expand` option. But watch out, you can no longer put only the name of the snippet engine.
If you use `luasnip` for instance, set:
```
plugins.cmp.settings.snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
```
''
)
(mkRemovedOptionModule
(
oldPluginBasePath
++ [
"sorting"
"comparators"
]
)
''
Use `plugins.cmp.settings.sorting.comparators` option. But watch out, you can no longer put only the name of the comparators.
See the option documentation for more details.
''
)
(mkRemovedOptionModule (oldPluginBasePath ++ [ "sources" ]) ''
Use `plugins.cmp.settings.sources` option. But watch out, you can no longer provide a list of lists of sources.
For this type of use, directly write lua.
See the option documentation for more details.
'')
];
}

18
plugins/colorschemes/base16/default.nix
View file

@ -19,24 +19,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
MattSturgeon MattSturgeon
]; ];
# TODO introduced 2024-03-12: remove after 24.11
imports =
let
basePluginPath = [
"colorschemes"
name
];
in
[
(lib.mkRenamedOptionModule (basePluginPath ++ [ "customColorScheme" ]) (
basePluginPath ++ [ "colorscheme" ]
))
(lib.mkRenamedOptionModule (basePluginPath ++ [ "useTruecolor" ]) [
"options"
"termguicolors"
])
];
settingsExample = { settingsExample = {
telescope_borders = true; telescope_borders = true;
indentblankline = false; indentblankline = false;

97
plugins/colorschemes/catppuccin.nix
View file

@ -13,103 +13,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-03-27: remove 2024-05-27
optionsRenamedToSettings = [
"flavour"
[
"background"
"light"
]
[
"background"
"dark"
]
"transparentBackground"
[
"dimInactive"
"enabled"
]
[
"dimInactive"
"shade"
]
[
"dimInactive"
"percentage"
]
[
"styles"
"comments"
]
[
"styles"
"conditionals"
]
[
"styles"
"loops"
]
[
"styles"
"functions"
]
[
"styles"
"keywords"
]
[
"styles"
"strings"
]
[
"styles"
"variables"
]
[
"styles"
"numbers"
]
[
"styles"
"booleans"
]
[
"styles"
"properties"
]
[
"styles"
"types"
]
[
"styles"
"operators"
]
"colorOverrides"
"customHighlights"
"integrations"
{
old = "showBufferEnd";
new = "show_end_of_buffer";
}
{
old = "terminalColors";
new = "term_colors";
}
{
old = "disableItalic";
new = "no_italic";
}
{
old = "disableBold";
new = "no_bold";
}
{
old = "disableUnderline";
new = "no_underline";
}
];
settingsOptions = settingsOptions =
let let
flavours = [ flavours = [

36
plugins/colorschemes/gruvbox.nix
View file

@ -9,42 +9,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# Introduced January 31 2024
# TODO remove in early March 2024.
imports =
map
(
optionName:
lib.mkRemovedOptionModule [
"colorschemes"
"gruvbox"
optionName
] "Please use `colorschemes.gruvbox.settings.${lib.nixvim.toSnakeCase optionName}` instead."
)
[
"italics"
"bold"
"underline"
"undercurl"
"contrastDark"
"contrastLight"
"highlightSearchCursor"
"numberColumn"
"signColumn"
"colorColumn"
"vertSplitColor"
"italicizeComments"
"italicizeStrings"
"invertSelection"
"invertSigns"
"invertIndentGuides"
"invertTabline"
"improvedStrings"
"improvedWarnings"
"transparentBg"
"trueColor"
];
settingsExample = { settingsExample = {
terminal_colors = true; terminal_colors = true;
palette_overrides = { palette_overrides = {

32
plugins/colorschemes/kanagawa.nix
View file

@ -19,38 +19,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-03-15: remove 2024-05-15
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"compile"
"undercurl"
"commentStyle"
"functionStyle"
"keywordStyle"
"statementStyle"
"typeStyle"
"transparent"
"dimInactive"
"terminalColors"
[
"colors"
"palette"
]
[
"colors"
"theme"
]
"theme"
[
"background"
"dark"
]
[
"background"
"light"
]
];
imports = [ imports = [
(lib.mkRemovedOptionModule (lib.mkRemovedOptionModule
[ [

12
plugins/colorschemes/nord.nix
View file

@ -13,18 +13,6 @@ lib.nixvim.plugins.mkVimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-02-20: remove 2024-04-20
deprecateExtraConfig = true;
optionsRenamedToSettings = [
"contrast"
"borders"
"disableBackground"
"cursorlineTransparent"
"enableSidebarBackground"
"italic"
"uniformDiffBackground"
];
settingsOptions = { settingsOptions = {
contrast = defaultNullOpts.mkBool false '' contrast = defaultNullOpts.mkBool false ''
Make sidebars and popup menus like nvim-tree and telescope have a different background. Make sidebars and popup menus like nvim-tree and telescope have a different background.

11
plugins/colorschemes/palette.nix
View file

@ -20,17 +20,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
config.plugins.lsp.package config.plugins.lsp.package
]; ];
# TODO introduced 2024-04-07: remove 2024-06-07
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"palettes"
"customPalettes"
"italics"
"transparentBackground"
"caching"
"cacheDir"
];
settingsOptions = { settingsOptions = {
palettes = { palettes = {
main = defaultNullOpts.mkStr "dark" '' main = defaultNullOpts.mkStr "dark" ''

13
plugins/colorschemes/poimandres.nix
View file

@ -12,19 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-04-15: remove 2024-06-15
deprecateExtraOptions = true;
optionsRenamedToSettings = [
"boldVertSplit"
"darkVariant"
"disableBackground"
"disableFloatBackground"
"disableItalics"
"dimNcBackground"
"groups"
"highlightGroups"
];
settingsOptions = { settingsOptions = {
bold_vert_split = defaultNullOpts.mkBool false '' bold_vert_split = defaultNullOpts.mkBool false ''
Use bold vertical separators. Use bold vertical separators.

39
plugins/colorschemes/rose-pine.nix
View file

@ -11,45 +11,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-04-15: remove 2024-06-15
optionsRenamedToSettings = [
"groups"
"highlightGroups"
{
old = "style";
new = "dark_variant";
}
{
old = "dimInactive";
new = "dim_inactive_windows";
}
{
old = "transparentBackground";
new = [
"enable"
"transparency"
];
}
];
imports =
let
basePluginPath = [
"colorschemes"
"rose-pine"
];
in
[
(lib.mkRemovedOptionModule (
basePluginPath ++ [ "disableItalics" ]
) "Use `colorschemes.rose-pine.settings.enable.italics` instead.")
(lib.mkRemovedOptionModule (
basePluginPath ++ [ "boldVerticalSplit" ]
) "Use `colorschemes.rose-pine.settings.highlight_groups` instead.")
(lib.mkRemovedOptionModule (
basePluginPath ++ [ "transparentFloat" ]
) "Use `colorschemes.rose-pine.settings.highlight_groups.NormalFloat` instead.")
];
settingsOptions = { settingsOptions = {
variant = variant =
lib.nixvim.mkNullOrOption lib.nixvim.mkNullOrOption

38
plugins/colorschemes/tokyonight.nix
View file

@ -12,44 +12,6 @@ lib.nixvim.plugins.mkNeovimPlugin {
maintainers = [ lib.maintainers.GaetanLepage ]; maintainers = [ lib.maintainers.GaetanLepage ];
# TODO introduced 2024-04-15: remove 2024-06-15
optionsRenamedToSettings = [
"style"
"transparent"
"terminalColors"
[
"styles"
"comments"
]
[
"styles"
"keywords"
]
[
"styles"
"functions"
]
[
"styles"
"variables"
]
[
"styles"
"sidebars"
]
[
"styles"
"floats"
]
"sidebars"
"dayBrightness"
"hideInactiveStatusline"
"dimInactive"
"lualineBold"
"onColors"
"onHighlights"
];
settingsOptions = { settingsOptions = {
style = style =
defaultNullOpts.mkEnumFirstDefault defaultNullOpts.mkEnumFirstDefault