diff --git a/lib/vim-plugin.nix b/lib/vim-plugin.nix index fbca32c1..9331c78a 100644 --- a/lib/vim-plugin.nix +++ b/lib/vim-plugin.nix @@ -8,6 +8,8 @@ with lib; { namespace ? "plugins", maintainers ? [], imports ? [], + # deprecations + deprecateExtraConfig ? false, # options originalName ? name, defaultPackage ? null, @@ -15,7 +17,6 @@ with lib; { settingsOptions ? {}, settingsExample ? null, globalPrefix ? "", - addExtraConfigRenameWarning ? false, extraOptions ? {}, # config extraConfig ? cfg: {}, @@ -89,7 +90,7 @@ with lib; { imports = imports - ++ optional (addExtraConfigRenameWarning && createSettingsOption) ( + ++ optional (deprecateExtraConfig && createSettingsOption) ( mkRenamedOptionModule ["plugins" name "extraConfig"] ["plugins" name "settings"] diff --git a/plugins/completion/copilot-vim.nix b/plugins/completion/copilot-vim.nix index 54ee35b8..05a73154 100644 --- a/plugins/completion/copilot-vim.nix +++ b/plugins/completion/copilot-vim.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "copilot.vim"; defaultPackage = pkgs.vimPlugins.copilot-vim; globalPrefix = "copilot_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { nodeCommand = mkDefaultOpt { diff --git a/plugins/languages/ledger.nix b/plugins/languages/ledger.nix index 9addf2dd..f675422d 100644 --- a/plugins/languages/ledger.nix +++ b/plugins/languages/ledger.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "vim-ledger"; defaultPackage = pkgs.vimPlugins.vim-ledger; globalPrefix = "ledger_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { maxWidth = mkDefaultOpt { diff --git a/plugins/languages/markdown-preview.nix b/plugins/languages/markdown-preview.nix index 2d5cda4a..d91dd86a 100644 --- a/plugins/languages/markdown-preview.nix +++ b/plugins/languages/markdown-preview.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "markdown-preview.nvim"; defaultPackage = pkgs.vimPlugins.markdown-preview-nvim; globalPrefix = "mkdp_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { autoStart = mkDefaultOpt { diff --git a/plugins/languages/tagbar.nix b/plugins/languages/tagbar.nix index e6fc0403..8e9fd4cb 100644 --- a/plugins/languages/tagbar.nix +++ b/plugins/languages/tagbar.nix @@ -8,6 +8,6 @@ helpers.vim-plugin.mkVimPlugin config { name = "tagbar"; defaultPackage = pkgs.vimPlugins.tagbar; globalPrefix = "tagbar_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; extraPackages = [pkgs.ctags]; } diff --git a/plugins/languages/vim-slime.nix b/plugins/languages/vim-slime.nix index 92993c70..a5eeaa31 100644 --- a/plugins/languages/vim-slime.nix +++ b/plugins/languages/vim-slime.nix @@ -11,7 +11,7 @@ with helpers.vim-plugin; name = "vim-slime"; defaultPackage = pkgs.vimPlugins.vim-slime; globalPrefix = "slime_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { target = mkDefaultOpt { diff --git a/plugins/languages/zig.nix b/plugins/languages/zig.nix index faf361b0..8e3f8731 100644 --- a/plugins/languages/zig.nix +++ b/plugins/languages/zig.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "zig.vim"; defaultPackage = pkgs.vimPlugins.zig-vim; globalPrefix = "zig_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; # Possibly add option to disable Treesitter highlighting if this is installed options = { diff --git a/plugins/statuslines/airline.nix b/plugins/statuslines/airline.nix index ad1d2950..0fb958ed 100644 --- a/plugins/statuslines/airline.nix +++ b/plugins/statuslines/airline.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "vim-airline"; defaultPackage = pkgs.vimPlugins.vim-airline; globalPrefix = "airline_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = ( diff --git a/plugins/utils/emmet.nix b/plugins/utils/emmet.nix index 56f47180..e59a6c48 100644 --- a/plugins/utils/emmet.nix +++ b/plugins/utils/emmet.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "emmet-vim"; defaultPackage = pkgs.vimPlugins.emmet-vim; globalPrefix = "user_emmet_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { mode = mkDefaultOpt { diff --git a/plugins/utils/goyo.nix b/plugins/utils/goyo.nix index b8dcaa12..3b9745ad 100644 --- a/plugins/utils/goyo.nix +++ b/plugins/utils/goyo.nix @@ -12,7 +12,7 @@ with lib; originalName = "goyo.vim"; defaultPackage = pkgs.vimPlugins.goyo-vim; globalPrefix = "goyo_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { width = mkDefaultOpt { diff --git a/plugins/utils/instant.nix b/plugins/utils/instant.nix index 42b63676..1c48ecd3 100644 --- a/plugins/utils/instant.nix +++ b/plugins/utils/instant.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "instant.nvim"; defaultPackage = pkgs.vimPlugins.instant-nvim; globalPrefix = "instant_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = let mkStr = global: default: desc: diff --git a/plugins/utils/magma-nvim.nix b/plugins/utils/magma-nvim.nix index 5b06f3c9..add06df2 100644 --- a/plugins/utils/magma-nvim.nix +++ b/plugins/utils/magma-nvim.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "magma-nvim"; defaultPackage = pkgs.vimPlugins.magma-nvim-goose; globalPrefix = "magma_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { imageProvider = mkDefaultOpt { diff --git a/plugins/utils/molten.nix b/plugins/utils/molten.nix index 0780ec16..085cd22a 100644 --- a/plugins/utils/molten.nix +++ b/plugins/utils/molten.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "molten-nvim"; defaultPackage = pkgs.vimPlugins.molten-nvim; globalPrefix = "molten_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { autoOpenOutput = mkDefaultOpt { diff --git a/plugins/utils/startify.nix b/plugins/utils/startify.nix index 19ef4eba..ab16f154 100644 --- a/plugins/utils/startify.nix +++ b/plugins/utils/startify.nix @@ -12,7 +12,7 @@ with helpers.vim-plugin; originalName = "vim-startify"; defaultPackage = pkgs.vimPlugins.vim-startify; globalPrefix = "startify_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { sessionDir = mkDefaultOpt { diff --git a/plugins/utils/undotree.nix b/plugins/utils/undotree.nix index 766d0b80..2ae27867 100644 --- a/plugins/utils/undotree.nix +++ b/plugins/utils/undotree.nix @@ -11,7 +11,7 @@ with helpers.vim-plugin; name = "undotree"; defaultPackage = pkgs.vimPlugins.undotree; globalPrefix = "undotree_"; - addExtraConfigRenameWarning = true; + deprecateExtraConfig = true; options = { windowLayout = mkDefaultOpt {