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

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
-  helpers = import ../helpers.nix args;
-in {
+}:
+with lib; {
   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;
-  helpers = import ../../helpers.nix {inherit lib;};
+  lspHelpers = import ../helpers.nix {inherit lib config pkgs;};
 
   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;};
-in
-  with lib; {
-    options.plugins.nvim-lightbulb = {
-      enable = mkEnableOption "nvim-lightbulb, showing available code actions";
+}:
+with lib; {
+  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) "[]" ''
-        LSP client names to ignore
-      '';
+    ignore = helpers.defaultNullOpts.mkNullable (types.listOf types.str) "[]" ''
+      LSP client names to ignore
+    '';
 
-      sign = {
-        enabled = helpers.defaultNullOpts.mkBool true "";
-        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"]'' "";
-      };
+    sign = {
+      enabled = helpers.defaultNullOpts.mkBool true "";
+      priority = helpers.defaultNullOpts.mkInt 10 "";
     };
 
-    config = let
-      cfg = config.plugins.nvim-lightbulb;
-      setupOptions = {
-        inherit (cfg) ignore sign autocmd;
-        float = {
-          inherit (cfg.float) enabled text;
-          win_opts = cfg.float.winOpts;
-        };
-        virtual_text = {
-          inherit (cfg.virtualText) enabled text;
-          hl_mode = cfg.virtualText.hlMode;
-        };
-        status_text = {
-          inherit (cfg.statusText) enabled text;
-          text_unavailable = cfg.statusText.textUnavailable;
-        };
+    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
+    cfg = config.plugins.nvim-lightbulb;
+    setupOptions = {
+      inherit (cfg) ignore sign autocmd;
+      float = {
+        inherit (cfg.float) enabled text;
+        win_opts = cfg.float.winOpts;
       };
-    in
-      mkIf cfg.enable {
-        extraPlugins = [cfg.package];
-        extraConfigLua = ''
-          require("nvim-lightbulb").setup(${helpers.toLuaObject setupOptions})
-        '';
+      virtual_text = {
+        inherit (cfg.virtualText) enabled text;
+        hl_mode = cfg.virtualText.hlMode;
       };
-  }
+      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 =