misc: refactor imports, prefer adding helpers to args rather than importing it

modules/autocmd.nix

@@ -1,11 +1,10 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   ...
 }:
 with lib; let
-  helpers = import ../lib/helpers.nix {inherit lib;};
-
   autoGroupOption = types.submodule {
     options = {
       clear = mkOption {

modules/clipboard.nix

@@ -1,6 +1,6 @@
 {
-  config,
   lib,
+  config,
   pkgs,
   ...
 }:

modules/commands.nix

@@ -1,10 +1,10 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   ...
 }:
 with lib; let
-  helpers = import ../lib/helpers.nix {inherit lib;};
   commandAttributes = types.submodule {
     options = {
       command = mkOption {

modules/filetype.nix

@@ -1,10 +1,10 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   ...
-} @ args:
+}:
 with lib; let
-  helpers = import ../lib/helpers.nix args;
   filetypeDefinition = helpers.mkNullOrOption (types.attrsOf (
     types.oneOf [
       # Raw filetype

modules/highlights.nix

@@ -1,58 +1,57 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   ...
-}: let
+}:
-  helpers = import ../lib/helpers.nix {inherit lib;};
+with lib; {
-in
+  options = {
-  with lib; {
+    highlight = mkOption {
-    options = {
+      type = types.attrsOf helpers.highlightType;
-      highlight = mkOption {
+      default = {};
-        type = types.attrsOf helpers.highlightType;
+      description = "Define highlight groups";
-        default = {};
+      example = ''
-        description = "Define highlight groups";
+        highlight = {
-        example = ''
+          Comment.fg = '#ff0000';
-          highlight = {
+        };
-            Comment.fg = '#ff0000';
+      '';
-          };
-        '';
-      };
-
-      match = mkOption {
-        type = types.attrsOf types.str;
-        default = {};
-        description = "Define match groups";
-        example = ''
-          match = {
-            ExtraWhitespace = '\\s\\+$';
-          };
-        '';
-      };
     };
 
-    config = mkIf (config.highlight != {} || config.match != {}) {
+    match = mkOption {
-      extraConfigLuaPost =
+      type = types.attrsOf types.str;
-        (optionalString (config.highlight != {}) ''
+      default = {};
-          -- Highlight groups {{
+      description = "Define match groups";
-          do
+      example = ''
-            local highlights = ${helpers.toLuaObject config.highlight}
+        match = {
+          ExtraWhitespace = '\\s\\+$';
+        };
+      '';
+    };
+  };
 
-            for k,v in pairs(highlights) do
+  config = mkIf (config.highlight != {} || config.match != {}) {
-              vim.api.nvim_set_hl(0, k, v)
+    extraConfigLuaPost =
+      (optionalString (config.highlight != {}) ''
+        -- Highlight groups {{
+        do
+          local highlights = ${helpers.toLuaObject config.highlight}
+
+          for k,v in pairs(highlights) do
+            vim.api.nvim_set_hl(0, k, v)
+          end
+        end
+        -- }}
+      '')
+      + (optionalString (config.match != {}) ''
+        -- Match groups {{
+          do
+            local match = ${helpers.toLuaObject config.match}
+
+            for k,v in pairs(match) do
+              vim.fn.matchadd(k, v)
             end
           end
           -- }}
-        '')
+      '');
-        + (optionalString (config.match != {}) ''
+  };
-          -- Match groups {{
+}
-            do
-              local match = ${helpers.toLuaObject config.match}
-
-              for k,v in pairs(match) do
-                vim.fn.matchadd(k, v)
-              end
-            end
-            -- }}
-        '');
-    };
-  }

modules/keymaps.nix

@@ -1,11 +1,10 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   ...
 }:
-with lib; let
+with lib; {
-  helpers = import ../lib/helpers.nix {inherit lib;};
-in {
   options = {
     maps =
       mapAttrs

modules/lua-loader.nix

@@ -1,6 +1,6 @@
 {
-  config,
   lib,
+  config,
   ...
 }:
 with lib; let

modules/options.nix

@@ -1,11 +1,10 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   ...
 }:
-with lib; let
+with lib; {
-  helpers = import ../lib/helpers.nix {inherit lib;};
-in {
   options = {
     options = mkOption {
       type = types.attrsOf types.anything;

modules/output.nix

@@ -1,7 +1,6 @@
 {
-  pkgs,
-  config,
   lib,
+  config,
   ...
 }:
 with lib; let

plugins/bufferlines/barbar.nix

@@ -1,12 +1,12 @@
 {
   lib,
-  pkgs,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.barbar;
-  helpers = import ../helpers.nix {inherit lib;};
 
   bufferOptions = {
     bufferIndex = helpers.mkNullOrOption types.bool ''

plugins/bufferlines/barbecue.nix

@@ -1,12 +1,12 @@
 {
   lib,
-  pkgs,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.barbecue;
-  helpers = import ../helpers.nix {inherit lib;};
   mkListStr = helpers.defaultNullOpts.mkNullable (types.listOf types.str);
 in {
   options.plugins.barbecue =

plugins/bufferlines/bufferline.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
-} @ args:
+}:
 with lib; let
   cfg = config.plugins.bufferline;
-  helpers = import ../helpers.nix args;
 
   highlightOption = {
     fg = helpers.mkNullOrOption types.str "foreground color";

plugins/bufferlines/navic.nix

@@ -1,13 +1,12 @@
 {
   lib,
-  pkgs,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.navic;
-  helpers = import ../helpers.nix {inherit lib;};
-  mkListStr = helpers.defaultNullOpts.mkNullable (types.listOf types.str);
 in {
   options.plugins.navic =
     helpers.extraOptionsOptions

plugins/colorschemes/ayu.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
-} @ args:
+}:
 with lib; let
   cfg = config.colorschemes.ayu;
-  helpers = import ../helpers.nix args;
 in {
   options = {
     colorschemes.ayu =

plugins/colorschemes/base16.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.colorschemes.base16;
-  helpers = import ../helpers.nix {inherit lib;};
   themes = import ./base16-list.nix;
 in {
   options = {

plugins/colorschemes/catppuccin.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
-} @ args:
+}:
 with lib; let
   cfg = config.colorschemes.catppuccin;
-  helpers = import ../helpers.nix args;
 
   flavours = [
     "latte"

plugins/colorschemes/dracula.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.colorschemes.dracula;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     colorschemes.dracula = {

plugins/colorschemes/gruvbox.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.colorschemes.gruvbox;
-  helpers = import ../helpers.nix {inherit lib;};
   colors = types.enum ["bg" "red" "green" "yellow" "blue" "purple" "aqua" "gray" "fg" "bg0_h" "bg0" "bg1" "bg2" "bg3" "bg4" "gray" "orange" "bg0_s" "fg0" "fg1" "fg2" "fg3" "fg4"];
 in {
   options = {

plugins/colorschemes/kanagawa.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   pkgs,
   config,
-  lib,
   ...
-} @ args:
+}:
 with lib; let
   cfg = config.colorschemes.kanagawa;
-  helpers = import ../helpers.nix args;
 in {
   options = {
     colorschemes.kanagawa =

plugins/colorschemes/melange.nix

@@ -1,17 +1,17 @@
 {
-  pkgs,
   lib,
+  helpers,
+  pkgs,
   config,
   ...
 }: let
   inherit (lib) mkEnableOption mkDefault mkIf;
-  inherit (import ../helpers.nix {inherit lib;}) mkPackageOption;
   cfg = config.colorschemes.melange;
 in {
   options = {
     colorschemes.melange = {
       enable = mkEnableOption "Melange colorscheme";
-      package = mkPackageOption "melange.nvim" pkgs.vimPlugins.melange-nvim;
+      package = helpers.mkPackageOption "melange.nvim" pkgs.vimPlugins.melange-nvim;
     };
   };
 

plugins/colorschemes/nord.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.colorschemes.nord;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     colorschemes.nord = {

plugins/colorschemes/one.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.colorschemes.one;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     colorschemes.one = {

plugins/colorschemes/onedark.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.colorschemes.onedark;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     colorschemes.onedark = {

plugins/colorschemes/oxocarbon.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.colorschemes.oxocarbon;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     colorschemes.oxocarbon = {

plugins/colorschemes/poimandres.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   pkgs,
   config,
-  lib,
   ...
-} @ args:
+}:
 with lib; let
   cfg = config.colorschemes.poimandres;
-  helpers = import ../helpers.nix args;
 in {
   options = {
     colorschemes.poimandres =

plugins/colorschemes/rose-pine.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
-} @ args:
+}:
 with lib; let
   cfg = config.colorschemes.rose-pine;
-  helpers = import ../helpers.nix args;
 in {
   options = {
     colorschemes.rose-pine = {

plugins/colorschemes/tokyonight.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
-} @ args:
+}:
 with lib; let
   cfg = config.colorschemes.tokyonight;
-  helpers = import ../helpers.nix args;
 in {
   options = {
     colorschemes.tokyonight = {

plugins/completion/copilot-lua.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }:
 with lib; let
   cfg = config.plugins.copilot-lua;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.copilot-lua = let

plugins/completion/copilot-vim.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }:
 with lib; let
   cfg = config.plugins.copilot-vim;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   imports = [
     (lib.mkRenamedOptionModule ["plugins" "copilot"] ["plugins" "copilot-vim"])

plugins/completion/coq-thirdparty.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.coq-thirdparty;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.coq-thirdparty = {
     enable = mkEnableOption "coq-thirdparty";

plugins/completion/coq.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.coq-nvim;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.coq-nvim = {

plugins/completion/lspkind.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }:
 with lib; let
   cfg = config.plugins.lspkind;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.lspkind =
     helpers.extraOptionsOptions

plugins/completion/nvim-cmp/cmp-helpers.nix

@@ -1,8 +1,9 @@
 {
   lib,
+  config,
   pkgs,
   ...
-} @ attrs: let
+}: let
   helpers = import ../../helpers.nix {inherit lib;};
 in
   with helpers;
@@ -13,7 +14,7 @@ in
       useDefaultPackage ? true,
       ...
     }:
-      mkPlugin attrs {
+      mkPlugin {inherit lib config pkgs;} {
         inherit name;
         extraPlugins = extraPlugins ++ (lists.optional useDefaultPackage pkgs.vimPlugins.${name});
         description = "Enable ${name}";

plugins/completion/nvim-cmp/default.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   pkgs,
   config,
-  lib,
   ...
 } @ args:
 with lib; let
   cfg = config.plugins.nvim-cmp;
-  helpers = import ../../helpers.nix {inherit lib;};
   cmpLib = import ./cmp-helpers.nix args;
 
   snippetEngines = {

plugins/completion/nvim-cmp/sources/cmp-tabnine.nix

@@ -1,12 +1,11 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
   ...
 }:
 with lib; let
   cfg = config.plugins.cmp-tabnine;
-  helpers = import ../../../helpers.nix {inherit lib;};
 in {
   options.plugins.cmp-tabnine = helpers.extraOptionsOptions;
 

plugins/completion/nvim-cmp/sources/copilot-cmp.nix

@@ -1,12 +1,12 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   ...
 }:
 with lib; let
   copilot-lua-cfg = config.plugins.copilot-lua;
   cfg = config.plugins.copilot-cmp;
-  helpers = import ../../../helpers.nix {inherit lib;};
 in {
   options.plugins.copilot-cmp =
     helpers.extraOptionsOptions

plugins/completion/nvim-cmp/sources/crates-nvim.nix

@@ -1,11 +1,11 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   ...
 }:
 with lib; let
   cfg = config.plugins.crates-nvim;
-  helpers = import ../../../helpers.nix {inherit lib;};
 in {
   options.plugins.crates-nvim = helpers.extraOptionsOptions;
 

plugins/completion/nvim-cmp/sources/default.nix

@@ -1,11 +1,12 @@
 {
   lib,
+  config,
   pkgs,
   ...
-} @ attrs:
+}:
 with lib; let
-  cmpLib = import ../cmp-helpers.nix attrs;
+  cmpLib = import ../cmp-helpers.nix {inherit lib config pkgs;};
-  cmpSourcesPluginNames = lib.attrValues cmpLib.pluginAndSourceNames;
+  cmpSourcesPluginNames = attrValues cmpLib.pluginAndSourceNames;
   pluginModules = lists.map (name: cmpLib.mkCmpSourcePlugin {inherit name;}) cmpSourcesPluginNames;
 in {
   # For extra cmp plugins

plugins/dap/dap-go.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.dap.extensions.dap-go;
-  helpers = import ../helpers.nix {inherit lib;};
   dapHelpers = import ./dapHelpers.nix {inherit lib;};
 in {
   options.plugins.dap.extensions.dap-go = {

plugins/dap/dap-python.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.dap.extensions.dap-python;
-  helpers = import ../helpers.nix {inherit lib;};
   dapHelpers = import ./dapHelpers.nix {inherit lib;};
 in {
   options.plugins.dap.extensions.dap-python = {

plugins/dap/dap-ui.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.dap.extensions.dap-ui;
-  helpers = import ../helpers.nix {inherit lib;};
 
   mkSizeOption =
     helpers.mkNullOrOption

plugins/dap/dap-virtual-text.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.dap.extensions.dap-virtual-text;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.dap.extensions.dap-virtual-text = {
     enable = mkEnableOption "dap-virtual-text";

plugins/dap/default.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.dap;
-  helpers = import ../helpers.nix {inherit lib;};
   dapHelpers = import ./dapHelpers.nix {inherit lib;};
 in
   with dapHelpers; {

plugins/filetrees/chadtree.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.chadtree;
-  helpers = import ../helpers.nix {inherit lib;};
   mkListStr = helpers.defaultNullOpts.mkNullable (types.listOf types.str);
 in {
   options.plugins.chadtree =

plugins/filetrees/neo-tree.nix

@@ -1,13 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.neo-tree;
-  helpers = import ../helpers.nix {inherit lib;};
-
   basePluginPath = ["plugins" "neo-tree"];
 in {
   imports = [

plugins/filetrees/nvim-tree.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   pkgs,
   config,
-  lib,
   ...
-} @ args:
+}:
 with lib; let
   cfg = config.plugins.nvim-tree;
-  helpers = import ../helpers.nix {inherit lib;};
   inherit (helpers) ifNonNull';
 
   openWinConfigOption =

plugins/git/diffview.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.diffview;
-  helpers = import ../helpers.nix {inherit lib;};
   mkWinConfig = type: width: height: position:
     with helpers.defaultNullOpts; {
       type = mkEnum ["split" "float"] type ''

plugins/git/git-worktree.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.git-worktree;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.git-worktree = {

plugins/git/gitblame.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.gitblame;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.gitblame = {

plugins/git/gitgutter.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.gitgutter;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.gitgutter = {

plugins/git/gitmessenger.nix

@@ -1,12 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
-} @ args:
+}:
-with lib; let
+with lib; {
-  helpers = import ../helpers.nix args;
-in {
   options.plugins.gitmessenger = {
     enable = mkEnableOption "gitmessenger";
 

plugins/git/gitsigns.nix

@@ -1,11 +1,11 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   pkgs,
   ...
-} @ args:
+}:
 with lib; let
-  helpers = import ../helpers.nix args;
   signOptions = defaults: {
     hl =
       helpers.defaultNullOpts.mkStr defaults.hl

plugins/git/neogit.nix

@@ -1,12 +1,12 @@
 {
-  config,
   lib,
+  helpers,
+  config,
   pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.neogit;
-  helpers = import ../helpers.nix {inherit lib;};
 
   sectionDefaultsModule = types.submodule {
     options = {

plugins/languages/clangd-extensions.nix

@@ -1,12 +1,12 @@
 {
   lib,
-  pkgs,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.clangd-extensions;
-  helpers = import ../helpers.nix {inherit lib;};
 
   basePluginPath = ["plugins" "clangd-extensions"];
 

plugins/languages/julia/julia-cell.nix

@@ -1,11 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
+  pkgs,
   config,
   ...
 }: let
   cfg = config.plugins.julia-cell;
-  helpers = import ../../helpers.nix {inherit lib;};
 
   # The keys are the option name in nixvim (under plugins.julia-cell.keymaps)
   # cmd: Such that the mapping action is ':JuliaCell${cmd}<CR>'

plugins/languages/ledger.nix

@@ -1,6 +1,6 @@
 {
-  pkgs,
   lib,
+  pkgs,
   ...
 } @ args:
 with lib;

plugins/languages/markdown-preview.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }:
 with lib; let
   cfg = config.plugins.markdown-preview;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.markdown-preview = {

plugins/languages/nvim-jdtls.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.nvim-jdtls;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.nvim-jdtls =
     helpers.extraOptionsOptions

plugins/languages/openscad.nix

@@ -1,12 +1,12 @@
 {
   lib,
-  pkgs,
+  helpers,
   config,
+  pkgs,
   ...
-} @ args:
+}:
 with lib; let
   defaultFuzzyFinder = "skim";
-  helpers = import ../helpers.nix args;
 in {
   options.plugins.openscad = {
     enable = mkEnableOption "openscad.nvim, a plugin to manage OpenSCAD files";

plugins/languages/plantuml-syntax.nix

@@ -1,12 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
-with lib; let
+with lib; {
-  helpers = import ../helpers.nix {inherit lib;};
-in {
   options.plugins.plantuml-syntax = {
     enable = mkEnableOption "plantuml syntax support";
 

plugins/languages/rust.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.rust-tools;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.rust-tools =
     helpers.extraOptionsOptions

plugins/languages/sniprun.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.sniprun;
-  helpers = import ../helpers.nix {inherit lib;};
 
   mkList = helpers.defaultNullOpts.mkNullable (types.listOf types.str);
 in {

plugins/languages/tagbar.nix

@@ -1,11 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }: let
   cfg = config.plugins.tagbar;
-  helpers = import ../helpers.nix {inherit lib;};
 in
   with lib; {
     options.plugins.tagbar = {

plugins/languages/treesitter/rainbow-delimiters.nix

@@ -1,12 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
-with lib; let
+with lib; {
-  helpers = import ../../helpers.nix {inherit lib;};
-in {
   # TODO those warnings have been added XX/XX/2023
   # -> Remove them in ~ 1 month (oct. 2023)
   imports =

plugins/languages/treesitter/treesitter-context.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.treesitter-context;
-  helpers = import ../../helpers.nix {inherit lib;};
 in {
   # Those warnings were introduced on 08/25/2023. TODO: remove them in October 2023.
   imports = let

plugins/languages/treesitter/treesitter-refactor.nix

@@ -1,12 +1,11 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
-with lib; let
+with lib; {
-  helpers = import ../../helpers.nix {inherit lib;};
-in {
   options.plugins.treesitter-refactor = let
     disable = mkOption {
       type = types.listOf types.str;

plugins/languages/treesitter/treesitter.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.treesitter;
-  helpers = import ../../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.treesitter = {

plugins/languages/treesitter/ts-context-commentstring.nix

@@ -1,12 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
-with lib; let
+with lib; {
-  helpers = import ../../helpers.nix {inherit lib;};
-in {
   options.plugins.ts-context-commentstring =
     helpers.extraOptionsOptions
     // {

plugins/languages/typst/typst-vim.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.typst-vim;
-  helpers = import ../../helpers.nix {inherit lib;};
 in {
   options.plugins.typst-vim =
     helpers.extraOptionsOptions

plugins/languages/vim-slime.nix

@@ -1,11 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }: let
   cfg = config.plugins.vim-slime;
-  helpers = import ../helpers.nix {inherit lib;};
 in
   with lib; {
     options.plugins.vim-slime = {

plugins/languages/vimtex.nix

@@ -1,11 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }: let
   cfg = config.plugins.vimtex;
-  helpers = import ../helpers.nix {inherit lib;};
 in
   with lib; {
     options.plugins.vimtex = {

plugins/lsp/conform-nvim.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.conform-nvim;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.conform-nvim =
     helpers.extraOptionsOptions

plugins/lsp/default.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }:
 with lib; let
   cfg = config.plugins.lsp;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   imports = [
     ./language-servers

plugins/lsp/fidget.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }:
 with lib; let
   cfg = config.plugins.fidget;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.fidget =

plugins/lsp/helpers.nix

@@ -1,7 +1,7 @@
 {
+  lib,
   pkgs,
   config,
-  lib,
   ...
 }: {
   mkLsp = {

plugins/lsp/inc-rename.nix

@@ -1,12 +1,11 @@
 {
   lib,
+  helpers,
   config,
   pkgs,
   ...
-} @ args:
+}:
-with lib; let
+with lib; {
-  helpers = import ../helpers.nix args;
-in {
   options.plugins.inc-rename = {
     enable = mkEnableOption "inc-rename, a plugin previewing LSP renaming";
 

plugins/lsp/language-servers/ccls.nix

@@ -1,11 +1,10 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
   ...
 }:
 with lib; let
-  helpers = import ../../helpers.nix {inherit lib;};
   cfg = config.plugins.lsp.servers.ccls;
 in {
   # Options: https://github.com/MaskRay/ccls/wiki/Customization#initialization-options

plugins/lsp/language-servers/default.nix

@@ -1,11 +1,12 @@
 {
-  pkgs,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
-} @ args:
+}:
 with lib; let
-  lspHelpers = import ../helpers.nix args;
+  lspHelpers = import ../helpers.nix {inherit lib config pkgs;};
-  helpers = import ../../helpers.nix {inherit lib;};
 
   servers = [
     {

plugins/lsp/language-servers/efmls-configs.nix

@@ -1,12 +1,11 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }:
 with lib; let
-  helpers = import ../../helpers.nix {inherit lib;};
-
   tools = trivial.importJSON ./efmls-configs-tools.json;
   inherit (tools) linters formatters;
 

plugins/lsp/language-servers/nixd.nix

@@ -1,11 +1,11 @@
 {
   lib,
+  helpers,
   config,
   pkgs,
   ...
 }:
 with lib; let
-  helpers = import ../../helpers.nix {inherit lib;};
   cfg = config.plugins.lsp.servers.nixd;
 in {
   # Options: https://github.com/nix-community/nixd/blob/main/docs/user-guide.md#configuration

plugins/lsp/language-servers/pylsp.nix

@@ -1,11 +1,11 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
-  helpers = import ../../helpers.nix {inherit lib;};
   cfg = config.plugins.lsp.servers.pylsp;
 in {
   # All settings are documented here:

plugins/lsp/language-servers/svelte.nix

@@ -1,10 +1,10 @@
 {
   lib,
+  helpers,
   config,
   ...
 }:
 with lib; let
-  helpers = import ../../helpers.nix {inherit lib;};
   cfg = config.plugins.lsp.servers.svelte;
 in {
   # Options: https://github.com/sveltejs/language-tools/tree/master/packages/language-server#settings

plugins/lsp/lsp-format.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.lsp-format;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.lsp-format =
     helpers.extraOptionsOptions

plugins/lsp/lsp-lines.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.lsp-lines;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.lsp-lines = {

plugins/lsp/lspsaga.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.lspsaga;
-  helpers = import ../helpers.nix {inherit lib;};
 
   mkKeymapOption = default:
     helpers.defaultNullOpts.mkNullable

plugins/lsp/nvim-lightbulb.nix

@@ -1,90 +1,89 @@
 {
-  pkgs,
   lib,
+  helpers,
   config,
+  pkgs,
   ...
-}: let
+}:
-  helpers = import ../helpers.nix {inherit lib;};
+with lib; {
-in
+  options.plugins.nvim-lightbulb = {
-  with lib; {
+    enable = mkEnableOption "nvim-lightbulb, showing available code actions";
-    options.plugins.nvim-lightbulb = {
-      enable = mkEnableOption "nvim-lightbulb, showing available code actions";
 
-      package = helpers.mkPackageOption "nvim-lightbulb" pkgs.vimPlugins.nvim-lightbulb;
+    package = helpers.mkPackageOption "nvim-lightbulb" pkgs.vimPlugins.nvim-lightbulb;
 
-      ignore = helpers.defaultNullOpts.mkNullable (types.listOf types.str) "[]" ''
+    ignore = helpers.defaultNullOpts.mkNullable (types.listOf types.str) "[]" ''
-        LSP client names to ignore
+      LSP client names to ignore
-      '';
+    '';
 
-      sign = {
+    sign = {
-        enabled = helpers.defaultNullOpts.mkBool true "";
+      enabled = helpers.defaultNullOpts.mkBool true "";
-        priority = helpers.defaultNullOpts.mkInt 10 "";
+      priority = helpers.defaultNullOpts.mkInt 10 "";
-      };
-
-      float = {
-        enabled = helpers.defaultNullOpts.mkBool false "";
-
-        text = helpers.defaultNullOpts.mkStr "💡" "Text to show in the popup float";
-
-        winOpts = helpers.defaultNullOpts.mkNullable (types.attrsOf types.anything) "{}" ''
-          Options for the floating window (see |vim.lsp.util.open_floating_preview| for more information)
-        '';
-      };
-
-      virtualText = {
-        enabled = helpers.defaultNullOpts.mkBool false "";
-
-        text = helpers.defaultNullOpts.mkStr "💡" "Text to show at virtual text";
-
-        hlMode = helpers.defaultNullOpts.mkStr "replace" ''
-          highlight mode to use for virtual text (replace, combine, blend), see
-          :help nvim_buf_set_extmark() for reference
-        '';
-      };
-
-      statusText = {
-        enabled = helpers.defaultNullOpts.mkBool false "";
-
-        text = helpers.defaultNullOpts.mkStr "💡" "Text to provide when code actions are available";
-
-        textUnavailable = helpers.defaultNullOpts.mkStr "" ''
-          Text to provide when no actions are available
-        '';
-      };
-
-      autocmd = {
-        enabled = helpers.defaultNullOpts.mkBool false "";
-
-        pattern = helpers.defaultNullOpts.mkNullable (types.listOf types.str) ''["*"]'' "";
-
-        events =
-          helpers.defaultNullOpts.mkNullable (types.listOf types.str)
-          ''["CursorHold" "CursorHoldI"]'' "";
-      };
     };
 
-    config = let
+    float = {
-      cfg = config.plugins.nvim-lightbulb;
+      enabled = helpers.defaultNullOpts.mkBool false "";
-      setupOptions = {
+
-        inherit (cfg) ignore sign autocmd;
+      text = helpers.defaultNullOpts.mkStr "💡" "Text to show in the popup float";
-        float = {
+
-          inherit (cfg.float) enabled text;
+      winOpts = helpers.defaultNullOpts.mkNullable (types.attrsOf types.anything) "{}" ''
-          win_opts = cfg.float.winOpts;
+        Options for the floating window (see |vim.lsp.util.open_floating_preview| for more information)
-        };
+      '';
-        virtual_text = {
+    };
-          inherit (cfg.virtualText) enabled text;
+
-          hl_mode = cfg.virtualText.hlMode;
+    virtualText = {
-        };
+      enabled = helpers.defaultNullOpts.mkBool false "";
-        status_text = {
+
-          inherit (cfg.statusText) enabled text;
+      text = helpers.defaultNullOpts.mkStr "💡" "Text to show at virtual text";
-          text_unavailable = cfg.statusText.textUnavailable;
+
-        };
+      hlMode = helpers.defaultNullOpts.mkStr "replace" ''
+        highlight mode to use for virtual text (replace, combine, blend), see
+        :help nvim_buf_set_extmark() for reference
+      '';
+    };
+
+    statusText = {
+      enabled = helpers.defaultNullOpts.mkBool false "";
+
+      text = helpers.defaultNullOpts.mkStr "💡" "Text to provide when code actions are available";
+
+      textUnavailable = helpers.defaultNullOpts.mkStr "" ''
+        Text to provide when no actions are available
+      '';
+    };
+
+    autocmd = {
+      enabled = helpers.defaultNullOpts.mkBool false "";
+
+      pattern = helpers.defaultNullOpts.mkNullable (types.listOf types.str) ''["*"]'' "";
+
+      events =
+        helpers.defaultNullOpts.mkNullable (types.listOf types.str)
+        ''["CursorHold" "CursorHoldI"]'' "";
+    };
+  };
+
+  config = let
+    cfg = config.plugins.nvim-lightbulb;
+    setupOptions = {
+      inherit (cfg) ignore sign autocmd;
+      float = {
+        inherit (cfg.float) enabled text;
+        win_opts = cfg.float.winOpts;
       };
-    in
+      virtual_text = {
-      mkIf cfg.enable {
+        inherit (cfg.virtualText) enabled text;
-        extraPlugins = [cfg.package];
+        hl_mode = cfg.virtualText.hlMode;
-        extraConfigLua = ''
-          require("nvim-lightbulb").setup(${helpers.toLuaObject setupOptions})
-        '';
       };
-  }
+      status_text = {
+        inherit (cfg.statusText) enabled text;
+        text_unavailable = cfg.statusText.textUnavailable;
+      };
+    };
+  in
+    mkIf cfg.enable {
+      extraPlugins = [cfg.package];
+      extraConfigLua = ''
+        require("nvim-lightbulb").setup(${helpers.toLuaObject setupOptions})
+      '';
+    };
+}

plugins/lsp/trouble.nix

@@ -1,11 +1,11 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }: let
   cfg = config.plugins.trouble;
-  helpers = import ../helpers.nix {inherit lib;};
 in
   with lib; {
     options.plugins.trouble =

plugins/none-ls/default.nix

@@ -1,12 +1,12 @@
 {
+  lib,
+  helpers,
   config,
   pkgs,
-  lib,
   ...
 }:
 with lib; let
   cfg = config.plugins.none-ls;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   imports = [
     ./servers.nix

plugins/none-ls/helpers.nix

@@ -1,9 +1,4 @@
 {
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
   mkServer = {
     name,
     sourceType,

plugins/none-ls/servers.nix

@@ -3,8 +3,8 @@
   config,
   lib,
   ...
-} @ args: let
+}: let
-  helpers = import ./helpers.nix args;
+  helpers = import ./helpers.nix;
   serverData = {
     code_actions = {
       eslint = {

plugins/pluginmanagers/packer.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.packer;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.packer = {

plugins/snippets/luasnip/default.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.luasnip;
-  helpers = import ../../helpers.nix {inherit lib;};
 in {
   options.plugins.luasnip = {
     enable = mkEnableOption "luasnip";

plugins/statuslines/airline.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.airline;
-  helpers = import ../helpers.nix {inherit lib;};
 
   sectionType = with types; nullOr (oneOf [str (listOf str)]);
   sectionOption = mkOption {

plugins/statuslines/lightline.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.lightline;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options = {
     plugins.lightline = {

plugins/statuslines/lualine.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.lualine;
-  helpers = import ../helpers.nix {inherit lib;};
 
   mkSeparatorsOption = {
     leftDefault ? " ",

plugins/telescope/default.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.telescope;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   imports = [
     ./file-browser.nix

plugins/telescope/file-browser.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.telescope.extensions.file_browser;
-  helpers = import ../helpers.nix {inherit lib;};
 
   hiddenOption = types.submodule {
     options = {

plugins/telescope/frecency.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.telescope.extensions.frecency;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.telescope.extensions.frecency = {
     enable = mkEnableOption "frecency";

plugins/telescope/fzf-native.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.telescope.extensions.fzf-native;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.telescope.extensions.fzf-native = {
     enable = mkEnableOption "fzf-native";

plugins/telescope/media-files.nix

@@ -1,12 +1,12 @@
 {
-  pkgs,
-  config,
   lib,
+  helpers,
+  config,
+  pkgs,
   ...
 }:
 with lib; let
   cfg = config.plugins.telescope.extensions.media_files;
-  helpers = import ../helpers.nix {inherit lib;};
 in {
   options.plugins.telescope.extensions.media_files = {
     enable = mkEnableOption "media_files extension for telescope";