diff --git a/plugins/colorschemes/ayu.nix b/plugins/colorschemes/ayu.nix
index 3f46d23f..ab536119 100644
--- a/plugins/colorschemes/ayu.nix
+++ b/plugins/colorschemes/ayu.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts toLuaObject;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "ayu";
   isColorscheme = true;
   originalName = "neovim-ayu";
@@ -24,11 +26,11 @@ helpers.neovim-plugin.mkNeovimPlugin config {
   ];
 
   settingsOptions = {
-    mirage = helpers.defaultNullOpts.mkBool false ''
+    mirage = defaultNullOpts.mkBool false ''
       Set to `true` to use `mirage` variant instead of `dark` for dark background.
     '';
 
-    overrides = helpers.defaultNullOpts.mkStrLuaOr (with helpers.nixvimTypes; attrsOf highlight) { } ''
+    overrides = defaultNullOpts.mkStrLuaOr (with types; attrsOf highlight) { } ''
       A dictionary of group names, each associated with a dictionary of parameters
       (`bg`, `fg`, `sp` and `style`) and colors in hex.
 
@@ -42,7 +44,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
   extraConfig = cfg: {
     extraConfigLuaPre = ''
       local ayu = require("ayu")
-      ayu.setup(${helpers.toLuaObject cfg.settings})
+      ayu.setup(${toLuaObject cfg.settings})
       ayu.colorscheme()
     '';
   };
diff --git a/plugins/colorschemes/base16/default.nix b/plugins/colorschemes/base16/default.nix
index 9461aff8..c1876ab9 100644
--- a/plugins/colorschemes/base16/default.nix
+++ b/plugins/colorschemes/base16/default.nix
@@ -1,17 +1,18 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
 with lib;
 let
+  inherit (lib.nixvim) defaultNullOpts toLuaObject;
+
   name = "base16";
   luaName = "base16-colorscheme";
   originalName = "base16.nvim";
 in
-helpers.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   inherit name luaName originalName;
   setup = ".with_config";
   defaultPackage = pkgs.vimPlugins.base16-nvim;
@@ -47,43 +48,43 @@ helpers.neovim-plugin.mkNeovimPlugin config {
   };
 
   settingsOptions = {
-    telescope = helpers.defaultNullOpts.mkBool true ''
+    telescope = defaultNullOpts.mkBool true ''
       Whether to enable telescope integration.
     '';
 
-    telescope_borders = helpers.defaultNullOpts.mkBool false ''
+    telescope_borders = defaultNullOpts.mkBool false ''
       Whether to display borders around telescope's panel.
     '';
 
-    indentblankline = helpers.defaultNullOpts.mkBool true ''
+    indentblankline = defaultNullOpts.mkBool true ''
       Whether to enable indentblankline integration.
     '';
 
-    notify = helpers.defaultNullOpts.mkBool true ''
+    notify = defaultNullOpts.mkBool true ''
       Whether to enable notify integration.
     '';
 
-    ts_rainbow = helpers.defaultNullOpts.mkBool true ''
+    ts_rainbow = defaultNullOpts.mkBool true ''
       Whether to enable ts_rainbow integration.
     '';
 
-    cmp = helpers.defaultNullOpts.mkBool true ''
+    cmp = defaultNullOpts.mkBool true ''
       Whether to enable cmp integration.
     '';
 
-    illuminate = helpers.defaultNullOpts.mkBool true ''
+    illuminate = defaultNullOpts.mkBool true ''
       Whether to enable illuminate integration.
     '';
 
-    lsp_semantic = helpers.defaultNullOpts.mkBool true ''
+    lsp_semantic = defaultNullOpts.mkBool true ''
       Whether to enable lsp_semantic integration.
     '';
 
-    mini_completion = helpers.defaultNullOpts.mkBool true ''
+    mini_completion = defaultNullOpts.mkBool true ''
       Whether to enable mini_completion integration.
     '';
 
-    dapui = helpers.defaultNullOpts.mkBool true ''
+    dapui = defaultNullOpts.mkBool true ''
       Whether to enable dapui integration.
     '';
   };
@@ -95,7 +96,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           options = mapAttrs (
             name: example:
             mkOption {
-              type = with helpers.nixvimTypes; maybeRaw str;
+              type = with types; maybeRaw str;
               description = "The value for color `${name}`.";
               inherit example;
             }
@@ -123,11 +124,11 @@ helpers.neovim-plugin.mkNeovimPlugin config {
 
         builtinColorschemeExamples = import ./theme-list.nix;
       in
-      helpers.defaultNullOpts.mkNullable' {
+      defaultNullOpts.mkNullable' {
         type = types.oneOf [
           types.str
           customColorschemeType
-          helpers.nixvimTypes.rawLua
+          types.rawLua
         ];
         pluginDefault = literalMD ''`vim.env.BASE16_THEME` or `"schemer-dark"`'';
         description = ''
@@ -182,8 +183,8 @@ helpers.neovim-plugin.mkNeovimPlugin config {
     extraConfigLuaPre = ''
       do
         local base16 = require('${luaName}')
-        base16.with_config(${helpers.toLuaObject cfg.settings})
-        base16.setup(${helpers.toLuaObject cfg.colorscheme})
+        base16.with_config(${toLuaObject cfg.settings})
+        base16.setup(${toLuaObject cfg.colorscheme})
       end
     '';
   };
diff --git a/plugins/colorschemes/catppuccin.nix b/plugins/colorschemes/catppuccin.nix
index d779407e..3fc97c09 100644
--- a/plugins/colorschemes/catppuccin.nix
+++ b/plugins/colorschemes/catppuccin.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts mkNullOrOption mkNullOrStrLuaFnOr;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "catppuccin";
   isColorscheme = true;
   defaultPackage = pkgs.vimPlugins.catppuccin-nvim;
@@ -124,11 +126,11 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       ];
     in
     {
-      compile_path = helpers.defaultNullOpts.mkStr {
+      compile_path = defaultNullOpts.mkStr {
         __raw = "vim.fn.stdpath 'cache' .. '/catppuccin'";
       } "Set the compile cache directory.";
 
-      flavour = helpers.mkNullOrOption (types.enum (flavours ++ [ "auto" ])) ''
+      flavour = mkNullOrOption (types.enum (flavours ++ [ "auto" ])) ''
         Theme flavour.
       '';
 
@@ -136,7 +138,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
         let
           mkBackgroundStyle =
             name:
-            helpers.defaultNullOpts.mkEnumFirstDefault flavours ''
+            defaultNullOpts.mkEnumFirstDefault flavours ''
               Background for `${name}` background.
             '';
         in
@@ -146,97 +148,97 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           dark = mkBackgroundStyle "dark";
         };
 
-      transparent_background = helpers.defaultNullOpts.mkBool false ''
+      transparent_background = defaultNullOpts.mkBool false ''
         Enable Transparent background.
       '';
 
-      show_end_of_buffer = helpers.defaultNullOpts.mkBool false ''
+      show_end_of_buffer = defaultNullOpts.mkBool false ''
         Show the '~' characters after the end of buffers.
       '';
 
-      term_colors = helpers.defaultNullOpts.mkBool false ''
+      term_colors = defaultNullOpts.mkBool false ''
         Configure the colors used when opening a :terminal in Neovim.
       '';
 
       dim_inactive = {
-        enabled = helpers.defaultNullOpts.mkBool false ''
+        enabled = defaultNullOpts.mkBool false ''
           If true, dims the background color of inactive window or buffer or split.
         '';
 
-        shade = helpers.defaultNullOpts.mkStr "dark" ''
+        shade = defaultNullOpts.mkStr "dark" ''
           Sets the shade to apply to the inactive split or window or buffer.
         '';
 
-        percentage = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.15 ''
+        percentage = defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.15 ''
           percentage of the shade to apply to the inactive window, split or buffer.
         '';
       };
 
-      no_italic = helpers.defaultNullOpts.mkBool false ''
+      no_italic = defaultNullOpts.mkBool false ''
         Force no italic.
       '';
 
-      no_bold = helpers.defaultNullOpts.mkBool false ''
+      no_bold = defaultNullOpts.mkBool false ''
         Force no bold.
       '';
 
-      no_underline = helpers.defaultNullOpts.mkBool false ''
+      no_underline = defaultNullOpts.mkBool false ''
         Force no underline.
       '';
 
       styles = {
-        comments = helpers.defaultNullOpts.mkListOf types.str [ "italic" ] ''
+        comments = defaultNullOpts.mkListOf types.str [ "italic" ] ''
           Define comments highlight properties.
         '';
 
-        conditionals = helpers.defaultNullOpts.mkListOf types.str [ "italic" ] ''
+        conditionals = defaultNullOpts.mkListOf types.str [ "italic" ] ''
           Define conditionals highlight properties.
         '';
 
-        loops = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        loops = defaultNullOpts.mkListOf types.str [ ] ''
           Define loops highlight properties.
         '';
 
-        functions = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        functions = defaultNullOpts.mkListOf types.str [ ] ''
           Define functions highlight properties.
         '';
 
-        keywords = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        keywords = defaultNullOpts.mkListOf types.str [ ] ''
           Define keywords highlight properties.
         '';
 
-        strings = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        strings = defaultNullOpts.mkListOf types.str [ ] ''
           Define strings highlight properties.
         '';
 
-        variables = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        variables = defaultNullOpts.mkListOf types.str [ ] ''
           Define variables highlight properties.
         '';
 
-        numbers = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        numbers = defaultNullOpts.mkListOf types.str [ ] ''
           Define numbers highlight properties.
         '';
 
-        booleans = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        booleans = defaultNullOpts.mkListOf types.str [ ] ''
           Define booleans highlight properties.
         '';
 
-        properties = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        properties = defaultNullOpts.mkListOf types.str [ ] ''
           Define properties highlight properties.
         '';
 
-        types = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        types = defaultNullOpts.mkListOf types.str [ ] ''
           Define types highlight properties.
         '';
 
-        operators = helpers.defaultNullOpts.mkListOf types.str [ ] ''
+        operators = defaultNullOpts.mkListOf types.str [ ] ''
           Define operators highlight properties.
         '';
       };
 
       color_overrides = genAttrs (flavours ++ [ "all" ]) (
         flavour:
-        helpers.defaultNullOpts.mkAttrsOf types.str { } (
+        defaultNullOpts.mkAttrsOf types.str { } (
           if flavour == "all" then
             "Override colors for all the flavours."
           else
@@ -244,7 +246,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
         )
       );
 
-      custom_highlights = helpers.mkNullOrStrLuaFnOr (with types; attrsOf anything) ''
+      custom_highlights = mkNullOrStrLuaFnOr (with types; attrsOf anything) ''
         Override specific highlight groups to use other groups or a hex color.
         You can provide either a lua function or directly an attrs.
 
@@ -262,11 +264,11 @@ helpers.neovim-plugin.mkNeovimPlugin config {
         Default: `{}`
       '';
 
-      default_integrations = helpers.defaultNullOpts.mkBool true ''
+      default_integrations = defaultNullOpts.mkBool true ''
         Some integrations are enabled by default, you can control this behaviour with this option.
       '';
 
-      integrations = helpers.mkNullOrOption (with types; attrsOf anything) ''
+      integrations = mkNullOrOption (with types; attrsOf anything) ''
         Catppuccin provides theme support for other plugins in the Neovim ecosystem and extended
         Neovim functionality through _integrations_.
 
diff --git a/plugins/colorschemes/cyberdream.nix b/plugins/colorschemes/cyberdream.nix
index 15222ff2..5394137f 100644
--- a/plugins/colorschemes/cyberdream.nix
+++ b/plugins/colorschemes/cyberdream.nix
@@ -1,42 +1,44 @@
 {
   config,
   lib,
-  helpers,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "cyberdream";
   isColorscheme = true;
   originalName = "cyberdream.nvim";
   defaultPackage = pkgs.vimPlugins.cyberdream-nvim;
 
-  maintainers = [ helpers.maintainers.AndresBermeoMarinelli ];
+  maintainers = [ lib.nixvim.maintainers.AndresBermeoMarinelli ];
 
   settingsOptions = {
-    transparent = helpers.defaultNullOpts.mkBool false ''
+    transparent = defaultNullOpts.mkBool false ''
       Enable transparent background.
     '';
 
-    italic_comments = helpers.defaultNullOpts.mkBool false ''
+    italic_comments = defaultNullOpts.mkBool false ''
       Enable italics comments.
     '';
 
-    hide_fillchars = helpers.defaultNullOpts.mkBool false ''
+    hide_fillchars = defaultNullOpts.mkBool false ''
       Replace all fillchars with ' ' for the ultimate clean look.
     '';
 
-    borderless_telescope = helpers.defaultNullOpts.mkBool true ''
+    borderless_telescope = defaultNullOpts.mkBool true ''
       Modern borderless telescope theme.
     '';
 
-    terminal_colors = helpers.defaultNullOpts.mkBool true ''
+    terminal_colors = defaultNullOpts.mkBool true ''
       Set terminal colors used in `:terminal`.
     '';
 
     theme = {
-      highlights = helpers.defaultNullOpts.mkAttrsOf helpers.nixvimTypes.highlight { } ''
+      highlights = defaultNullOpts.mkAttrsOf types.highlight { } ''
         Highlight groups to override, adding new groups is also possible.
         See `:h highlight-groups` for a list of highlight groups.
 
@@ -55,7 +57,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
         Complete list can be found in `lua/cyberdream/theme.lua` in upstream repository.
       '';
 
-      colors = helpers.defaultNullOpts.mkAttrsOf types.str { } ''
+      colors = defaultNullOpts.mkAttrsOf types.str { } ''
         Override the default colors used.
 
         For a full list of colors, see upstream documentation.
diff --git a/plugins/colorschemes/dracula.nix b/plugins/colorschemes/dracula.nix
index 44bcc1a5..e439622b 100644
--- a/plugins/colorschemes/dracula.nix
+++ b/plugins/colorschemes/dracula.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
@@ -14,7 +13,7 @@ in
     colorschemes.dracula = {
       enable = mkEnableOption "dracula";
 
-      package = helpers.mkPluginPackageOption "dracula" pkgs.vimPlugins.dracula-vim;
+      package = lib.nixvim.mkPluginPackageOption "dracula" pkgs.vimPlugins.dracula-vim;
 
       bold = mkOption {
         type = types.bool;
diff --git a/plugins/colorschemes/everforest.nix b/plugins/colorschemes/everforest.nix
index cfbeba7f..46f13a0d 100644
--- a/plugins/colorschemes/everforest.nix
+++ b/plugins/colorschemes/everforest.nix
@@ -1,30 +1,31 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
 let
+  inherit (lib.nixvim) defaultNullOpts;
+
   mkEverforestBool =
     pluginDefault: desc:
-    helpers.defaultNullOpts.mkEnum [
+    defaultNullOpts.mkEnum [
       0
       1
     ] pluginDefault desc;
 
 in
-helpers.vim-plugin.mkVimPlugin config {
+lib.nixvim.vim-plugin.mkVimPlugin config {
   name = "everforest";
   isColorscheme = true;
   defaultPackage = pkgs.vimPlugins.everforest;
   globalPrefix = "everforest_";
 
-  maintainers = [ helpers.maintainers.sheemap ];
+  maintainers = [ lib.nixvim.maintainers.sheemap ];
 
   settingsOptions = {
     background =
-      helpers.defaultNullOpts.mkEnum
+      defaultNullOpts.mkEnum
         [
           "hard"
           "medium"
@@ -44,7 +45,7 @@ helpers.vim-plugin.mkVimPlugin config {
     '';
 
     cursor =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "auto"
           "red"
@@ -60,7 +61,7 @@ helpers.vim-plugin.mkVimPlugin config {
         '';
 
     transparent_background =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           0
           1
@@ -83,7 +84,7 @@ helpers.vim-plugin.mkVimPlugin config {
     '';
 
     sign_column_background =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "none"
           "grey"
@@ -94,7 +95,7 @@ helpers.vim-plugin.mkVimPlugin config {
         '';
 
     spell_foreground =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "none"
           "colored"
@@ -106,7 +107,7 @@ helpers.vim-plugin.mkVimPlugin config {
         '';
 
     ui_contrast =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "low"
           "high"
@@ -120,7 +121,7 @@ helpers.vim-plugin.mkVimPlugin config {
     '';
 
     float_style =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "bright"
           "dim"
@@ -165,7 +166,7 @@ helpers.vim-plugin.mkVimPlugin config {
     '';
 
     diagnostic_virtual_text =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "grey"
           "colored"
@@ -187,7 +188,7 @@ helpers.vim-plugin.mkVimPlugin config {
         '';
 
     current_word =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "grey background"
           "bold"
@@ -211,7 +212,7 @@ helpers.vim-plugin.mkVimPlugin config {
         '';
 
     inlay_hints_background =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "none"
           "dimmed"
@@ -240,7 +241,7 @@ helpers.vim-plugin.mkVimPlugin config {
       lightline color scheme, set this option to `1`.
     '';
 
-    colors_override = helpers.defaultNullOpts.mkAttrsOf (lib.types.listOf lib.types.str) { } ''
+    colors_override = defaultNullOpts.mkAttrsOf (lib.types.listOf lib.types.str) { } ''
       Override color palette. The available keys can be found in the plugin's [source code](https://github.com/sainnhe/everforest/blob/master/autoload/everforest.vim)
     '';
 
diff --git a/plugins/colorschemes/gruvbox.nix b/plugins/colorschemes/gruvbox.nix
index 2800b66b..8e518998 100644
--- a/plugins/colorschemes/gruvbox.nix
+++ b/plugins/colorschemes/gruvbox.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "gruvbox";
   isColorscheme = true;
   originalName = "gruvbox.nvim";
@@ -23,7 +22,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           "colorschemes"
           "gruvbox"
           optionName
-        ] "Please use `colorschemes.gruvbox.settings.${helpers.toSnakeCase optionName}` instead."
+        ] "Please use `colorschemes.gruvbox.settings.${lib.nixvim.toSnakeCase optionName}` instead."
       )
       [
         "italics"
diff --git a/plugins/colorschemes/kanagawa.nix b/plugins/colorschemes/kanagawa.nix
index 89fc1f6f..82070427 100644
--- a/plugins/colorschemes/kanagawa.nix
+++ b/plugins/colorschemes/kanagawa.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   pkgs,
   config,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "kanagawa";
   isColorscheme = true;
   originalName = "kanagawa.nvim";
@@ -78,49 +80,49 @@ helpers.neovim-plugin.mkNeovimPlugin config {
     ];
 
   settingsOptions = {
-    compile = helpers.defaultNullOpts.mkBool false ''
+    compile = defaultNullOpts.mkBool false ''
       Enable compiling the colorscheme.
     '';
 
-    undercurl = helpers.defaultNullOpts.mkBool true ''
+    undercurl = defaultNullOpts.mkBool true ''
       Enable undercurls.
     '';
 
-    commentStyle = helpers.defaultNullOpts.mkAttrsOf types.anything { italic = true; } ''
+    commentStyle = defaultNullOpts.mkAttrsOf types.anything { italic = true; } ''
       Highlight options for comments.
     '';
 
-    functionStyle = helpers.defaultNullOpts.mkAttrsOf types.anything { } ''
+    functionStyle = defaultNullOpts.mkAttrsOf types.anything { } ''
       Highlight options for functions.
     '';
 
-    keywordStyle = helpers.defaultNullOpts.mkAttrsOf types.anything { italic = true; } ''
+    keywordStyle = defaultNullOpts.mkAttrsOf types.anything { italic = true; } ''
       Highlight options for keywords.
     '';
 
-    statementStyle = helpers.defaultNullOpts.mkAttrsOf types.anything { bold = true; } ''
+    statementStyle = defaultNullOpts.mkAttrsOf types.anything { bold = true; } ''
       Highlight options for statements.
     '';
 
-    typeStyle = helpers.defaultNullOpts.mkAttrsOf types.anything { } ''
+    typeStyle = defaultNullOpts.mkAttrsOf types.anything { } ''
       Highlight options for types.
     '';
 
-    transparent = helpers.defaultNullOpts.mkBool false ''
+    transparent = defaultNullOpts.mkBool false ''
       Whether to set a background color.
     '';
 
-    dimInactive = helpers.defaultNullOpts.mkBool false ''
+    dimInactive = defaultNullOpts.mkBool false ''
       Whether dim inactive window `:h hl-NormalNC`.
     '';
 
-    terminalColors = helpers.defaultNullOpts.mkBool true ''
+    terminalColors = defaultNullOpts.mkBool true ''
       If true, defines `vim.g.terminal_color_{0,17}`.
     '';
 
     colors = {
       theme =
-        helpers.defaultNullOpts.mkAttrsOf types.attrs
+        defaultNullOpts.mkAttrsOf types.attrs
           {
             wave = { };
             lotus = { };
@@ -154,7 +156,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
             ```
           '';
 
-      palette = helpers.defaultNullOpts.mkAttrsOf types.str { } ''
+      palette = defaultNullOpts.mkAttrsOf types.str { } ''
         Change all usages of these colors.
 
         Example:
@@ -168,7 +170,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
     };
 
     overrides =
-      helpers.defaultNullOpts.mkLuaFn
+      defaultNullOpts.mkLuaFn
         ''
           function(colors)
             return {}
@@ -198,16 +200,16 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           ```
         '';
 
-    theme = helpers.defaultNullOpts.mkStr "wave" ''
+    theme = defaultNullOpts.mkStr "wave" ''
       The theme to load when background is not set.
     '';
 
     background = {
-      light = helpers.defaultNullOpts.mkStr "lotus" ''
+      light = defaultNullOpts.mkStr "lotus" ''
         The theme to use when `vim.o.background = "light"`.
       '';
 
-      dark = helpers.defaultNullOpts.mkStr "wave" ''
+      dark = defaultNullOpts.mkStr "wave" ''
         The theme to use when `vim.o.background = "dark"`.
       '';
     };
diff --git a/plugins/colorschemes/melange.nix b/plugins/colorschemes/melange.nix
index 861f4403..98c798f9 100644
--- a/plugins/colorschemes/melange.nix
+++ b/plugins/colorschemes/melange.nix
@@ -1,12 +1,11 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
 with lib;
-helpers.vim-plugin.mkVimPlugin config {
+lib.nixvim.vim-plugin.mkVimPlugin config {
   name = "melange";
   isColorscheme = true;
   originalName = "melange-nvim";
diff --git a/plugins/colorschemes/modus.nix b/plugins/colorschemes/modus.nix
index bc41d2c1..26c62120 100644
--- a/plugins/colorschemes/modus.nix
+++ b/plugins/colorschemes/modus.nix
@@ -1,22 +1,24 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "modus";
   luaName = "modus-themes";
   originalName = "modus-themes.nvim";
   defaultPackage = pkgs.vimPlugins.modus-themes-nvim;
   isColorscheme = true;
 
-  maintainers = [ helpers.maintainers.nwjsmith ];
+  maintainers = [ lib.nixvim.maintainers.nwjsmith ];
 
   settingsOptions = {
     style =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "modus_operandi"
           "modus_vivendi"
@@ -26,7 +28,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
         '';
 
     variant =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "default"
           "tinted"
@@ -42,33 +44,33 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           - `tritanopia` is optimized for users with blue-yellow color deficiency.
         '';
 
-    transparent = helpers.defaultNullOpts.mkBool false ''
+    transparent = defaultNullOpts.mkBool false ''
       Disable setting the background color.
     '';
 
-    dim_inactive = helpers.defaultNullOpts.mkBool false ''
+    dim_inactive = defaultNullOpts.mkBool false ''
       Dims inactive windows.
     '';
 
     styles = {
-      comments = helpers.defaultNullOpts.mkHighlight { italic = true; } "" ''
+      comments = defaultNullOpts.mkHighlight { italic = true; } "" ''
         Define comments highlight properties.
       '';
 
-      keywords = helpers.defaultNullOpts.mkHighlight { italic = true; } "" ''
+      keywords = defaultNullOpts.mkHighlight { italic = true; } "" ''
         Define keywords highlight properties.
       '';
 
-      functions = helpers.defaultNullOpts.mkHighlight { } "" ''
+      functions = defaultNullOpts.mkHighlight { } "" ''
         Define functions highlight properties.
       '';
 
-      variables = helpers.defaultNullOpts.mkHighlight { } "" ''
+      variables = defaultNullOpts.mkHighlight { } "" ''
         Define variables highlight properties.
       '';
     };
 
-    on_colors = helpers.defaultNullOpts.mkLuaFn "function(colors) end" ''
+    on_colors = defaultNullOpts.mkLuaFn "function(colors) end" ''
       Override specific color groups to use other groups or a hex color.
       Function will be called with a `ColorScheme` table.
 
@@ -77,7 +79,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       ```
     '';
 
-    on_highlights = helpers.defaultNullOpts.mkLuaFn "function(highlights, colors) end" ''
+    on_highlights = defaultNullOpts.mkLuaFn "function(highlights, colors) end" ''
       Override specific highlights to use other groups or a hex color.
       Function will be called with a `Highlights` and `ColorScheme` table.
 
diff --git a/plugins/colorschemes/nightfox.nix b/plugins/colorschemes/nightfox.nix
index 7d1772d3..0480f261 100644
--- a/plugins/colorschemes/nightfox.nix
+++ b/plugins/colorschemes/nightfox.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   pkgs,
   config,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "nightfox";
   isColorscheme = true;
   originalName = "nightfox.nvim";
@@ -35,39 +37,37 @@ helpers.neovim-plugin.mkNeovimPlugin config {
 
   settingsOptions = {
     options = {
-      compile_path =
-        helpers.defaultNullOpts.mkStr { __raw = "vim.fn.stdpath('cache') .. '/nightfox'"; }
-          ''
-            The output directory path where the compiled results will be written to.
-          '';
+      compile_path = defaultNullOpts.mkStr { __raw = "vim.fn.stdpath('cache') .. '/nightfox'"; } ''
+        The output directory path where the compiled results will be written to.
+      '';
 
-      compile_file_suffix = helpers.defaultNullOpts.mkStr "_compiled" ''
+      compile_file_suffix = defaultNullOpts.mkStr "_compiled" ''
         The string appended to the compiled file.
         Each `style` outputs to its own file.
         These files will append the suffix to the end of the file.
       '';
 
-      transparent = helpers.defaultNullOpts.mkBool false ''
+      transparent = defaultNullOpts.mkBool false ''
         A boolean value that if set will disable setting the background of `Normal`, `NormalNC` and
         other highlight groups.
         This lets you use the colors of the colorscheme but use the background of your terminal.
       '';
 
-      terminal_colors = helpers.defaultNullOpts.mkBool true ''
+      terminal_colors = defaultNullOpts.mkBool true ''
         A boolean value that if set will define the terminal colors for the builtin `terminal`
         (`vim.g.terminal_color_*`).
       '';
 
-      dim_inactive = helpers.defaultNullOpts.mkBool false ''
+      dim_inactive = defaultNullOpts.mkBool false ''
         A boolean value that if set will set the background of Non current windows to be darker.
         See `:h hl-NormalNC`.
       '';
 
-      module_default = helpers.defaultNullOpts.mkBool true ''
+      module_default = defaultNullOpts.mkBool true ''
         The default value of a module that has not been overridden in the modules table.
       '';
 
-      styles = helpers.defaultNullOpts.mkAttrsOf' {
+      styles = defaultNullOpts.mkAttrsOf' {
         type = types.str;
         description = ''
           A table that contains a list of syntax components and their corresponding style.
@@ -106,7 +106,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       };
 
       inverse =
-        helpers.defaultNullOpts.mkAttrsOf types.bool
+        defaultNullOpts.mkAttrsOf types.bool
           {
             match_paren = false;
             visual = false;
@@ -123,11 +123,11 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           '';
 
       colorblind = {
-        enable = helpers.defaultNullOpts.mkBool false ''
+        enable = defaultNullOpts.mkBool false ''
           Whether to enable nightfox’s _color vision deficiency_ (cdv) mode.
         '';
 
-        simulate_only = helpers.defaultNullOpts.mkBool false ''
+        simulate_only = defaultNullOpts.mkBool false ''
           Only show simulated colorblind colors and not diff shifted.
         '';
 
@@ -135,7 +135,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           mapAttrs
             (
               name: color:
-              helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0 ''
+              defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0 ''
                 Severity [0, 1] for ${name} (${color}).
               ''
             )
@@ -147,7 +147,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       };
 
       modules =
-        helpers.defaultNullOpts.mkAttrsOf types.anything
+        defaultNullOpts.mkAttrsOf types.anything
           {
             coc = {
               background = true;
@@ -180,7 +180,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
     };
 
     palettes =
-      helpers.mkNullOrOption
+      mkNullOrOption
         (
           with types;
           attrsOf
@@ -230,7 +230,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
         '';
 
     specs =
-      helpers.mkNullOrOption
+      mkNullOrOption
         (
           with types;
           attrsOf
@@ -274,7 +274,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
         '';
 
     groups =
-      helpers.mkNullOrOption
+      mkNullOrOption
         (
           with types;
           attrsOf
diff --git a/plugins/colorschemes/nord.nix b/plugins/colorschemes/nord.nix
index 92b2d8fb..e1f04221 100644
--- a/plugins/colorschemes/nord.nix
+++ b/plugins/colorschemes/nord.nix
@@ -1,11 +1,13 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts;
+in
+lib.nixvim.vim-plugin.mkVimPlugin config {
   name = "nord";
   isColorscheme = true;
   originalName = "nord.nvim";
@@ -27,31 +29,31 @@ helpers.vim-plugin.mkVimPlugin config {
   ];
 
   settingsOptions = {
-    contrast = helpers.defaultNullOpts.mkBool false ''
+    contrast = defaultNullOpts.mkBool false ''
       Make sidebars and popup menus like nvim-tree and telescope have a different background.
     '';
 
-    borders = helpers.defaultNullOpts.mkBool false ''
+    borders = defaultNullOpts.mkBool false ''
       Enable the border between vertically split windows.
     '';
 
-    disable_background = helpers.defaultNullOpts.mkBool false ''
+    disable_background = defaultNullOpts.mkBool false ''
       Disable the setting of background color so that NeoVim can use your terminal background.
     '';
 
-    cursorline_transparent = helpers.defaultNullOpts.mkBool false ''
+    cursorline_transparent = defaultNullOpts.mkBool false ''
       Set the cursorline transparent/visible.
     '';
 
-    enable_sidebar_background = helpers.defaultNullOpts.mkBool false ''
+    enable_sidebar_background = defaultNullOpts.mkBool false ''
       Re-enables the background of the sidebar if you disabled the background of everything.
     '';
 
-    italic = helpers.defaultNullOpts.mkBool true ''
+    italic = defaultNullOpts.mkBool true ''
       Enables/disables italics.
     '';
 
-    uniform_diff_background = helpers.defaultNullOpts.mkBool false ''
+    uniform_diff_background = defaultNullOpts.mkBool false ''
       Enables/disables colorful backgrounds when used in _diff_ mode.
     '';
   };
diff --git a/plugins/colorschemes/one.nix b/plugins/colorschemes/one.nix
index f4da5fce..35d7fb2d 100644
--- a/plugins/colorschemes/one.nix
+++ b/plugins/colorschemes/one.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+lib.nixvim.vim-plugin.mkVimPlugin config {
   name = "one";
   isColorscheme = true;
   originalName = "vim-one";
@@ -15,7 +14,7 @@ helpers.vim-plugin.mkVimPlugin config {
   maintainers = [ lib.maintainers.GaetanLepage ];
 
   settingsOptions = {
-    allow_italics = helpers.defaultNullOpts.mkBool false ''
+    allow_italics = lib.nixvim.defaultNullOpts.mkBool false ''
       Whether to enable _italic_ (as long as your terminal supports it).
     '';
   };
diff --git a/plugins/colorschemes/onedark.nix b/plugins/colorschemes/onedark.nix
index a1ce76a3..92464271 100644
--- a/plugins/colorschemes/onedark.nix
+++ b/plugins/colorschemes/onedark.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
-helpers.neovim-plugin.mkNeovimPlugin config {
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "onedark";
   isColorscheme = true;
   originalName = "onedark.nvim";
@@ -39,7 +38,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
   extraConfig = cfg: {
     extraConfigLuaPre = ''
       _onedark = require('onedark')
-      _onedark.setup(${helpers.toLuaObject cfg.settings})
+      _onedark.setup(${lib.nixvim.toLuaObject cfg.settings})
       _onedark.load()
     '';
   };
diff --git a/plugins/colorschemes/oxocarbon.nix b/plugins/colorschemes/oxocarbon.nix
index 5f486739..88a5af75 100644
--- a/plugins/colorschemes/oxocarbon.nix
+++ b/plugins/colorschemes/oxocarbon.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
-helpers.vim-plugin.mkVimPlugin config {
+lib.nixvim.vim-plugin.mkVimPlugin config {
   name = "oxocarbon";
   isColorscheme = true;
   originalName = "oxocarbon.nvim";
diff --git a/plugins/colorschemes/palette.nix b/plugins/colorschemes/palette.nix
index 90ff17f2..44968237 100644
--- a/plugins/colorschemes/palette.nix
+++ b/plugins/colorschemes/palette.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "palette";
   isColorscheme = true;
   originalName = "palette.nvim";
@@ -34,15 +36,15 @@ helpers.neovim-plugin.mkNeovimPlugin config {
 
   settingsOptions = {
     palettes = {
-      main = helpers.defaultNullOpts.mkStr "dark" ''
+      main = defaultNullOpts.mkStr "dark" ''
         Palette for the main colors.
       '';
 
-      accent = helpers.defaultNullOpts.mkStr "pastel" ''
+      accent = defaultNullOpts.mkStr "pastel" ''
         Palette for the accent colors.
       '';
 
-      state = helpers.defaultNullOpts.mkStr "pastel" ''
+      state = defaultNullOpts.mkStr "pastel" ''
         Palette for the state colors.
       '';
     };
@@ -51,7 +53,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       mapAttrs
         (
           name: colorNames:
-          helpers.defaultNullOpts.mkAttrsOf
+          defaultNullOpts.mkAttrsOf
             (types.submodule {
               options = genAttrs colorNames (
                 colorName:
@@ -98,19 +100,19 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           ];
         };
 
-    italics = helpers.defaultNullOpts.mkBool true ''
+    italics = defaultNullOpts.mkBool true ''
       Whether to use italics.
     '';
 
-    transparent_background = helpers.defaultNullOpts.mkBool false ''
+    transparent_background = defaultNullOpts.mkBool false ''
       Whether to use transparent background.
     '';
 
-    caching = helpers.defaultNullOpts.mkBool true ''
+    caching = defaultNullOpts.mkBool true ''
       Whether to enable caching.
     '';
 
-    cache_dir = helpers.defaultNullOpts.mkStr {
+    cache_dir = defaultNullOpts.mkStr {
       __raw = "vim.fn.stdpath('cache') .. '/palette'";
     } "Cache directory.";
   };
diff --git a/plugins/colorschemes/poimandres.nix b/plugins/colorschemes/poimandres.nix
index b80a7562..a74630e1 100644
--- a/plugins/colorschemes/poimandres.nix
+++ b/plugins/colorschemes/poimandres.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   pkgs,
   config,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "poimandres";
   isColorscheme = true;
   originalName = "poimandres.nvim";
@@ -28,37 +30,37 @@ helpers.neovim-plugin.mkNeovimPlugin config {
   ];
 
   settingsOptions = {
-    bold_vert_split = helpers.defaultNullOpts.mkBool false ''
+    bold_vert_split = defaultNullOpts.mkBool false ''
       Use bold vertical separators.
     '';
 
-    dim_nc_background = helpers.defaultNullOpts.mkBool false ''
+    dim_nc_background = defaultNullOpts.mkBool false ''
       Dim 'non-current' window backgrounds.
     '';
 
-    disable_background = helpers.defaultNullOpts.mkBool false ''
+    disable_background = defaultNullOpts.mkBool false ''
       Whether to disable the background.
     '';
 
-    disable_float_background = helpers.defaultNullOpts.mkBool false ''
+    disable_float_background = defaultNullOpts.mkBool false ''
       Whether to disable the background for floats.
     '';
 
-    disable_italics = helpers.defaultNullOpts.mkBool false ''
+    disable_italics = defaultNullOpts.mkBool false ''
       Whether to disable italics.
     '';
 
-    dark_variant = helpers.defaultNullOpts.mkStr "main" ''
+    dark_variant = defaultNullOpts.mkStr "main" ''
       Dark variant.
     '';
 
-    groups = helpers.mkNullOrOption (with types; attrsOf (either str (attrsOf str))) ''
+    groups = mkNullOrOption (with types; attrsOf (either str (attrsOf str))) ''
       Which color to use for each group.
 
       default: see [source](https://github.com/olivercederborg/poimandres.nvim/blob/main/lua/poimandres/init.lua)
     '';
 
-    highlight_groups = helpers.defaultNullOpts.mkAttrsOf types.str { } ''
+    highlight_groups = defaultNullOpts.mkAttrsOf types.str { } ''
       Highlight groups.
     '';
   };
diff --git a/plugins/colorschemes/rose-pine.nix b/plugins/colorschemes/rose-pine.nix
index b2a63f58..2c4739d4 100644
--- a/plugins/colorschemes/rose-pine.nix
+++ b/plugins/colorschemes/rose-pine.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   pkgs,
   config,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts mkNullOrOption;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "rose-pine";
   isColorscheme = true;
   defaultPackage = pkgs.vimPlugins.rose-pine;
@@ -61,7 +63,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
 
   settingsOptions = {
     variant =
-      helpers.mkNullOrOption
+      lib.nixvim.mkNullOrOption
         (types.enum [
           "auto"
           "main"
@@ -74,7 +76,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
         '';
 
     dark_variant =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "main"
           "moon"
@@ -84,42 +86,42 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           Set the desired dark variant when `settings.variant` is set to "auto".
         '';
 
-    dim_inactive_windows = helpers.defaultNullOpts.mkBool false ''
+    dim_inactive_windows = defaultNullOpts.mkBool false ''
       Differentiate between active and inactive windows and panels.
     '';
 
-    extend_background_behind_borders = helpers.defaultNullOpts.mkBool true ''
+    extend_background_behind_borders = defaultNullOpts.mkBool true ''
       Extend background behind borders.
       Appearance differs based on which border characters you are using.
     '';
 
     enable = {
-      legacy_highlights = helpers.defaultNullOpts.mkBool true "Enable legacy highlights.";
+      legacy_highlights = defaultNullOpts.mkBool true "Enable legacy highlights.";
 
-      migrations = helpers.defaultNullOpts.mkBool true "Enable migrations.";
+      migrations = defaultNullOpts.mkBool true "Enable migrations.";
 
-      terminal = helpers.defaultNullOpts.mkBool true "Enable terminal.";
+      terminal = defaultNullOpts.mkBool true "Enable terminal.";
     };
 
     styles = {
-      bold = helpers.defaultNullOpts.mkBool true "Enable bold.";
+      bold = defaultNullOpts.mkBool true "Enable bold.";
 
-      italic = helpers.defaultNullOpts.mkBool true "Enable italic.";
+      italic = defaultNullOpts.mkBool true "Enable italic.";
 
-      transparency = helpers.defaultNullOpts.mkBool true "Enable transparency.";
+      transparency = defaultNullOpts.mkBool true "Enable transparency.";
     };
 
-    groups = helpers.mkNullOrOption (with types; attrsOf (either str (attrsOf str))) ''
+    groups = mkNullOrOption (with types; attrsOf (either str (attrsOf str))) ''
       Highlight groups.
 
       default: see [source](https://github.com/rose-pine/neovim/blob/main/lua/rose-pine/config.lua)
     '';
 
-    highlight_groups = helpers.defaultNullOpts.mkAttrsOf helpers.nixvimTypes.highlight { } ''
+    highlight_groups = defaultNullOpts.mkAttrsOf types.highlight { } ''
       Custom highlight groups.
     '';
 
-    before_highlight = helpers.defaultNullOpts.mkLuaFn "function(group, highlight, palette) end" ''
+    before_highlight = defaultNullOpts.mkLuaFn "function(group, highlight, palette) end" ''
       Called before each highlight group, before setting the highlight.
 
       `function(group, highlight, palette)`
diff --git a/plugins/colorschemes/tokyonight.nix b/plugins/colorschemes/tokyonight.nix
index 2216c93b..008a5a64 100644
--- a/plugins/colorschemes/tokyonight.nix
+++ b/plugins/colorschemes/tokyonight.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   pkgs,
   config,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "tokyonight";
   isColorscheme = true;
   originalName = "tokyonight.nvim";
@@ -54,7 +56,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
 
   settingsOptions = {
     style =
-      helpers.defaultNullOpts.mkEnumFirstDefault
+      defaultNullOpts.mkEnumFirstDefault
         [
           "storm"
           "night"
@@ -64,15 +66,15 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           The theme comes in three styles, `storm`, a darker variant `night` and `day`.
         '';
 
-    light_style = helpers.defaultNullOpts.mkStr "day" ''
+    light_style = defaultNullOpts.mkStr "day" ''
       The theme to use when the background is set to `light`.
     '';
 
-    transparent = helpers.defaultNullOpts.mkBool false ''
+    transparent = defaultNullOpts.mkBool false ''
       Disable setting the background color.
     '';
 
-    terminal_colors = helpers.defaultNullOpts.mkBool true ''
+    terminal_colors = defaultNullOpts.mkBool true ''
       Configure the colors used when opening a :terminal in Neovim
     '';
 
@@ -80,26 +82,26 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       let
         mkBackgroundStyle =
           name:
-          helpers.defaultNullOpts.mkEnumFirstDefault [
+          defaultNullOpts.mkEnumFirstDefault [
             "dark"
             "transparent"
             "normal"
           ] "Background style for ${name}";
       in
       {
-        comments = helpers.defaultNullOpts.mkHighlight { italic = true; } "" ''
+        comments = defaultNullOpts.mkHighlight { italic = true; } "" ''
           Define comments highlight properties.
         '';
 
-        keywords = helpers.defaultNullOpts.mkHighlight { italic = true; } "" ''
+        keywords = defaultNullOpts.mkHighlight { italic = true; } "" ''
           Define keywords highlight properties.
         '';
 
-        functions = helpers.defaultNullOpts.mkHighlight { } "" ''
+        functions = defaultNullOpts.mkHighlight { } "" ''
           Define functions highlight properties.
         '';
 
-        variables = helpers.defaultNullOpts.mkHighlight { } "" ''
+        variables = defaultNullOpts.mkHighlight { } "" ''
           Define variables highlight properties.
         '';
 
@@ -109,7 +111,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       };
 
     sidebars =
-      helpers.defaultNullOpts.mkListOf types.str
+      defaultNullOpts.mkListOf types.str
         [
           "qf"
           "help"
@@ -118,31 +120,31 @@ helpers.neovim-plugin.mkNeovimPlugin config {
           Set a darker background on sidebar-like windows.
         '';
 
-    day_brightness = helpers.defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.3 ''
+    day_brightness = defaultNullOpts.mkNullable (types.numbers.between 0.0 1.0) 0.3 ''
       Adjusts the brightness of the colors of the **Day** style.
       Number between 0 and 1, from dull to vibrant colors.
     '';
 
-    hide_inactive_statusline = helpers.defaultNullOpts.mkBool false ''
+    hide_inactive_statusline = defaultNullOpts.mkBool false ''
       Enabling this option will hide inactive statuslines and replace them with a thin border instead.
       Should work with the standard **StatusLine** and **LuaLine**.
     '';
 
-    dim_inactive = helpers.defaultNullOpts.mkBool false ''
+    dim_inactive = defaultNullOpts.mkBool false ''
       Dims inactive windows.
     '';
 
-    lualine_bold = helpers.defaultNullOpts.mkBool false ''
+    lualine_bold = defaultNullOpts.mkBool false ''
       When true, section headers in the lualine theme will be bold.
     '';
 
-    on_colors = helpers.defaultNullOpts.mkLuaFn "function(colors) end" ''
+    on_colors = defaultNullOpts.mkLuaFn "function(colors) end" ''
       Override specific color groups to use other groups or a hex color.
       Function will be called with a `ColorScheme` table.
       `@param colors ColorScheme`
     '';
 
-    on_highlights = helpers.defaultNullOpts.mkLuaFn "function(highlights, colors) end" ''
+    on_highlights = defaultNullOpts.mkLuaFn "function(highlights, colors) end" ''
       Override specific highlights to use other groups or a hex color.
       Function will be called with a `Highlights` and `ColorScheme` table.
       `@param highlights Highlights`
diff --git a/plugins/colorschemes/vscode.nix b/plugins/colorschemes/vscode.nix
index 931b6e16..798c7a9e 100644
--- a/plugins/colorschemes/vscode.nix
+++ b/plugins/colorschemes/vscode.nix
@@ -1,12 +1,14 @@
 {
   lib,
-  helpers,
   config,
   pkgs,
   ...
 }:
 with lib;
-helpers.neovim-plugin.mkNeovimPlugin config {
+let
+  inherit (lib.nixvim) defaultNullOpts toLuaObject;
+in
+lib.nixvim.neovim-plugin.mkNeovimPlugin config {
   name = "vscode";
   isColorscheme = true;
   originalName = "vscode-nvim";
@@ -17,26 +19,24 @@ helpers.neovim-plugin.mkNeovimPlugin config {
   maintainers = [ maintainers.loicreynier ];
 
   settingsOptions = {
-    transparent = helpers.defaultNullOpts.mkBool false "Whether to enable transparent background";
-    italic_comments = helpers.defaultNullOpts.mkBool false "Whether to enable italic comments";
-    underline_links = helpers.defaultNullOpts.mkBool false "Whether to underline links";
-    disable_nvimtree_bg = helpers.defaultNullOpts.mkBool true "Whether to disable nvim-tree background";
-    color_overrides = helpers.defaultNullOpts.mkAttrsOf types.str { } ''
+    transparent = defaultNullOpts.mkBool false "Whether to enable transparent background";
+    italic_comments = defaultNullOpts.mkBool false "Whether to enable italic comments";
+    underline_links = defaultNullOpts.mkBool false "Whether to underline links";
+    disable_nvimtree_bg = defaultNullOpts.mkBool true "Whether to disable nvim-tree background";
+    color_overrides = defaultNullOpts.mkAttrsOf types.str { } ''
       A dictionary of color overrides.
       See https://github.com/Mofiqul/vscode.nvim/blob/main/lua/vscode/colors.lua for color names.
     '';
-    group_overrides =
-      with helpers;
-      defaultNullOpts.mkAttrsOf nixvimTypes.highlight { } ''
-        A dictionary of group names, each associated with a dictionary of parameters
-        (`bg`, `fg`, `sp` and `style`) and colors in hex.
-      '';
+    group_overrides = defaultNullOpts.mkAttrsOf types.highlight { } ''
+      A dictionary of group names, each associated with a dictionary of parameters
+      (`bg`, `fg`, `sp` and `style`) and colors in hex.
+    '';
   };
 
   extraConfig = cfg: {
     extraConfigLuaPre = ''
       local _vscode = require("vscode")
-      _vscode.setup(${helpers.toLuaObject cfg.settings})
+      _vscode.setup(${toLuaObject cfg.settings})
       _vscode.load()
     '';
   };