lib/helpers: extraOptionsOptions -> neovim-plugin.extraOptionsOptions

2025-06-21 08:35:43 +02:00 · 2024-01-25 16:15:55 +01:00 · 2024-01-25 16:15:55 +01:00 · e2c3459d1d
commit e2c3459d1d
parent 8b91bf010a
89 changed files with 103 additions and 97 deletions
--- a/lib/helpers.nix
+++ b/lib/helpers.nix
@ -7,6 +7,7 @@ in
    maintainers = import ./maintainers.nix;
    keymaps = import ./keymap-helpers.nix {inherit lib;};
    autocmd = import ./autocmd-helpers.nix {inherit lib;};
+    neovim-plugin = import ./neovim-plugin.nix {inherit lib nixvimOptions;};
    vim-plugin = import ./vim-plugin.nix {inherit lib nixvimOptions;};
    inherit (import ./to-lua.nix {inherit lib;}) toLuaObject;
    inherit nixvimTypes;
--- a/lib/neovim-plugin.nix
+++ b/lib/neovim-plugin.nix
@ -0,0 +1,16 @@
+{
+  lib,
+  nixvimOptions,
+}:
+with lib; {
+  extraOptionsOptions = {
+    extraOptions = mkOption {
+      default = {};
+      type = with types; attrsOf anything;
+      description = ''
+        These attributes will be added to the table parameter for the setup function.
+        (Can override other attributes set by nixvim)
+      '';
+    };
+  };
+}
--- a/lib/options.nix
+++ b/lib/options.nix
@ -237,15 +237,4 @@ with nixvimUtils; rec {
      inherit default;
      description = "Plugin to use for ${name}";
    };
-
-  extraOptionsOptions = {
-    extraOptions = mkOption {
-      default = {};
-      type = types.attrs;
-      description = ''
-        These attributes will be added to the table parameter for the setup function.
-        (Can override other attributes set by nixvim)
-      '';
-    };
-  };
 }
--- a/plugins/TEMPLATE.nix
+++ b/plugins/TEMPLATE.nix
@ -12,7 +12,7 @@ in {

  # TODO replace
  options.plugins.my-plugin =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "my-plugin.nvim"; # TODO replace

--- a/plugins/bufferlines/barbar.nix
+++ b/plugins/bufferlines/barbar.nix
@ -80,7 +80,7 @@ with lib; let
  };
 in {
  options.plugins.barbar =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "barbar.nvim";

--- a/plugins/bufferlines/barbecue.nix
+++ b/plugins/bufferlines/barbecue.nix
@ -10,7 +10,7 @@ with lib; let
  mkListStr = helpers.defaultNullOpts.mkNullable (types.listOf types.str);
 in {
  options.plugins.barbecue =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "barbecue-nvim";

--- a/plugins/bufferlines/bufferline.nix
+++ b/plugins/bufferlines/bufferline.nix
@ -91,7 +91,7 @@ with lib; let
 in {
  options = {
    plugins.bufferline =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "bufferline";

--- a/plugins/bufferlines/navic.nix
+++ b/plugins/bufferlines/navic.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.navic;
 in {
  options.plugins.navic =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-navic";

--- a/plugins/colorschemes/ayu.nix
+++ b/plugins/colorschemes/ayu.nix
@ -10,7 +10,7 @@ with lib; let
 in {
  options = {
    colorschemes.ayu =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "ayu";

--- a/plugins/colorschemes/kanagawa.nix
+++ b/plugins/colorschemes/kanagawa.nix
@ -10,7 +10,7 @@ with lib; let
 in {
  options = {
    colorschemes.kanagawa =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "kanagawa";

--- a/plugins/colorschemes/palette.nix
+++ b/plugins/colorschemes/palette.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.colorschemes.palette =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "palette.nvim";

--- a/plugins/colorschemes/poimandres.nix
+++ b/plugins/colorschemes/poimandres.nix
@ -10,7 +10,7 @@ with lib; let
 in {
  options = {
    colorschemes.poimandres =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "poimandres";

--- a/plugins/completion/copilot-lua.nix
+++ b/plugins/completion/copilot-lua.nix
@ -12,7 +12,7 @@ in {
    plugins.copilot-lua = let
      keymapOption = helpers.defaultNullOpts.mkNullable (with types; either (enum [false]) str);
    in
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "copilot.lua";

--- a/plugins/completion/lspkind.nix
+++ b/plugins/completion/lspkind.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.lspkind;
 in {
  options.plugins.lspkind =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "lspkind.nvim";

--- a/plugins/completion/nvim-cmp/default.nix
+++ b/plugins/completion/nvim-cmp/default.nix
@ -17,7 +17,7 @@ with lib; let
  };
 in {
  options.plugins.nvim-cmp =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-cmp";

--- a/plugins/completion/nvim-cmp/sources/cmp-tabby.nix
+++ b/plugins/completion/nvim-cmp/sources/cmp-tabby.nix
@ -10,7 +10,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.cmp-tabby =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      host = helpers.defaultNullOpts.mkStr "http://localhost:5000" ''
        The adress of the tabby host server.
--- a/plugins/completion/nvim-cmp/sources/cmp-tabnine.nix
+++ b/plugins/completion/nvim-cmp/sources/cmp-tabnine.nix
@ -7,7 +7,7 @@
 with lib; let
  cfg = config.plugins.cmp-tabnine;
 in {
-  options.plugins.cmp-tabnine = helpers.extraOptionsOptions;
+  options.plugins.cmp-tabnine = helpers.neovim-plugin.extraOptionsOptions;

  config = mkIf cfg.enable {
    extraConfigLua = ''
--- a/plugins/completion/nvim-cmp/sources/codeium-nvim.nix
+++ b/plugins/completion/nvim-cmp/sources/codeium-nvim.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.codeium-nvim =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      package = helpers.mkPackageOption "codeium.nvim" pkgs.vimPlugins.codeium-nvim;

--- a/plugins/completion/nvim-cmp/sources/copilot-cmp.nix
+++ b/plugins/completion/nvim-cmp/sources/copilot-cmp.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.copilot-cmp;
 in {
  options.plugins.copilot-cmp =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      event =
        helpers.defaultNullOpts.mkNullable
--- a/plugins/completion/nvim-cmp/sources/crates-nvim.nix
+++ b/plugins/completion/nvim-cmp/sources/crates-nvim.nix
@ -7,7 +7,7 @@
 with lib; let
  cfg = config.plugins.crates-nvim;
 in {
-  options.plugins.crates-nvim = helpers.extraOptionsOptions;
+  options.plugins.crates-nvim = helpers.neovim-plugin.extraOptionsOptions;

  config = mkIf cfg.enable {
    extraConfigLua = ''
--- a/plugins/dap/dap-ui.nix
+++ b/plugins/dap/dap-ui.nix
@ -52,7 +52,7 @@ with lib; let
  };
 in {
  options.plugins.dap.extensions.dap-ui =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "dap-ui";

--- a/plugins/dap/default.nix
+++ b/plugins/dap/default.nix
@ -18,7 +18,7 @@ in
    ];

    options.plugins.dap =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "dap";

--- a/plugins/filetrees/chadtree.nix
+++ b/plugins/filetrees/chadtree.nix
@ -10,7 +10,7 @@ with lib; let
  mkListStr = helpers.defaultNullOpts.mkNullable (types.listOf types.str);
 in {
  options.plugins.chadtree =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "chadtree";

--- a/plugins/filetrees/neo-tree.nix
+++ b/plugins/filetrees/neo-tree.nix
@ -47,7 +47,7 @@ in {
      '';
    };
  in
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "neo-tree";

--- a/plugins/filetrees/nvim-tree.nix
+++ b/plugins/filetrees/nvim-tree.nix
@ -37,7 +37,7 @@ in {
    )
  ];
  options.plugins.nvim-tree =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-tree";

--- a/plugins/git/diffview.nix
+++ b/plugins/git/diffview.nix
@ -49,7 +49,7 @@ with lib; let
    };
 in {
  options.plugins.diffview = with helpers.defaultNullOpts;
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "diffview";

--- a/plugins/git/gitlinker.nix
+++ b/plugins/git/gitlinker.nix
@ -7,7 +7,7 @@
 }:
 with lib; {
  options.plugins.gitlinker =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "gitlinker.nvim";

--- a/plugins/languages/clangd-extensions.nix
+++ b/plugins/languages/clangd-extensions.nix
@ -56,7 +56,7 @@ in {
    );

  options.plugins.clangd-extensions =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "clangd_extensions, plugins implementing clangd LSP extensions";

--- a/plugins/languages/debugprint.nix
+++ b/plugins/languages/debugprint.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.debugprint;
 in {
  options.plugins.debugprint =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "debugprint.nvim";

--- a/plugins/languages/lean.nix
+++ b/plugins/languages/lean.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.lean;
 in {
  options.plugins.lean =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "lean-nvim";

--- a/plugins/languages/lint.nix
+++ b/plugins/languages/lint.nix
@ -133,7 +133,7 @@ with lib; let
    };
 in {
  options.plugins.lint =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-lint";

--- a/plugins/languages/nvim-jdtls.nix
+++ b/plugins/languages/nvim-jdtls.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nvim-jdtls;
 in {
  options.plugins.nvim-jdtls =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-jdtls";

--- a/plugins/languages/rust-tools.nix
+++ b/plugins/languages/rust-tools.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.rust-tools;
 in {
  options.plugins.rust-tools =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "rust tools plugins";
      package = helpers.mkPackageOption "rust-tools" pkgs.vimPlugins.rust-tools-nvim;
--- a/plugins/languages/rustaceanvim.nix
+++ b/plugins/languages/rustaceanvim.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.rustaceanvim =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "rustaceanvim";

--- a/plugins/languages/sniprun.nix
+++ b/plugins/languages/sniprun.nix
@ -11,7 +11,7 @@ with lib; let
  mkList = helpers.defaultNullOpts.mkNullable (types.listOf types.str);
 in {
  options.plugins.sniprun =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "sniprun";

--- a/plugins/languages/treesitter/rainbow-delimiters.nix
+++ b/plugins/languages/treesitter/rainbow-delimiters.nix
@ -7,7 +7,7 @@
 }:
 with lib; {
  options.plugins.rainbow-delimiters =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "rainbow-delimiters.nvim";

--- a/plugins/languages/treesitter/treesitter-context.nix
+++ b/plugins/languages/treesitter/treesitter-context.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.treesitter-context;
 in {
  options.plugins.treesitter-context =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-treesitter-context";

--- a/plugins/languages/treesitter/treesitter-textobjects.nix
+++ b/plugins/languages/treesitter/treesitter-textobjects.nix
@ -41,7 +41,7 @@ with lib; {
      "{}"
      desc;
  in
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable =
        mkEnableOption
--- a/plugins/languages/treesitter/ts-autotag.nix
+++ b/plugins/languages/treesitter/ts-autotag.nix
@ -8,7 +8,7 @@ with lib; let
  helpers = import ../../helpers.nix {inherit lib;};
 in {
  options.plugins.ts-autotag =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-ts-autotag";

--- a/plugins/languages/treesitter/ts-context-commentstring.nix
+++ b/plugins/languages/treesitter/ts-context-commentstring.nix
@ -7,7 +7,7 @@
 }:
 with lib; {
  options.plugins.ts-context-commentstring =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-ts-context-commentstring";

--- a/plugins/lsp/conform-nvim.nix
+++ b/plugins/lsp/conform-nvim.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.conform-nvim;
 in {
  options.plugins.conform-nvim =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "conform-nvim";

--- a/plugins/lsp/fidget.nix
+++ b/plugins/lsp/fidget.nix
@ -136,7 +136,7 @@ in {

  options = {
    plugins.fidget =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "fidget-nvim";

--- a/plugins/lsp/lsp-format.nix
+++ b/plugins/lsp/lsp-format.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.lsp-format;
 in {
  options.plugins.lsp-format =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "lsp-format.nvim";

--- a/plugins/lsp/lspsaga.nix
+++ b/plugins/lsp/lspsaga.nix
@ -46,7 +46,7 @@ in {

  options = {
    plugins.lspsaga =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "lspsaga.nvim";

--- a/plugins/lsp/trouble.nix
+++ b/plugins/lsp/trouble.nix
@ -9,7 +9,7 @@
 in
  with lib; {
    options.plugins.trouble =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "trouble.nvim";

--- a/plugins/lsp/wtf.nix
+++ b/plugins/lsp/wtf.nix
@ -26,7 +26,7 @@ with lib; let
 in {
  options = {
    plugins.wtf =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "wtf.nvim";

--- a/plugins/none-ls/default.nix
+++ b/plugins/none-ls/default.nix
@ -18,7 +18,7 @@ in {
  ];

  options.plugins.none-ls =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "none-ls";

--- a/plugins/telescope/default.nix
+++ b/plugins/telescope/default.nix
@ -21,7 +21,7 @@ in {
  # TODO:add support for aditional filetypes. This requires autocommands!

  options.plugins.telescope =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "telescope.nvim";

--- a/plugins/ui/image.nix
+++ b/plugins/ui/image.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.image =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "image.nvim";

--- a/plugins/ui/noice.nix
+++ b/plugins/ui/noice.nix
@ -10,7 +10,7 @@
 # toLuaObject, we would maybe need some ad-hoc pre-processing functions.
 with lib; {
  options.plugins.noice =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption ''
        noice.nvim, an experimental nvim UI.
--- a/plugins/utils/auto-save.nix
+++ b/plugins/utils/auto-save.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.auto-save;
 in {
  options.plugins.auto-save =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "auto-save";

--- a/plugins/utils/auto-session.nix
+++ b/plugins/utils/auto-session.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.auto-session;
 in {
  options.plugins.auto-session =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "auto-session";

--- a/plugins/utils/better-escape.nix
+++ b/plugins/utils/better-escape.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.better-escape;
 in {
  options.plugins.better-escape =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "better-escape.nvim";

--- a/plugins/utils/clipboard-image.nix
+++ b/plugins/utils/clipboard-image.nix
@ -85,7 +85,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.clipboard-image =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "clipboard-image.nvim";

--- a/plugins/utils/coverage.nix
+++ b/plugins/utils/coverage.nix
@ -52,7 +52,7 @@ with lib; let
  };
 in {
  options.plugins.coverage =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-coverage";

--- a/plugins/utils/cursorline.nix
+++ b/plugins/utils/cursorline.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.cursorline;
 in {
  options.plugins.cursorline =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-cursorline";

--- a/plugins/utils/flash.nix
+++ b/plugins/utils/flash.nix
@ -238,7 +238,7 @@ in {
      };
    };
  in
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "flash.nvim";

--- a/plugins/utils/hardtime.nix
+++ b/plugins/utils/hardtime.nix
@ -10,7 +10,7 @@ with lib; let
 in {
  options = {
    plugins.hardtime =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "hardtime";

--- a/plugins/utils/harpoon.nix
+++ b/plugins/utils/harpoon.nix
@ -21,7 +21,7 @@ with lib; let
  };
 in {
  options.plugins.harpoon =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "harpoon";

--- a/plugins/utils/illuminate.nix
+++ b/plugins/utils/illuminate.nix
@ -67,7 +67,7 @@ with lib; let
 in {
  options.plugins.illuminate = with helpers;
  with defaultNullOpts;
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "vim-illuminate";

--- a/plugins/utils/indent-blankline.nix
+++ b/plugins/utils/indent-blankline.nix
@ -75,7 +75,7 @@ in {
    );

  options.plugins.indent-blankline =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "indent-blankline.nvim";

--- a/plugins/utils/lastplace.nix
+++ b/plugins/utils/lastplace.nix
@ -9,7 +9,7 @@
 in
  with lib; {
    options.plugins.lastplace =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "lastplace";

--- a/plugins/utils/leap.nix
+++ b/plugins/utils/leap.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.leap;
 in {
  options.plugins.leap =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "leap.nvim";

--- a/plugins/utils/mark-radar.nix
+++ b/plugins/utils/mark-radar.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.mark-radar;
 in {
  options.plugins.mark-radar =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "mark-radar";

--- a/plugins/utils/marks.nix
+++ b/plugins/utils/marks.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.marks =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "marks.nvim";

--- a/plugins/utils/mkdnflow.nix
+++ b/plugins/utils/mkdnflow.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.mkdnflow;
 in {
  options.plugins.mkdnflow =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "mkdnflow.nvim";

--- a/plugins/utils/multicursors.nix
+++ b/plugins/utils/multicursors.nix
@ -45,7 +45,7 @@ with lib; let
 in {
  options = {
    plugins.multicursors =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "multicursors.nvim";

--- a/plugins/utils/navbuddy.nix
+++ b/plugins/utils/navbuddy.nix
@ -12,7 +12,7 @@ with lib; let
  mkPercentageOpt = default: helpers.defaultNullOpts.mkNullable percentageType (toString default);
 in {
  options.plugins.navbuddy =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-navbuddy";

--- a/plugins/utils/neogen.nix
+++ b/plugins/utils/neogen.nix
@ -43,7 +43,7 @@ with lib; let
  };
 in {
  options.plugins.neogen =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "neogen";

--- a/plugins/utils/neorg.nix
+++ b/plugins/utils/neorg.nix
@ -9,7 +9,7 @@
 in
  with lib; {
    options.plugins.neorg =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "neorg";

--- a/plugins/utils/nix-develop.nix
+++ b/plugins/utils/nix-develop.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nix-develop;
 in {
  options.plugins.nix-develop =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nix-develop.nvim";

--- a/plugins/utils/notify.nix
+++ b/plugins/utils/notify.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.notify;
 in {
  options.plugins.notify =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-notify";

--- a/plugins/utils/nvim-autopairs.nix
+++ b/plugins/utils/nvim-autopairs.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nvim-autopairs;
 in {
  options.plugins.nvim-autopairs =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-autopairs";

--- a/plugins/utils/nvim-bqf.nix
+++ b/plugins/utils/nvim-bqf.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nvim-bqf;
 in {
  options.plugins.nvim-bqf =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-bqf";

--- a/plugins/utils/nvim-ufo.nix
+++ b/plugins/utils/nvim-ufo.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.nvim-ufo;
 in {
  options.plugins.nvim-ufo =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "nvim-ufo";

--- a/plugins/utils/obsidian.nix
+++ b/plugins/utils/obsidian.nix
@ -438,7 +438,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.obsidian =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "obsidian.nvim";

--- a/plugins/utils/oil.nix
+++ b/plugins/utils/oil.nix
@ -60,7 +60,7 @@ with lib; let
  };
 in {
  options.plugins.oil =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "oil";

--- a/plugins/utils/ollama.nix
+++ b/plugins/utils/ollama.nix
@ -58,7 +58,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.ollama =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "ollama.nvim";

--- a/plugins/utils/persistence.nix
+++ b/plugins/utils/persistence.nix
@ -7,7 +7,7 @@
 }:
 with lib; {
  options.plugins.persistence =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "persistence.nvim";

--- a/plugins/utils/presence-nvim.nix
+++ b/plugins/utils/presence-nvim.nix
@ -10,7 +10,7 @@ with lib; let
 in {
  options = {
    plugins.presence-nvim =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "presence-nvim";
        package = helpers.mkPackageOption "presence-nvim" pkgs.vimPlugins.presence-nvim;
--- a/plugins/utils/project-nvim.nix
+++ b/plugins/utils/project-nvim.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.project-nvim;
 in {
  options.plugins.project-nvim =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "project.nvim";

--- a/plugins/utils/refactoring.nix
+++ b/plugins/utils/refactoring.nix
@ -7,7 +7,7 @@
 }:
 with lib; {
  options.plugins.refactoring =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "refactoring.nvim";

--- a/plugins/utils/rest.nix
+++ b/plugins/utils/rest.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.rest =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "rest.nvim";

--- a/plugins/utils/spider.nix
+++ b/plugins/utils/spider.nix
@ -10,7 +10,7 @@ with lib; let
  cfg = config.plugins.${pluginName};
 in {
  options.plugins.${pluginName} =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption pluginName;

--- a/plugins/utils/startup.nix
+++ b/plugins/utils/startup.nix
@ -11,7 +11,7 @@ in {
  meta.maintainers = [maintainers.GaetanLepage];

  options.plugins.startup =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "startup.nvim";

--- a/plugins/utils/todo-comments.nix
+++ b/plugins/utils/todo-comments.nix
@ -24,7 +24,7 @@ in {
  ];
  options = {
    plugins.todo-comments =
-      helpers.extraOptionsOptions
+      helpers.neovim-plugin.extraOptionsOptions
      // {
        enable = mkEnableOption "todo-comments";

--- a/plugins/utils/wilder.nix
+++ b/plugins/utils/wilder.nix
@ -58,7 +58,7 @@ in {
  ];

  options.plugins.wilder =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "wilder-nvim";

--- a/plugins/utils/yanky.nix
+++ b/plugins/utils/yanky.nix
@ -9,7 +9,7 @@ with lib; let
  cfg = config.plugins.yanky;
 in {
  options.plugins.yanky =
-    helpers.extraOptionsOptions
+    helpers.neovim-plugin.extraOptionsOptions
    // {
      enable = mkEnableOption "yanky.nvim";

--- a/plugins/utils/zk.nix
+++ b/plugins/utils/zk.nix
@ -17,7 +17,7 @@ with lib; {

    lsp = {
      config =
-        helpers.extraOptionsOptions
+        helpers.neovim-plugin.extraOptionsOptions
        // {
          cmd = helpers.defaultNullOpts.mkNullable (types.listOf types.str) ''["zk" "lsp"]'' "";
          name = helpers.defaultNullOpts.mkStr "zk" "";