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

NotAShelf · Nov 7, 2023 · ffa25c8 · ffa25c8
1 parent 3fde6a4
commit ffa25c8
Show file tree

Hide file tree

Showing 90 changed files with 281 additions and 273 deletions.
diff --git a/modules/assistant/copilot/config.nix b/modules/assistant/copilot/config.nix
@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf nvim mkLuaBinding mkMerge;
+
   cfg = config.vim.assistant.copilot;
 
   wrapPanelBinding = luaFunction: key: ''

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

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

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

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

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

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

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

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

diff --git a/modules/completion/nvim-cmp/nvim-cmp.nix b/modules/completion/nvim-cmp/nvim-cmp.nix
@@ -1,6 +1,6 @@
-{lib, ...}:
-with lib;
-with builtins; {
+{lib, ...}: let
+  inherit (lib) mkEnableOption mkMappingOption mkOption types;
+in {
   options.vim = {
     autocomplete = {
       enable = mkEnableOption "enable autocomplete" // {default = false;};

diff --git a/modules/core/default.nix b/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;
 

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

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

diff --git a/modules/dashboard/dashboard-nvim/config.nix b/modules/dashboard/dashboard-nvim/config.nix
@@ -2,9 +2,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf nvim;
+
   cfg = config.vim.dashboard.dashboard-nvim;
 in {
   config = mkIf cfg.enable {

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

diff --git a/modules/dashboard/startify/config.nix b/modules/dashboard/startify/config.nix
@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with builtins;
-with lib; let
+}: let
+  inherit (lib) mkIf;
+
   cfg = config.vim.dashboard.startify;
 
   mkVimBool = val:

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

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

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

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

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

diff --git a/modules/git/config.nix b/modules/git/config.nix
@@ -2,9 +2,8 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) addDescriptionsToMappings mkIf mkMerge mkSetExprBinding toJSON mkSetLuaBinding nvim;
   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)
 

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

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

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

diff --git a/modules/minimap/minimap-vim/config.nix b/modules/minimap/minimap-vim/config.nix
@@ -3,9 +3,9 @@
   config,
   lib,
   ...
-}:
-with lib;
-with builtins; let
+}: let
+  inherit (lib) mkIf;
+
   cfg = config.vim.minimap.minimap-vim;
 in {
   config = mkIf cfg.enable {

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

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

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

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

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