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

modules/languages/bash/bash.nix

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

modules/languages/bash/config.nix

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

modules/languages/clang.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim optionalString mkEnableOption mkOption types mkIf mkMerge;
+
   cfg = config.vim.languages.clang;
 
   defaultServer = "ccls";
@@ -93,7 +93,7 @@ in {
 
       server = mkOption {
         description = "The clang LSP server to use";
-        type = with types; enum (attrNames servers);
+        type = with types; enum (builtins.attrNames servers);
         default = defaultServer;
       };
 
@@ -119,7 +119,7 @@ in {
       };
       debugger = mkOption {
         description = "clang debugger to use";
-        type = with types; enum (attrNames debuggers);
+        type = with types; enum (builtins.attrNames debuggers);
         default = defaultDebugger;
       };
       package = mkOption {

modules/languages/dart/config.nix

@@ -3,9 +3,9 @@
   lib,
   pkgs,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkIf mkMerge optionalString boolToString;
+
   cfg = config.vim.languages.dart;
   ftcfg = cfg.flutter-tools;
   servers = {

modules/languages/dart/dart.nix

@@ -3,9 +3,9 @@
   lib,
   pkgs,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types optionalString;
+
   cfg = config.vim.languages.dart;
   defaultServer = "dart";
   servers = {
@@ -38,7 +38,7 @@ in {
       enable = mkEnableOption "Dart LSP support";
       server = mkOption {
         description = "The Dart LSP server to use";
-        type = with types; enum (attrNames servers);
+        type = with types; enum (builtins.attrNames servers);
         default = defaultServer;
       };
       package = mkOption {

modules/languages/elixir/config.nix

@@ -3,9 +3,9 @@
   lib,
   pkgs,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) nvim mkIf getExe;
+
   cfg = config.vim.languages.elixir;
 in {
   config = mkIf (cfg.enable) {
@@ -23,7 +23,7 @@ in {
 
           -- alternatively, point to an existing elixir-ls installation (optional)
           -- not currently supported by elixirls, but can be a table if you wish to pass other args `{"path/to/elixirls", "--foo"}`
-          cmd = "${lib.getExe pkgs.elixir-ls}",
+          cmd = "${getExe pkgs.elixir-ls}",
 
           -- default settings, use the `settings` function to override settings
           settings = elixirls.settings {

modules/languages/elixir/elixir-tools.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption;
+in {
   options.vim.languages.elixir = {
     enable = mkEnableOption "Elixir language support";
   };

modules/languages/go.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim getExe mkEnableOption mkOption types mkMerge mkIf;
+
   cfg = config.vim.languages.go;
 
   defaultServer = "gopls";
@@ -80,7 +80,7 @@ in {
 
       server = mkOption {
         description = "Go LSP server to use";
-        type = with types; enum (attrNames servers);
+        type = with types; enum (builtins.attrNames servers);
         default = defaultServer;
       };
 
@@ -100,7 +100,7 @@ in {
       };
       debugger = mkOption {
         description = "Go debugger to use";
-        type = with types; enum (attrNames debuggers);
+        type = with types; enum (builtins.attrNames debuggers);
         default = defaultDebugger;
       };
       package = mkOption {

modules/languages/html.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkEnableOption mkOption types nvim mkIf mkMerge optional;
+
   cfg = config.vim.languages.html;
 in {
   options.vim.languages.html = {

modules/languages/java.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge;
+
   cfg = config.vim.languages.java;
 in {
   options.vim.languages.java = {

modules/languages/lua.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge optionalString getExe;
+
   cfg = config.vim.languages.lua;
 in {
   options.vim.languages.lua = {

modules/languages/markdown/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) nvim mkIf mkMerge;
+
   cfg = config.vim.languages.markdown;
 in {
   config = mkIf cfg.enable (mkMerge [

modules/languages/markdown/markdown.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkEnableOption mkOption types nvim;
+
   cfg = config.vim.languages.markdown;
 in {
   options.vim.languages.markdown = {

modules/languages/nix.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge optionalString;
+
   cfg = config.vim.languages.nix;
 
   useFormat = "on_attach = default_on_attach";
@@ -146,7 +146,7 @@ in {
 
       type = mkOption {
         description = "Nix formatter to use";
-        type = with types; enum (attrNames formats);
+        type = with types; enum (builtins.attrNames formats);
         default = defaultFormat;
       };
       package = mkOption {

modules/languages/php.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge getExe;
+
   cfg = config.vim.languages.php;
 
   defaultServer = "phpactor";
@@ -72,7 +72,7 @@ in {
 
       server = mkOption {
         description = "PHP LSP server to use";
-        type = with types; enum (attrNames servers);
+        type = with types; enum (builtins.attrNames servers);
         default = defaultServer;
       };
 

modules/languages/python.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge getExe literalExpression;
+
   cfg = config.vim.languages.python;
 
   defaultServer = "pyright";
@@ -149,7 +149,7 @@ in {
 
       server = mkOption {
         description = "Python LSP server to use";
-        type = with types; enum (attrNames servers);
+        type = with types; enum (builtins.attrNames servers);
         default = defaultServer;
       };
 
@@ -166,7 +166,7 @@ in {
 
       type = mkOption {
         description = "Python formatter to use";
-        type = with types; enum (attrNames formats);
+        type = with types; enum (builtins.attrNames formats);
         default = defaultFormat;
       };
 
@@ -186,7 +186,7 @@ in {
       };
       debugger = mkOption {
         description = "Python debugger to use";
-        type = with types; enum (attrNames debuggers);
+        type = with types; enum (builtins.attrNames debuggers);
         default = defaultDebugger;
       };
       package = mkOption {

modules/languages/rust.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge optionalString boolToString optionals;
+
   cfg = config.vim.languages.rust;
 in {
   options.vim.languages.rust = {

modules/languages/sql.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge;
+
   cfg = config.vim.languages.sql;
   sqlfluffDefault = pkgs.sqlfluff;
 
@@ -86,7 +86,7 @@ in {
 
       server = mkOption {
         description = "SQL LSP server to use";
-        type = with types; enum (attrNames servers);
+        type = with types; enum (builtins.attrNames servers);
         default = defaultServer;
       };
 
@@ -103,7 +103,7 @@ in {
 
       type = mkOption {
         description = "SQL formatter to use";
-        type = with types; enum (attrNames formats);
+        type = with types; enum (builtins.attrNames formats);
         default = defaultFormat;
       };
 

modules/languages/svelte.nix

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

modules/languages/tidal/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf;
+
   cfg = config.vim.tidal;
 in {
   config = mkIf (cfg.enable) {

modules/languages/tidal/tidal.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption mkOption types;
+in {
   options.vim.tidal = {
     enable = mkEnableOption "tidalcycles tools and plugins";
 

modules/languages/ts.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge;
+
   cfg = config.vim.languages.ts;
 
   defaultServer = "tsserver";
@@ -98,7 +98,7 @@ in {
 
       server = mkOption {
         description = "Typescript/Javascript LSP server to use";
-        type = with types; enum (attrNames servers);
+        type = with types; enum (builtins.attrNames servers);
         default = defaultServer;
       };
 
@@ -115,7 +115,7 @@ in {
 
       type = mkOption {
         description = "Typescript/Javascript formatter to use";
-        type = with types; enum (attrNames formats);
+        type = with types; enum (builtins.attrNames formats);
         default = defaultFormat;
       };
 

modules/languages/zig.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) isList nvim mkEnableOption mkOption types mkIf mkMerge;
+
   cfg = config.vim.languages.zig;
 in {
   options.vim.languages.zig = {

modules/lsp/config.nix

@@ -3,9 +3,9 @@
   lib,
   pkgs,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) addDescriptionsToMappings mkIf optional boolToString optionalString;
+
   cfg = config.vim.lsp;
   usingNvimCmp = config.vim.autocomplete.enable && config.vim.autocomplete.type == "nvim-cmp";
   self = import ./module.nix {inherit config lib pkgs;};

modules/lsp/lightbulb/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf nvim;
+
   cfg = config.vim.lsp;
 in {
   config = mkIf (cfg.enable && cfg.lightbulb.enable) {

modules/lsp/lightbulb/lightbulb.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption;
+in {
   options.vim.lsp = {
     lightbulb = {
       enable = mkEnableOption "Lightbulb for code actions. Requires an emoji font";

modules/lsp/lsp-signature/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf nvim optionalString;
+
   cfg = config.vim.lsp;
 in {
   config = mkIf (cfg.enable && cfg.lspSignature.enable) {

modules/lsp/lsp-signature/lsp-signature.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption;
+in {
   options.vim.lsp = {
     lspSignature = {
       enable = mkEnableOption "lsp signature viewer";

modules/lsp/lspconfig/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf mkMerge nvim optionalString mapAttrs;
+
   cfg = config.vim.lsp;
 in {
   config = mkIf cfg.lspconfig.enable (mkMerge [

modules/lsp/lspconfig/lspconfig.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption mkOption types;
+in {
   options.vim.lsp.lspconfig = {
     enable = mkEnableOption "nvim-lspconfig, also enabled automatically";
 

modules/lsp/lspkind/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf nvim;
+
   cfg = config.vim.lsp;
 in {
   config = mkIf (cfg.enable && cfg.lspkind.enable) {

modules/lsp/lspkind/lspkind.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkEnableOption mkOption types;
+
   cfg = config.vim.lsp;
 in {
   options.vim.lsp = {

modules/lsp/lsplines/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf nvim;
+
   cfg = config.vim.lsp;
 in {
   config = mkIf (cfg.enable && cfg.lsplines.enable) {

modules/lsp/lsplines/lsplines.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
-with lib;
-with builtins; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption;
+in {
   options.vim.lsp = {
     lsplines = {
       enable = mkEnableOption "diagnostics using virtual lines on top of the real line of code. [lsp_lines]";

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

modules/lsp/module.nix

@@ -1,6 +1,5 @@
-{lib, ...}:
-with lib;
-with builtins; let
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkMappingOption;
 in {
   options.vim.lsp = {
     enable = mkEnableOption "LSP, also enabled automatically through null-ls and lspconfig options";

modules/lsp/null-ls/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf mkMerge nvim mapAttrs;
+
   cfg = config.vim.lsp;
 in {
   config = mkIf cfg.null-ls.enable (mkMerge [

modules/lsp/null-ls/null-ls.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkEnableOption mkOption types;
+
   cfg = config.vim.lsp;
 in {
   options.vim.lsp.null-ls = {

modules/lsp/nvim-code-action-menu/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) addDescriptionsToMappings mkIf mkSetBinding nvim;
+
   cfg = config.vim.lsp;
 
   self = import ./nvim-code-action-menu.nix {inherit lib;};

modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
-with lib; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkMappingOption;
+in {
   options.vim.lsp = {
     nvimCodeActionMenu = {
       enable = mkEnableOption "nvim code action menu";

modules/lsp/trouble/config.nix

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

modules/lsp/trouble/trouble.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
-with lib; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkMappingOption;
+in {
   options.vim.lsp = {
     trouble = {
       enable = mkEnableOption "trouble diagnostics viewer";