treewide: move missing modules from 'with lib' to 'inherit (lib) ...'

This commit is contained in:
Frothy 2023-11-07 19:16:46 -07:00
commit 7518c31ca8
43 changed files with 146 additions and 146 deletions

View file

@ -3,9 +3,8 @@
config,
lib,
...
}:
with builtins; let
inherit (lib) mkOption mkEnableOption types;
}: let
inherit (lib) mkOption mkEnableOption types isList nvim;
cfg = config.vim.languages.bash;
@ -70,7 +69,7 @@ in {
server = mkOption {
description = "Bash LSP server to use";
type = with types; enum (attrNames servers);
type = with types; enum (builtins.attrNames servers);
default = defaultServer;
};
@ -90,7 +89,7 @@ in {
};
type = mkOption {
description = "Bash formatter to use";
type = with types; enum (attrNames formats);
type = with types; enum (builtins.attrNames formats);
default = defaultFormat;
};

View file

@ -3,9 +3,9 @@
config,
lib,
...
}:
with lib;
with builtins; let
}: let
inherit (lib) isList nvim mkIf mkMerge;
cfg = config.vim.languages.bash;
diagnostics = {
shellcheck = {