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

modules/lsp/lspsaga/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) addDescriptionsToMappings mkIf mkSetLuaBinding mkMerge nvim optionalString;
+
   cfg = config.vim.lsp;
   self = import ./lspsaga.nix {inherit lib;};
 

modules/lsp/lspsaga/lspsaga.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
-with lib;
-with builtins; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkMappingOption;
+in {
   options.vim.lsp.lspsaga = {
     enable = mkEnableOption "LSP Saga";