diff --git a/lib/helpers.nix b/lib/helpers.nix
index bb51d142..b91b90f6 100644
--- 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;
diff --git a/lib/neovim-plugin.nix b/lib/neovim-plugin.nix
new file mode 100644
index 00000000..38667c8d
--- /dev/null
+++ 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)
+      '';
+    };
+  };
+}
diff --git a/lib/options.nix b/lib/options.nix
index 0c9071db..b6d9f8d3 100644
--- 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)
-      '';
-    };
-  };
 }
diff --git a/plugins/TEMPLATE.nix b/plugins/TEMPLATE.nix
index d20e952f..5175e7ac 100644
--- 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
 
diff --git a/plugins/bufferlines/barbar.nix b/plugins/bufferlines/barbar.nix
index 0c16f849..20b9b10b 100644
--- 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";
 
diff --git a/plugins/bufferlines/barbecue.nix b/plugins/bufferlines/barbecue.nix
index 29bed68a..0597fdde 100644
--- 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";
 
diff --git a/plugins/bufferlines/bufferline.nix b/plugins/bufferlines/bufferline.nix
index 60ab8f53..5f114b32 100644
--- 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";
 
diff --git a/plugins/bufferlines/navic.nix b/plugins/bufferlines/navic.nix
index d241ebeb..a669083b 100644
--- 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";
 
diff --git a/plugins/colorschemes/ayu.nix b/plugins/colorschemes/ayu.nix
index 879eaca3..58c7c172 100644
--- 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";
 
diff --git a/plugins/colorschemes/kanagawa.nix b/plugins/colorschemes/kanagawa.nix
index b13b346d..d366f6b1 100644
--- 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";
 
diff --git a/plugins/colorschemes/palette.nix b/plugins/colorschemes/palette.nix
index 099b82df..bff01e8b 100644
--- 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";
 
diff --git a/plugins/colorschemes/poimandres.nix b/plugins/colorschemes/poimandres.nix
index a54f9b05..c31af669 100644
--- 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";
 
diff --git a/plugins/completion/copilot-lua.nix b/plugins/completion/copilot-lua.nix
index c32775c8..31590f79 100644
--- 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";
 
diff --git a/plugins/completion/lspkind.nix b/plugins/completion/lspkind.nix
index 847106b6..e5a416c2 100644
--- 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";
 
diff --git a/plugins/completion/nvim-cmp/default.nix b/plugins/completion/nvim-cmp/default.nix
index d2e58643..faf9e6ee 100644
--- 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";
 
diff --git a/plugins/completion/nvim-cmp/sources/cmp-tabby.nix b/plugins/completion/nvim-cmp/sources/cmp-tabby.nix
index aface54d..f937ba35 100644
--- 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.
diff --git a/plugins/completion/nvim-cmp/sources/cmp-tabnine.nix b/plugins/completion/nvim-cmp/sources/cmp-tabnine.nix
index 3498f165..05383a84 100644
--- 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 = ''
diff --git a/plugins/completion/nvim-cmp/sources/codeium-nvim.nix b/plugins/completion/nvim-cmp/sources/codeium-nvim.nix
index 8b98ba81..da2d7c25 100644
--- 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;
 
diff --git a/plugins/completion/nvim-cmp/sources/copilot-cmp.nix b/plugins/completion/nvim-cmp/sources/copilot-cmp.nix
index e2c27d1c..94ffd7ef 100644
--- 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
diff --git a/plugins/completion/nvim-cmp/sources/crates-nvim.nix b/plugins/completion/nvim-cmp/sources/crates-nvim.nix
index 181b2ed3..feb355ff 100644
--- 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 = ''
diff --git a/plugins/dap/dap-ui.nix b/plugins/dap/dap-ui.nix
index 4270eceb..a1c5f187 100644
--- 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";
 
diff --git a/plugins/dap/default.nix b/plugins/dap/default.nix
index 6ed1ca87..6dec9830 100644
--- 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";
 
diff --git a/plugins/filetrees/chadtree.nix b/plugins/filetrees/chadtree.nix
index ea948354..babc50a2 100644
--- 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";
 
diff --git a/plugins/filetrees/neo-tree.nix b/plugins/filetrees/neo-tree.nix
index 6e8e7ba0..e20191af 100644
--- 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";
 
diff --git a/plugins/filetrees/nvim-tree.nix b/plugins/filetrees/nvim-tree.nix
index d0cdadec..a4c735ab 100644
--- 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";
 
diff --git a/plugins/git/diffview.nix b/plugins/git/diffview.nix
index abb704dd..93ec8d77 100644
--- 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";
 
diff --git a/plugins/git/gitlinker.nix b/plugins/git/gitlinker.nix
index b442f843..1501ad02 100644
--- 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";
 
diff --git a/plugins/languages/clangd-extensions.nix b/plugins/languages/clangd-extensions.nix
index b1796d45..3bc7205b 100644
--- 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";
 
diff --git a/plugins/languages/debugprint.nix b/plugins/languages/debugprint.nix
index 085e86e9..6efe5d12 100644
--- 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";
 
diff --git a/plugins/languages/lean.nix b/plugins/languages/lean.nix
index 0b63a882..fa0222e7 100644
--- 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";
 
diff --git a/plugins/languages/lint.nix b/plugins/languages/lint.nix
index cb0ecc90..e6b99d6d 100644
--- 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";
 
diff --git a/plugins/languages/nvim-jdtls.nix b/plugins/languages/nvim-jdtls.nix
index ddc9eebf..ed9546ee 100644
--- 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";
 
diff --git a/plugins/languages/rust-tools.nix b/plugins/languages/rust-tools.nix
index 590f1c19..2ac64866 100644
--- 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;
diff --git a/plugins/languages/rustaceanvim.nix b/plugins/languages/rustaceanvim.nix
index 0ac196b1..e0a4f081 100644
--- 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";
 
diff --git a/plugins/languages/sniprun.nix b/plugins/languages/sniprun.nix
index bf96d39b..bd265165 100644
--- 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";
 
diff --git a/plugins/languages/treesitter/rainbow-delimiters.nix b/plugins/languages/treesitter/rainbow-delimiters.nix
index b76fa1d1..2cc4b6a6 100644
--- 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";
 
diff --git a/plugins/languages/treesitter/treesitter-context.nix b/plugins/languages/treesitter/treesitter-context.nix
index 2296c279..86e5ac6a 100644
--- 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";
 
diff --git a/plugins/languages/treesitter/treesitter-textobjects.nix b/plugins/languages/treesitter/treesitter-textobjects.nix
index 516a1699..815b175b 100644
--- 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
diff --git a/plugins/languages/treesitter/ts-autotag.nix b/plugins/languages/treesitter/ts-autotag.nix
index 0329576f..c2d6bebc 100644
--- 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";
 
diff --git a/plugins/languages/treesitter/ts-context-commentstring.nix b/plugins/languages/treesitter/ts-context-commentstring.nix
index 402eb750..19b2cf71 100644
--- 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";
 
diff --git a/plugins/lsp/conform-nvim.nix b/plugins/lsp/conform-nvim.nix
index d7fd6fa9..a98a63e3 100644
--- 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";
 
diff --git a/plugins/lsp/fidget.nix b/plugins/lsp/fidget.nix
index 636aeb23..1fca6054 100644
--- 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";
 
diff --git a/plugins/lsp/lsp-format.nix b/plugins/lsp/lsp-format.nix
index 03dc21fc..09b30026 100644
--- 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";
 
diff --git a/plugins/lsp/lspsaga.nix b/plugins/lsp/lspsaga.nix
index 55b519e3..9ad9a012 100644
--- 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";
 
diff --git a/plugins/lsp/trouble.nix b/plugins/lsp/trouble.nix
index b895d5c8..81ed2dac 100644
--- 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";
 
diff --git a/plugins/lsp/wtf.nix b/plugins/lsp/wtf.nix
index 543297d2..34edc5d2 100644
--- 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";
 
diff --git a/plugins/none-ls/default.nix b/plugins/none-ls/default.nix
index 4bb9e17f..05379375 100644
--- 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";
 
diff --git a/plugins/telescope/default.nix b/plugins/telescope/default.nix
index fcc842a3..a6cb6a82 100644
--- 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";
 
diff --git a/plugins/ui/image.nix b/plugins/ui/image.nix
index 4341da47..9d0a9b95 100644
--- 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";
 
diff --git a/plugins/ui/noice.nix b/plugins/ui/noice.nix
index a820a05e..877c4a1b 100644
--- 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.
diff --git a/plugins/utils/auto-save.nix b/plugins/utils/auto-save.nix
index 0d95f356..2fd75f68 100644
--- 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";
 
diff --git a/plugins/utils/auto-session.nix b/plugins/utils/auto-session.nix
index 4cde365b..4b8121ff 100644
--- 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";
 
diff --git a/plugins/utils/better-escape.nix b/plugins/utils/better-escape.nix
index 721f1f87..565766b3 100644
--- 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";
 
diff --git a/plugins/utils/clipboard-image.nix b/plugins/utils/clipboard-image.nix
index 13daf5ca..3bcc84a5 100644
--- 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";
 
diff --git a/plugins/utils/coverage.nix b/plugins/utils/coverage.nix
index 945dc97a..abf83df5 100644
--- 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";
 
diff --git a/plugins/utils/cursorline.nix b/plugins/utils/cursorline.nix
index aeaec39f..4d40e678 100644
--- 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";
 
diff --git a/plugins/utils/flash.nix b/plugins/utils/flash.nix
index a8595061..d1ace251 100644
--- 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";
 
diff --git a/plugins/utils/hardtime.nix b/plugins/utils/hardtime.nix
index dd8c2653..b5a684a9 100644
--- 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";
 
diff --git a/plugins/utils/harpoon.nix b/plugins/utils/harpoon.nix
index 9893df68..07ed144d 100644
--- 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";
 
diff --git a/plugins/utils/illuminate.nix b/plugins/utils/illuminate.nix
index a479bed7..8ad555fa 100644
--- 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";
 
diff --git a/plugins/utils/indent-blankline.nix b/plugins/utils/indent-blankline.nix
index b3359c5f..a978da73 100644
--- 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";
 
diff --git a/plugins/utils/lastplace.nix b/plugins/utils/lastplace.nix
index ff8530ca..649ae883 100644
--- 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";
 
diff --git a/plugins/utils/leap.nix b/plugins/utils/leap.nix
index eb5fafe7..92407ece 100644
--- 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";
 
diff --git a/plugins/utils/mark-radar.nix b/plugins/utils/mark-radar.nix
index d55c49af..871aae1f 100644
--- 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";
 
diff --git a/plugins/utils/marks.nix b/plugins/utils/marks.nix
index 52db3842..17f84cdd 100644
--- 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";
 
diff --git a/plugins/utils/mkdnflow.nix b/plugins/utils/mkdnflow.nix
index e3971025..622977ce 100644
--- 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";
 
diff --git a/plugins/utils/multicursors.nix b/plugins/utils/multicursors.nix
index 536eb673..83322b2e 100644
--- 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";
 
diff --git a/plugins/utils/navbuddy.nix b/plugins/utils/navbuddy.nix
index 0faa9375..5cb8d7b7 100644
--- 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";
 
diff --git a/plugins/utils/neogen.nix b/plugins/utils/neogen.nix
index 034b1a37..3a9fb0c7 100644
--- 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";
 
diff --git a/plugins/utils/neorg.nix b/plugins/utils/neorg.nix
index eb0ab5c7..14b30b25 100644
--- 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";
 
diff --git a/plugins/utils/nix-develop.nix b/plugins/utils/nix-develop.nix
index 0771685b..9e4342c1 100644
--- 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";
 
diff --git a/plugins/utils/notify.nix b/plugins/utils/notify.nix
index ee901a93..bcdbf5ec 100644
--- 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";
 
diff --git a/plugins/utils/nvim-autopairs.nix b/plugins/utils/nvim-autopairs.nix
index ef27a1bd..31347c86 100644
--- 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";
 
diff --git a/plugins/utils/nvim-bqf.nix b/plugins/utils/nvim-bqf.nix
index 84aab9ab..fa9d308d 100644
--- 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";
 
diff --git a/plugins/utils/nvim-ufo.nix b/plugins/utils/nvim-ufo.nix
index 98044d29..9bd79a0a 100644
--- 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";
 
diff --git a/plugins/utils/obsidian.nix b/plugins/utils/obsidian.nix
index 75a09491..bd5fefff 100644
--- 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";
 
diff --git a/plugins/utils/oil.nix b/plugins/utils/oil.nix
index 17cbaf64..be7d8a39 100644
--- 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";
 
diff --git a/plugins/utils/ollama.nix b/plugins/utils/ollama.nix
index b05fe5ab..b9c6cdf9 100644
--- 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";
 
diff --git a/plugins/utils/persistence.nix b/plugins/utils/persistence.nix
index 217be0a8..6a55678f 100644
--- 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";
 
diff --git a/plugins/utils/presence-nvim.nix b/plugins/utils/presence-nvim.nix
index d8064cca..ce78ab6c 100644
--- 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;
diff --git a/plugins/utils/project-nvim.nix b/plugins/utils/project-nvim.nix
index 29b41897..adc8a66f 100644
--- 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";
 
diff --git a/plugins/utils/refactoring.nix b/plugins/utils/refactoring.nix
index fa4b1393..d8c2b5c9 100644
--- 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";
 
diff --git a/plugins/utils/rest.nix b/plugins/utils/rest.nix
index 6d8f1529..88588902 100644
--- 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";
 
diff --git a/plugins/utils/spider.nix b/plugins/utils/spider.nix
index 1d364145..1deab0a6 100644
--- 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;
 
diff --git a/plugins/utils/startup.nix b/plugins/utils/startup.nix
index 0ce3a0f2..1b5e9b16 100644
--- 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";
 
diff --git a/plugins/utils/todo-comments.nix b/plugins/utils/todo-comments.nix
index eca07a35..a140cd8e 100644
--- 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";
 
diff --git a/plugins/utils/wilder.nix b/plugins/utils/wilder.nix
index aaef2c9e..ff5d47e4 100644
--- 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";
 
diff --git a/plugins/utils/yanky.nix b/plugins/utils/yanky.nix
index a6219d1d..ad0b0425 100644
--- 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";
 
diff --git a/plugins/utils/zk.nix b/plugins/utils/zk.nix
index 182f9bbe..065cc1fe 100644
--- 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" "";