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

modules/treesitter/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) addDescriptionsToMappings mkIf optional mkSetBinding mkMerge nvim;
+
   cfg = config.vim.treesitter;
   usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp";
 

modules/treesitter/context.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkEnableOption mkOption types mkIf nvim boolToString;
+
   treesitter = config.vim.treesitter;
   cfg = treesitter.context;
 in {

modules/treesitter/treesitter.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
-with lib; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkMappingOption mkOption types;
+in {
   options.vim.treesitter = {
     enable = mkEnableOption "treesitter, also enabled automatically through language options";