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

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;
-  cmpSourcesPluginNames = lib.attrValues cmpLib.pluginAndSourceNames;
+  cmpLib = import ../cmp-helpers.nix {inherit lib config pkgs;};
+  cmpSourcesPluginNames = attrValues cmpLib.pluginAndSourceNames;
   pluginModules = lists.map (name: cmpLib.mkCmpSourcePlugin {inherit name;}) cmpSourcesPluginNames;
 in {
   # For extra cmp plugins