plugins: remove all uses of lib.nixvim.mkPluginPackageOption

This commit is contained in:
Matt Sturgeon 2024-09-04 22:00:43 +01:00
parent ae3a2c9d10
commit 7409e80bd2
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
77 changed files with 462 additions and 77 deletions

View file

@ -98,7 +98,12 @@ in
options.plugins.clangd-extensions = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "clangd_extensions, plugins implementing clangd LSP extensions";
package = helpers.mkPluginPackageOption "clangd_extensions.nvim" pkgs.vimPlugins.clangd_extensions-nvim;
package = lib.mkPackageOption pkgs "clangd_extensions.nvim" {
default = [
"vimPlugins"
"clangd_extensions-nvim"
];
};
enableOffsetEncodingWorkaround = mkEnableOption ''
utf-16 offset encoding. This is used to work around the warning:

View file

@ -15,7 +15,12 @@ in
options.plugins.helm = {
enable = mkEnableOption "vim-helm";
package = helpers.mkPluginPackageOption "vim-helm" pkgs.vimPlugins.vim-helm;
package = lib.mkPackageOption pkgs "vim-helm" {
default = [
"vimPlugins"
"vim-helm"
];
};
};
config = mkIf cfg.enable { extraPlugins = [ cfg.package ]; };

View file

@ -13,7 +13,12 @@ in
options.plugins.lean = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "lean-nvim";
package = helpers.mkPluginPackageOption "lean-nvim" pkgs.vimPlugins.lean-nvim;
package = lib.mkPackageOption pkgs "lean-nvim" {
default = [
"vimPlugins"
"lean-nvim"
];
};
leanPackage = lib.mkPackageOption pkgs "lean" {
nullable = true;

View file

@ -137,7 +137,12 @@ in
options.plugins.lint = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-lint";
package = helpers.mkPluginPackageOption "nvim-lint" pkgs.vimPlugins.nvim-lint;
package = lib.mkPackageOption pkgs "nvim-lint" {
default = [
"vimPlugins"
"nvim-lint"
];
};
lintersByFt = mkOption {
type = with types; attrsOf (listOf str);

View file

@ -13,7 +13,12 @@ in
options.plugins.nvim-jdtls = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-jdtls";
package = helpers.mkPluginPackageOption "nvim-jdtls" pkgs.vimPlugins.nvim-jdtls;
package = lib.mkPackageOption pkgs "nvim-jdtls" {
default = [
"vimPlugins"
"nvim-jdtls"
];
};
cmd = helpers.mkNullOrOption (types.listOf types.str) ''
The command that starts the language server.

View file

@ -13,7 +13,12 @@ in
options.plugins.openscad = {
enable = mkEnableOption "openscad.nvim, a plugin to manage OpenSCAD files";
package = helpers.mkPluginPackageOption "openscad.nvim" pkgs.vimPlugins.openscad-nvim;
package = lib.mkPackageOption pkgs "openscad.nvim" {
default = [
"vimPlugins"
"openscad-nvim"
];
};
fuzzyFinder = helpers.defaultNullOpts.mkEnum [
"skim"

View file

@ -10,7 +10,12 @@ with lib;
options.plugins.plantuml-syntax = {
enable = mkEnableOption "plantuml syntax support";
package = helpers.mkPluginPackageOption "plantuml-syntax" pkgs.vimPlugins.plantuml-syntax;
package = lib.mkPackageOption pkgs "plantuml-syntax" {
default = [
"vimPlugins"
"plantuml-syntax"
];
};
setMakeprg = mkOption {
type = types.bool;

View file

@ -12,7 +12,12 @@ in
{
options.plugins.rust-tools = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "rust tools plugins";
package = helpers.mkPluginPackageOption "rust-tools" pkgs.vimPlugins.rust-tools-nvim;
package = lib.mkPackageOption pkgs "rust-tools" {
default = [
"vimPlugins"
"rust-tools-nvim"
];
};
serverPackage = lib.mkPackageOption pkgs "rust-analyzer" {
nullable = true;
};

View file

@ -15,7 +15,12 @@ in
options.plugins.hmts = {
enable = mkEnableOption "hmts.nvim";
package = helpers.mkPluginPackageOption "hmts.nvim" pkgs.vimPlugins.hmts-nvim;
package = lib.mkPackageOption pkgs "hmts.nvim" {
default = [
"vimPlugins"
"hmts-nvim"
];
};
};
config = mkIf cfg.enable {

View file

@ -10,7 +10,12 @@ with lib;
options.plugins.rainbow-delimiters = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "rainbow-delimiters.nvim";
package = helpers.mkPluginPackageOption "rainbow-delimiters.nvim" pkgs.vimPlugins.rainbow-delimiters-nvim;
package = lib.mkPackageOption pkgs "rainbow-delimiters.nvim" {
default = [
"vimPlugins"
"rainbow-delimiters-nvim"
];
};
strategy = helpers.defaultNullOpts.mkAttrsOf' {
type = types.enum [

View file

@ -18,7 +18,12 @@ with lib;
{
enable = mkEnableOption "treesitter-refactor (requires plugins.treesitter.enable to be true)";
package = helpers.mkPluginPackageOption "treesitter-refactor" pkgs.vimPlugins.nvim-treesitter-refactor;
package = lib.mkPackageOption pkgs "treesitter-refactor" {
default = [
"vimPlugins"
"nvim-treesitter-refactor"
];
};
highlightDefinitions = {
inherit disable;

View file

@ -41,7 +41,12 @@ with lib;
// {
enable = mkEnableOption "treesitter-textobjects (requires plugins.treesitter.enable to be true)";
package = helpers.mkPluginPackageOption "treesitter-textobjects" pkgs.vimPlugins.nvim-treesitter-textobjects;
package = lib.mkPackageOption pkgs "treesitter-textobjects" {
default = [
"vimPlugins"
"nvim-treesitter-textobjects"
];
};
select = {
enable = helpers.defaultNullOpts.mkBool false ''

View file

@ -10,7 +10,12 @@ with lib;
options.plugins.ts-context-commentstring = helpers.neovim-plugin.extraOptionsOptions // {
enable = mkEnableOption "nvim-ts-context-commentstring";
package = helpers.mkPluginPackageOption "ts-context-commentstring" pkgs.vimPlugins.nvim-ts-context-commentstring;
package = lib.mkPackageOption pkgs "ts-context-commentstring" {
default = [
"vimPlugins"
"nvim-ts-context-commentstring"
];
};
skipTsContextCommentStringModule = mkOption {
type = types.bool;

View file

@ -12,7 +12,12 @@ in
{
options.plugins.typescript-tools = {
enable = mkEnableOption "typescript-tools";
package = helpers.mkPluginPackageOption "typescript-tools" pkgs.vimPlugins.typescript-tools-nvim;
package = lib.mkPackageOption pkgs "typescript-tools" {
default = [
"vimPlugins"
"typescript-tools-nvim"
];
};
onAttach = helpers.defaultNullOpts.mkLuaFn "__lspOnAttach" "Lua code to run when tsserver attaches to a buffer.";
handlers = mkOption {