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

modules/ui/colorizer/colorizer.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption mkOption types;
+in {
   options.vim.ui.colorizer = {
     enable = mkEnableOption "nvim-colorizer.lua for color highlighting";
 

modules/ui/colorizer/config.nix

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

modules/ui/illuminate/config.nix

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

modules/ui/illuminate/illuminate.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption;
+in {
   options.vim.ui.illuminate = {
     enable = mkEnableOption "vim-illuminate: automatically highlight other uses of the word under the cursor";
   };

modules/ui/modes/config.nix

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

modules/ui/modes/modes.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
-with lib;
-with builtins; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkOption types;
+in {
   options.vim.ui.modes-nvim = {
     enable = mkEnableOption "modes.nvim's prismatic line decorations";
 

modules/ui/noice/config.nix

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

modules/ui/noice/noice.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption;
+in {
   options.vim.ui.noice = {
     enable = mkEnableOption "noice-nvim UI modification library";
   };

modules/ui/notifications/nvim-notify/config.nix

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

modules/ui/notifications/nvim-notify/nvim-notify.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; {
+}: let
+  inherit (lib) mkEnableOption mkOption types;
+in {
   options.vim.notify.nvim-notify = {
     enable = mkEnableOption "nvim-notify notifications";
     stages = mkOption {

modules/ui/smartcolumn/config.nix

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

modules/ui/smartcolumn/smartcolumn.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
-with lib;
-with builtins; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkOption types;
+in {
   options.vim.ui.smartcolumn = {
     enable = mkEnableOption "line length indicator";