helpers/vim-plugin/mkVimPlugin: rename addExtraConfigRenameWarning to deprecateExtraConfig

This commit is contained in:
Gaetan Lepage 2024-02-19 10:19:39 +01:00 committed by Gaétan Lepage
parent 7af65ccae4
commit cef446a4da
15 changed files with 17 additions and 16 deletions

View file

@ -8,6 +8,8 @@ with lib; {
namespace ? "plugins", namespace ? "plugins",
maintainers ? [], maintainers ? [],
imports ? [], imports ? [],
# deprecations
deprecateExtraConfig ? false,
# options # options
originalName ? name, originalName ? name,
defaultPackage ? null, defaultPackage ? null,
@ -15,7 +17,6 @@ with lib; {
settingsOptions ? {}, settingsOptions ? {},
settingsExample ? null, settingsExample ? null,
globalPrefix ? "", globalPrefix ? "",
addExtraConfigRenameWarning ? false,
extraOptions ? {}, extraOptions ? {},
# config # config
extraConfig ? cfg: {}, extraConfig ? cfg: {},
@ -89,7 +90,7 @@ with lib; {
imports = imports =
imports imports
++ optional (addExtraConfigRenameWarning && createSettingsOption) ( ++ optional (deprecateExtraConfig && createSettingsOption) (
mkRenamedOptionModule mkRenamedOptionModule
["plugins" name "extraConfig"] ["plugins" name "extraConfig"]
["plugins" name "settings"] ["plugins" name "settings"]

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "copilot.vim"; originalName = "copilot.vim";
defaultPackage = pkgs.vimPlugins.copilot-vim; defaultPackage = pkgs.vimPlugins.copilot-vim;
globalPrefix = "copilot_"; globalPrefix = "copilot_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
nodeCommand = mkDefaultOpt { nodeCommand = mkDefaultOpt {

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "vim-ledger"; originalName = "vim-ledger";
defaultPackage = pkgs.vimPlugins.vim-ledger; defaultPackage = pkgs.vimPlugins.vim-ledger;
globalPrefix = "ledger_"; globalPrefix = "ledger_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
maxWidth = mkDefaultOpt { maxWidth = mkDefaultOpt {

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "markdown-preview.nvim"; originalName = "markdown-preview.nvim";
defaultPackage = pkgs.vimPlugins.markdown-preview-nvim; defaultPackage = pkgs.vimPlugins.markdown-preview-nvim;
globalPrefix = "mkdp_"; globalPrefix = "mkdp_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
autoStart = mkDefaultOpt { autoStart = mkDefaultOpt {

View file

@ -8,6 +8,6 @@ helpers.vim-plugin.mkVimPlugin config {
name = "tagbar"; name = "tagbar";
defaultPackage = pkgs.vimPlugins.tagbar; defaultPackage = pkgs.vimPlugins.tagbar;
globalPrefix = "tagbar_"; globalPrefix = "tagbar_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
extraPackages = [pkgs.ctags]; extraPackages = [pkgs.ctags];
} }

View file

@ -11,7 +11,7 @@ with helpers.vim-plugin;
name = "vim-slime"; name = "vim-slime";
defaultPackage = pkgs.vimPlugins.vim-slime; defaultPackage = pkgs.vimPlugins.vim-slime;
globalPrefix = "slime_"; globalPrefix = "slime_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
target = mkDefaultOpt { target = mkDefaultOpt {

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "zig.vim"; originalName = "zig.vim";
defaultPackage = pkgs.vimPlugins.zig-vim; defaultPackage = pkgs.vimPlugins.zig-vim;
globalPrefix = "zig_"; globalPrefix = "zig_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
# Possibly add option to disable Treesitter highlighting if this is installed # Possibly add option to disable Treesitter highlighting if this is installed
options = { options = {

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "vim-airline"; originalName = "vim-airline";
defaultPackage = pkgs.vimPlugins.vim-airline; defaultPackage = pkgs.vimPlugins.vim-airline;
globalPrefix = "airline_"; globalPrefix = "airline_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = options =
( (

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "emmet-vim"; originalName = "emmet-vim";
defaultPackage = pkgs.vimPlugins.emmet-vim; defaultPackage = pkgs.vimPlugins.emmet-vim;
globalPrefix = "user_emmet_"; globalPrefix = "user_emmet_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
mode = mkDefaultOpt { mode = mkDefaultOpt {

View file

@ -12,7 +12,7 @@ with lib;
originalName = "goyo.vim"; originalName = "goyo.vim";
defaultPackage = pkgs.vimPlugins.goyo-vim; defaultPackage = pkgs.vimPlugins.goyo-vim;
globalPrefix = "goyo_"; globalPrefix = "goyo_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
width = mkDefaultOpt { width = mkDefaultOpt {

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "instant.nvim"; originalName = "instant.nvim";
defaultPackage = pkgs.vimPlugins.instant-nvim; defaultPackage = pkgs.vimPlugins.instant-nvim;
globalPrefix = "instant_"; globalPrefix = "instant_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = let options = let
mkStr = global: default: desc: mkStr = global: default: desc:

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "magma-nvim"; originalName = "magma-nvim";
defaultPackage = pkgs.vimPlugins.magma-nvim-goose; defaultPackage = pkgs.vimPlugins.magma-nvim-goose;
globalPrefix = "magma_"; globalPrefix = "magma_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
imageProvider = mkDefaultOpt { imageProvider = mkDefaultOpt {

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "molten-nvim"; originalName = "molten-nvim";
defaultPackage = pkgs.vimPlugins.molten-nvim; defaultPackage = pkgs.vimPlugins.molten-nvim;
globalPrefix = "molten_"; globalPrefix = "molten_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
autoOpenOutput = mkDefaultOpt { autoOpenOutput = mkDefaultOpt {

View file

@ -12,7 +12,7 @@ with helpers.vim-plugin;
originalName = "vim-startify"; originalName = "vim-startify";
defaultPackage = pkgs.vimPlugins.vim-startify; defaultPackage = pkgs.vimPlugins.vim-startify;
globalPrefix = "startify_"; globalPrefix = "startify_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
sessionDir = mkDefaultOpt { sessionDir = mkDefaultOpt {

View file

@ -11,7 +11,7 @@ with helpers.vim-plugin;
name = "undotree"; name = "undotree";
defaultPackage = pkgs.vimPlugins.undotree; defaultPackage = pkgs.vimPlugins.undotree;
globalPrefix = "undotree_"; globalPrefix = "undotree_";
addExtraConfigRenameWarning = true; deprecateExtraConfig = true;
options = { options = {
windowLayout = mkDefaultOpt { windowLayout = mkDefaultOpt {