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

This commit is contained in:
Gaetan Lepage 2023-11-06 15:04:08 +01:00 committed by Gaétan Lepage
parent 541b694873
commit b6724702b4
160 changed files with 697 additions and 736 deletions

View file

@ -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

View file

@ -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 = [
{

View file

@ -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;

View file

@ -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

View file

@ -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:

View file

@ -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