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

This commit is contained in:
Frothy 2023-11-06 17:50:27 -07:00
commit ffa25c8c8a
90 changed files with 281 additions and 273 deletions

View file

@ -2,9 +2,9 @@
config,
lib,
...
}:
with lib;
with builtins; let
}: let
inherit (lib) mkMerge mkIf mkBinding nvim getExe;
cfg = config.vim.terminal.toggleterm;
in {
config = mkMerge [
@ -59,7 +59,7 @@ in {
end
})
vim.keymap.set('n', ${toJSON cfg.lazygit.mappings.open}, function() lazygit:toggle() end, {silent = true, noremap = true, desc = 'Open lazygit [toggleterm]'})
vim.keymap.set('n', ${builtins.toJSON cfg.lazygit.mappings.open}, function() lazygit:toggle() end, {silent = true, noremap = true, desc = 'Open lazygit [toggleterm]'})
'';
}
)

View file

@ -3,9 +3,9 @@
config,
lib,
...
}:
with lib;
with builtins; {
}: let
inherit (lib) mkEnableOption mkOption types mkMappingOption;
in {
options.vim.terminal.toggleterm = {
enable = mkEnableOption "toggleterm as a replacement to built-in terminal command";
mappings = {