Merge pull request #179 from NotAShelf/inherit-lib

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

modules/assistant/copilot/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkIf nvim mkLuaBinding mkMerge;
-with builtins; let
+
   cfg = config.vim.assistant.copilot;
 
   wrapPanelBinding = luaFunction: key: ''

modules/assistant/copilot/copilot.nix

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

modules/assistant/tabnine/config.nix

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

modules/assistant/tabnine/tabnine.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types mkMappingOption;
-with builtins; {
+in {
   options.vim.assistant.tabnine = {
     enable = mkEnableOption "Tabnine assistant";
 

modules/autopairs/nvim-autopairs/config.nix

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

modules/autopairs/nvim-autopairs/nvim-autopairs.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types;
-with builtins; {
+in {
   options.vim = {
     autopairs = {
       enable = mkEnableOption "autopairs" // {default = false;};

modules/comments/comment-nvim/comment-nvim.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkMappingOption;
-with builtins; {
+in {
   options.vim.comments.comment-nvim = {
     enable = mkEnableOption "smart and powerful comment plugin for neovim comment-nvim";
 

modules/comments/comment-nvim/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkIf mkMerge mkExprBinding mkBinding nvim;
-with builtins; let
+
   cfg = config.vim.comments.comment-nvim;
   self = import ./comment-nvim.nix {
     inherit lib;

modules/completion/nvim-cmp/config.nix

@@ -2,9 +2,9 @@
   lib,
   config,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) addDescriptionsToMappings concatMapStringsSep attrNames concatStringsSep mapAttrsToList nvim mkIf mkSetLuaBinding mkMerge optionalString;
-with builtins; let
+
   cfg = config.vim.autocomplete;
   lspkindEnabled = config.vim.lsp.enable && config.vim.lsp.lspkind.enable;
 

modules/completion/nvim-cmp/nvim-cmp.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkMappingOption mkOption types;
-with builtins; {
+in {
   options.vim = {
     autocomplete = {
       enable = mkEnableOption "enable autocomplete" // {default = false;};

modules/core/default.nix

@@ -7,6 +7,7 @@ with builtins; let
   inherit (lib) mkOption types mapAttrsFlatten filterAttrs optionalString getAttrs literalExpression;
   inherit (lib) nvim;
   inherit (nvim.lua) toLuaObject;
+  inherit (nvim.vim) valToVim;
 
   cfg = config.vim;
 

modules/dashboard/alpha/alpha.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+in {
   options.vim.dashboard.alpha = {
     enable = mkEnableOption "dashboard via alpha.nvim";
   };

modules/dashboard/alpha/config.nix

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

modules/dashboard/dashboard-nvim/config.nix

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

modules/dashboard/dashboard-nvim/dashboard-nvim.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+in {
   options.vim.dashboard.dashboard-nvim = {
     enable = mkEnableOption "dashboard via dashboard.nvim";
   };

modules/dashboard/startify/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with builtins;
+  inherit (lib) mkIf;
-with lib; let
+
   cfg = config.vim.dashboard.startify;
 
   mkVimBool = val:

modules/dashboard/startify/startify.nix

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

modules/debugger/nvim-dap/config.nix

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

modules/debugger/nvim-dap/nvim-dap.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib; {
+  inherit (lib) mkEnableOption mkOption types mkMappingOption;
+in {
   options.vim.debugger.nvim-dap = {
     enable = mkEnableOption "debugging via nvim-dap";
 

modules/filetree/nvimtree/config.nix

@@ -3,9 +3,9 @@
   lib,
   pkgs,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkIf mkMerge mkBinding nvim boolToString;
-with builtins; let
+
   cfg = config.vim.filetree.nvimTree;
   self = import ./nvimtree.nix {
     inherit pkgs;

modules/filetree/nvimtree/nvimtree.nix

@@ -2,9 +2,9 @@
   pkgs,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types literalExpression;
-with builtins; {
+in {
   options.vim.filetree.nvimTree = {
     enable = mkEnableOption "filetree via nvim-tree.lua";
 

modules/git/config.nix

@@ -2,9 +2,8 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) addDescriptionsToMappings mkIf mkMerge mkSetExprBinding toJSON mkSetLuaBinding nvim;
-with builtins; let
   cfg = config.vim.git;
 
   self = import ./git.nix {inherit lib;};
@@ -20,7 +19,7 @@ in {
         vim.maps.normal = mkMerge [
           (mkSetExprBinding gsMappings.nextHunk ''
             function()
-              if vim.wo.diff then return ${toJSON gsMappings.nextHunk.value} end
+              if vim.wo.diff then return ${builtins.toJSON gsMappings.nextHunk.value} end
 
               vim.schedule(function() package.loaded.gitsigns.next_hunk() end)
 
@@ -29,7 +28,7 @@ in {
           '')
           (mkSetExprBinding gsMappings.previousHunk ''
             function()
-              if vim.wo.diff then return ${toJSON gsMappings.previousHunk.value} end
+              if vim.wo.diff then return ${builtins.toJSON gsMappings.previousHunk.value} end
 
               vim.schedule(function() package.loaded.gitsigns.prev_hunk() end)
 

modules/git/git.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkMappingOption;
-with builtins; {
+in {
   options.vim.git = {
     enable = mkEnableOption "git tools via gitsigns";
 

modules/minimap/codewindow/codewindow.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib; {
+  inherit (lib) mkEnableOption mkMappingOption;
+in {
   options.vim.minimap.codewindow = {
     enable = mkEnableOption "codewindow plugin for minimap view";
 

modules/minimap/codewindow/config.nix

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

modules/minimap/minimap-vim/config.nix

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

modules/minimap/minimap-vim/minimap-vim.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+in {
   options.vim.minimap.minimap-vim = {
     enable = mkEnableOption "minimap-vim plugin for minimap view";
   };

modules/notes/mind-nvim/config.nix

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

modules/notes/mind-nvim/mind-nvim.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+in {
   options.vim.notes.mind-nvim = {
     enable = mkEnableOption "organizer tool for Neovim.";
   };

modules/notes/obsidian/config.nix

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

modules/notes/obsidian/obsidian.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types;
-with builtins; {
+in {
   options.vim.notes = {
     obsidian = {
       enable = mkEnableOption "complementary neovim plugins for Obsidian editor";

modules/notes/orgmode/config.nix

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

modules/notes/orgmode/orgmode.nix

@@ -3,9 +3,9 @@
   lib,
   pkgs,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption types mkOption nvim;
-with builtins; {
+in {
   options.vim.notes.orgmode = {
     enable = mkEnableOption "nvim-orgmode: Neovim plugin for Emac Orgmode. Get the best of both worlds";
 

modules/notes/todo-comments/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkMerge mkBinding mkIf;
-with builtins; let
+
   cfg = config.vim.notes.todo-comments;
   self = import ./todo-comments.nix {inherit lib;};
   mappings = self.options.vim.notes.todo-comments.mappings;

modules/notes/todo-comments/todo-comments.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types mkMappingOption;
-with builtins; {
+in {
   options.vim.notes.todo-comments = {
     enable = mkEnableOption "todo-comments: highlight and search for todo comments like TODO, HACK, BUG in your code base";
 

modules/projects/project-nvim/config.nix

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

modules/projects/project-nvim/project-nvim.nix

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

modules/rich-presence/presence-nvim/config.nix

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

modules/rich-presence/presence-nvim/presence-nvim.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types;
-with builtins; {
+in {
   options.vim.presence.presence-nvim = {
     enable = mkEnableOption "presence.nvim plugin for discord rich presence";
 

modules/session/nvim-session-manager/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkIf optionals mkMerge mkBinding nvim concatStringsSep boolToString;
-with builtins; let
+
   cfg = config.vim.session.nvim-session-manager;
 in {
   config = mkIf cfg.enable {

modules/session/nvim-session-manager/nvim-session-manager.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types;
-with builtins; {
+in {
   options.vim.session.nvim-session-manager = {
     enable = mkEnableOption "nvim-session-manager: manage sessions like folders in VSCode";
 

modules/snippets/vsnip/config.nix

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

modules/snippets/vsnip/vsnip.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib; {
+  inherit (lib) mkEnableOption;
+in {
   options.vim.snippets.vsnip = {
     enable = mkEnableOption "vim-vsnip: snippet LSP/VSCode's format";
   };

modules/statusline/lualine/config.nix

@@ -2,10 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib; let
   cfg = config.vim.statusline.lualine;
-  inherit (nvim.lua) luaTable;
+  inherit (lib) mkIf nvim boolToString optionalString;
 in {
   config = (mkIf cfg.enable) {
     vim.startPlugins = [
@@ -33,21 +32,21 @@ in {
         },
         -- active sections
         sections = {
-          lualine_a = ${luaTable (cfg.activeSection.a ++ cfg.extraActiveSection.a)},
+          lualine_a = ${nvim.lua.luaTable (cfg.activeSection.a ++ cfg.extraActiveSection.a)},
-          lualine_b = ${luaTable (cfg.activeSection.b ++ cfg.extraActiveSection.b)},
+          lualine_b = ${nvim.lua.luaTable (cfg.activeSection.b ++ cfg.extraActiveSection.b)},
-          lualine_c = ${luaTable (cfg.activeSection.c ++ cfg.extraActiveSection.c)},
+          lualine_c = ${nvim.lua.luaTable (cfg.activeSection.c ++ cfg.extraActiveSection.c)},
-          lualine_x = ${luaTable (cfg.activeSection.x ++ cfg.extraActiveSection.x)},
+          lualine_x = ${nvim.lua.luaTable (cfg.activeSection.x ++ cfg.extraActiveSection.x)},
-          lualine_y = ${luaTable (cfg.activeSection.y ++ cfg.extraActiveSection.y)},
+          lualine_y = ${nvim.lua.luaTable (cfg.activeSection.y ++ cfg.extraActiveSection.y)},
-          lualine_z = ${luaTable (cfg.activeSection.z ++ cfg.extraActiveSection.z)},
+          lualine_z = ${nvim.lua.luaTable (cfg.activeSection.z ++ cfg.extraActiveSection.z)},
         },
         --
         inactive_sections = {
-          lualine_a = ${luaTable (cfg.inactiveSection.a ++ cfg.extraInactiveSection.a)},
+          lualine_a = ${nvim.lua.luaTable (cfg.inactiveSection.a ++ cfg.extraInactiveSection.a)},
-          lualine_b = ${luaTable (cfg.inactiveSection.b ++ cfg.extraInactiveSection.b)},
+          lualine_b = ${nvim.lua.luaTable (cfg.inactiveSection.b ++ cfg.extraInactiveSection.b)},
-          lualine_c = ${luaTable (cfg.inactiveSection.c ++ cfg.extraInactiveSection.c)},
+          lualine_c = ${nvim.lua.luaTable (cfg.inactiveSection.c ++ cfg.extraInactiveSection.c)},
-          lualine_x = ${luaTable (cfg.inactiveSection.x ++ cfg.extraInactiveSection.x)},
+          lualine_x = ${nvim.lua.luaTable (cfg.inactiveSection.x ++ cfg.extraInactiveSection.x)},
-          lualine_y = ${luaTable (cfg.inactiveSection.y ++ cfg.extraInactiveSection.y)},
+          lualine_y = ${nvim.lua.luaTable (cfg.inactiveSection.y ++ cfg.extraInactiveSection.y)},
-          lualine_z = ${luaTable (cfg.inactiveSection.z ++ cfg.extraInactiveSection.z)},
+          lualine_z = ${nvim.lua.luaTable (cfg.inactiveSection.z ++ cfg.extraInactiveSection.z)},
         },
         tabline = {},
 

modules/statusline/lualine/lualine.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types elem optional;
-with builtins; let
+
   supported_themes = import ./supported_themes.nix;
   colorPuccin =
     if config.vim.statusline.lualine.theme == "catppuccin"

modules/tabline/nvim-bufferline/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkIf mkMerge mkLuaBinding mkBinding nvim;
-with builtins; let
+
   cfg = config.vim.tabline.nvimBufferline;
   self = import ./nvim-bufferline.nix {
     inherit lib;

modules/tabline/nvim-bufferline/nvim-bufferline.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkMappingOption;
-with builtins; {
+in {
   options.vim.tabline.nvimBufferline = {
     enable = mkEnableOption "nvim-bufferline-lua as a bufferline";
 

modules/terminal/toggleterm/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkMerge mkIf mkBinding nvim getExe;
-with builtins; let
+
   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]'})
         '';
       }
     )

modules/terminal/toggleterm/toggleterm.nix

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

modules/theme/config.nix

@@ -2,8 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib; {
+  inherit (lib) mkDefault;
+in {
   config = {
     vim.theme = {
       enable = mkDefault false;

modules/theme/theme.nix

@@ -2,10 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkOption types attrNames mkIf nvim;
-with lib.attrsets;
+
-with builtins; let
   cfg = config.vim.theme;
   supported_themes = import ./supported_themes.nix {inherit lib;};
 in {

modules/treesitter/config.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) addDescriptionsToMappings mkIf optional mkSetBinding mkMerge nvim;
-with builtins; let
+
   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,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types mkIf nvim boolToString;
-with builtins; let
+
   treesitter = config.vim.treesitter;
   cfg = treesitter.context;
 in {

modules/treesitter/treesitter.nix

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

modules/ui/colorizer/colorizer.nix

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

modules/ui/colorizer/config.nix

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

modules/ui/illuminate/config.nix

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

modules/ui/illuminate/illuminate.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+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,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkIf nvim boolToString;
-with builtins; let
+
   cfg = config.vim.ui.modes-nvim;
 in {
   config = mkIf cfg.enable {

modules/ui/modes/modes.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types;
-with builtins; {
+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,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkIf nvim boolToString;
-with builtins; let
+
   cfg = config.vim.ui.noice;
 in {
   config = mkIf cfg.enable {

modules/ui/noice/noice.nix

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

modules/ui/smartcolumn/config.nix

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

modules/ui/smartcolumn/smartcolumn.nix

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

modules/utility/binds/cheatsheet/cheatsheet.nix

@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+in {
   options.vim.binds.cheatsheet = {
     enable = mkEnableOption "cheatsheet-nvim: searchable cheatsheet for nvim using telescope";
   };

modules/utility/binds/cheatsheet/config.nix

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

modules/utility/binds/which-key/config.nix

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

modules/utility/binds/which-key/which-key.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+in {
   options.vim.binds.whichKey = {
     enable = mkEnableOption "which-key keybind helper menu";
   };

modules/utility/ccc/ccc.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkMappingOption;
-with builtins; {
+in {
   options.vim.utility.ccc = {
     enable = mkEnableOption "ccc color picker for neovim";
 

modules/utility/ccc/config.nix

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

modules/utility/diffview/config.nix

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

modules/utility/diffview/diffview.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+in {
   options.vim.utility.diffview-nvim = {
     enable = mkEnableOption "diffview-nvim: cycle through diffs for all modified files for any git rev";
   };

modules/utility/gestures/gesture-nvim/config.nix

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

modules/utility/gestures/gesture-nvim/gesture-nvim.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib; {
+  inherit (lib) mkEnableOption mkMappingOption;
+in {
   options.vim.gestures.gesture-nvim = {
     enable = mkEnableOption "gesture-nvim: mouse gestures";
 

modules/utility/icon-picker/config.nix

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

modules/utility/icon-picker/icon-picker.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption;
-with builtins; {
+in {
   options.vim.utility.icon-picker = {
     enable = mkEnableOption "nerdfonts icon picker for nvim";
   };

modules/utility/motion/hop/config.nix

@@ -2,8 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib; let
+  inherit (lib) addDescriptionsToMappings mkIf mkSetBinding nvim;
+
   cfg = config.vim.utility.motion.hop;
 
   self = import ./hop.nix {inherit lib;};

modules/utility/motion/hop/hop.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib; {
+  inherit (lib) mkMappingOption mkEnableOption;
+in {
   options.vim.utility.motion.hop = {
     mappings = {
       hop = mkMappingOption "Jump to occurences [hop.nvim]" "<leader>h";

modules/utility/motion/leap/config.nix

@@ -2,8 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib; let
+  inherit (lib) mkIf mkMerge mkBinding nvim;
+
   cfg = config.vim.utility.motion.leap;
 in {
   config = mkIf cfg.enable {

modules/utility/motion/leap/leap.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types;
-with builtins; {
+in {
   options.vim.utility.motion.leap = {
     enable = mkEnableOption "leap.nvim plugin (easy motion)";
 

modules/utility/surround/config.nix

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

modules/utility/surround/surround.nix

@@ -2,9 +2,9 @@
   lib,
   config,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkOption types mkIf mkDefault;
-with builtins; {
+in {
   options.vim.utility.surround = {
     enable = mkOption {
       type = types.bool;

modules/utility/telescope/config.nix

@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) addDescriptionsToMappings mkIf mkMerge mkSetBinding nvim;
-with builtins; let
+
   cfg = config.vim.telescope;
   self = import ./telescope.nix {inherit lib;};
   mappingDefinitions = self.options.vim.telescope.mappings;

modules/utility/telescope/telescope.nix

@@ -1,6 +1,6 @@
-{lib, ...}:
+{lib, ...}: let
-with lib;
+  inherit (lib) mkMappingOption mkEnableOption;
-with builtins; {
+in {
   options.vim.telescope = {
     mappings = {
       findProjects = mkMappingOption "Find files [Telescope]" "<leader>fp";

modules/utility/wakatime/config.nix

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

modules/utility/wakatime/vim-wakatime.nix

@@ -2,9 +2,9 @@
   lib,
   pkgs,
   ...
-}:
+}: let
-with lib;
+  inherit (lib) mkEnableOption mkOption types;
-with builtins; {
+in {
   options.vim.utility.vim-wakatime = {
     enable = mkEnableOption "vim-wakatime: live code statistics";
 

modules/visuals/config.nix

@@ -2,8 +2,9 @@
   config,
   lib,
   ...
-}:
+}: let
-with lib; let
+  inherit (lib) mkIf mkMerge nvim optionalString boolToString mkBinding;
+
   cfg = config.vim.visuals;
 in {
   config = mkIf cfg.enable (mkMerge [

modules/visuals/visuals.nix

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