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

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
-  helpers = import ../helpers.nix {inherit lib;};
-in {
+with lib; {
   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
-  helpers = import ../../helpers.nix {inherit lib;};
-in {
+with lib; {
   # 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
-  helpers = import ../../helpers.nix {inherit lib;};
-in {
+with lib; {
   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
-  helpers = import ../../helpers.nix {inherit lib;};
-in {
+with lib; {
   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 = {