modules: make lib calls explicit where possible

modules/assistant/copilot/config.nix

@@ -1,11 +1,14 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }: let
   inherit (builtins) toJSON;
-  inherit (lib) mkIf nvim mkLuaBinding mkMerge;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.lists) optionals;
+  inherit (lib.trivial) boolToString;
+  inherit (lib.nvim.binds) mkLuaBinding;
 
   cfg = config.vim.assistant.copilot;
 
@@ -27,16 +30,16 @@ in {
         "copilot-lua"
         cfg.copilotNodePackage
       ]
-      ++ lib.optionals (cfg.cmp.enable) [
+      ++ optionals (cfg.cmp.enable) [
         "copilot-cmp"
       ];
 
-    vim.luaConfigRC.copilot = nvim.dag.entryAnywhere ''
+    vim.luaConfigRC.copilot = entryAnywhere ''
       require("copilot").setup({
         -- available options: https://github.com/zbirenbaum/copilot.lua
         copilot_node_command = "${cfg.copilotNodeCommand}",
         panel = {
-          enabled = ${lib.boolToString (!cfg.cmp.enable)},
+          enabled = ${boolToString (!cfg.cmp.enable)},
           keymap = {
             jump_prev = false,
             jump_next = false,
@@ -50,7 +53,7 @@ in {
           },
         },
         suggestion = {
-          enabled = ${lib.boolToString (!cfg.cmp.enable)},
+          enabled = ${boolToString (!cfg.cmp.enable)},
           keymap = {
             accept = false,
             accept_word = false,

modules/assistant/copilot/copilot.nix

@@ -1,10 +1,12 @@
 {
-  pkgs,
   config,
+  pkgs,
   lib,
   ...
 }: let
-  inherit (lib) mkEnableOption mkOption types;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) enum float nullOr str package;
+  inherit (lib.meta) getExe;
 
   cfg = config.vim.assistant.copilot;
 in {
@@ -14,7 +16,7 @@ in {
 
     panel = {
       position = mkOption {
-        type = types.enum [
+        type = enum [
           "bottom"
           "top"
           "left"
@@ -24,7 +26,7 @@ in {
         description = "Panel position";
       };
       ratio = mkOption {
-        type = types.float;
+        type = float;
         default = 0.4;
         description = "Panel size";
       };
@@ -33,76 +35,85 @@ in {
     mappings = {
       panel = {
         jumpPrev = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "[[";
           description = "Jump to previous suggestion";
         };
+
         jumpNext = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "]]";
           description = "Jump to next suggestion";
         };
+
         accept = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "<CR>";
           description = "Accept suggestion";
         };
+
         refresh = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "gr";
           description = "Refresh suggestions";
         };
+
         open = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "<M-CR>";
           description = "Open suggestions";
         };
       };
       suggestion = {
         accept = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "<M-l>";
           description = "Accept suggetion";
         };
+
         acceptWord = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = null;
           description = "Accept next word";
         };
+
         acceptLine = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = null;
           description = "Accept next line";
         };
+
         prev = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "<M-[>";
           description = "Previous suggestion";
         };
+
         next = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "<M-]>";
           description = "Next suggestion";
         };
+
         dismiss = mkOption {
-          type = types.nullOr types.str;
+          type = nullOr str;
           default = "<C-]>";
           description = "Dismiss suggestion";
         };
       };
     };
 
     copilotNodeCommand = mkOption {
-      type = types.str;
-      default = "${lib.getExe cfg.copilotNodePackage}";
+      type = str;
+      default = "${getExe cfg.copilotNodePackage}";
       description = ''
         The command that will be executed to initiate nodejs for GitHub Copilot.
         Recommended to leave as default.
       '';
     };
 
     copilotNodePackage = mkOption {
-      type = with types; nullOr package;
+      type = nullOr package;
       default = pkgs.nodejs-slim;
       description = ''
         The nodeJS package that will be used for GitHub Copilot. If you are using a custom node command

modules/assistant/copilot/default.nix

@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./copilot.nix
     ./config.nix

modules/autopairs/default.nix

@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./nvim-autopairs
   ];

modules/autopairs/nvim-autopairs/config.nix

@@ -1,26 +1,28 @@
 {
-  lib,
   config,
+  lib,
   ...
 }: let
-  inherit (lib) mkIf nvim optionalString boolToString;
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.strings) optionalString;
+  inherit (lib.trivial) boolToString;
 
   cfg = config.vim.autopairs;
 in {
-  config =
-    mkIf (cfg.enable)
-    {
-      vim.startPlugins = ["nvim-autopairs"];
+  config = mkIf cfg.enable {
+    vim.startPlugins = ["nvim-autopairs"];
 
-      vim.luaConfigRC.autopairs = nvim.dag.entryAnywhere ''
-        require("nvim-autopairs").setup{}
-        ${optionalString (config.vim.autocomplete.type == "nvim-compe") ''
-          require('nvim-autopairs.completion.compe').setup({
-            map_cr = ${boolToString cfg.nvim-compe.map_cr},
-            map_complete = ${boolToString cfg.nvim-compe.map_complete},
-            auto_select = ${boolToString cfg.nvim-compe.auto_select},
-          })
-        ''}
-      '';
-    };
+    vim.luaConfigRC.autopairs = entryAnywhere ''
+      require("nvim-autopairs").setup{}
+      ${optionalString (config.vim.autocomplete.type == "nvim-compe") ''
+        -- nvim-compe integration
+        require('nvim-autopairs.completion.compe').setup({
+          map_cr = ${boolToString cfg.nvim-compe.map_cr},
+          map_complete = ${boolToString cfg.nvim-compe.map_complete},
+          auto_select = ${boolToString cfg.nvim-compe.auto_select},
+        })
+      ''}
+    '';
+  };
 }

modules/autopairs/nvim-autopairs/default.nix

@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./config.nix
     ./nvim-autopairs.nix

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

@@ -1,31 +1,32 @@
 {lib, ...}: let
-  inherit (lib) mkEnableOption mkOption types;
+  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.types) enum bool;
 in {
   options.vim = {
     autopairs = {
       enable = mkEnableOption "autopairs" // {default = false;};
 
       type = mkOption {
-        type = types.enum ["nvim-autopairs"];
+        type = enum ["nvim-autopairs"];
         default = "nvim-autopairs";
         description = "Set the autopairs type. Options: nvim-autopairs [nvim-autopairs]";
       };
 
       nvim-compe = {
         map_cr = mkOption {
-          type = types.bool;
+          type = bool;
           default = true;
           description = ''map <CR> on insert mode'';
         };
 
         map_complete = mkOption {
-          type = types.bool;
+          type = bool;
           default = true;
           description = "auto insert `(` after select function or method item";
         };
 
         auto_select = mkOption {
-          type = types.bool;
+          type = bool;
           default = false;
           description = "auto select first item";
         };

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

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

modules/comments/comment-nvim/config.nix

@@ -3,13 +3,13 @@
   lib,
   ...
 }: let
-  inherit (lib) mkIf mkMerge mkExprBinding mkBinding nvim;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.binds) mkExprBinding mkBinding;
+  inherit (lib.nvim.dag) entryAnywhere;
 
   cfg = config.vim.comments.comment-nvim;
-  self = import ./comment-nvim.nix {
-    inherit lib;
-  };
-  mappings = self.options.vim.comments.comment-nvim.mappings;
+  self = import ./comment-nvim.nix {inherit lib;};
+  inherit (self.options.vim.comments.comment-nvim) mappings;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
@@ -41,7 +41,7 @@ in {
       (mkBinding cfg.mappings.toggleSelectedBlock "<Plug>(comment_toggle_blockwise_visual)" mappings.toggleSelectedBlock.description)
     ];
 
-    vim.luaConfigRC.comment-nvim = nvim.dag.entryAnywhere ''
+    vim.luaConfigRC.comment-nvim = entryAnywhere ''
       require('Comment').setup({
         mappings = { basic = false, extra = false, },
       })

modules/comments/comment-nvim/default.nix

@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./config.nix
     ./comment-nvim.nix

modules/comments/default.nix

@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./comment-nvim
   ];

modules/completion/default.nix

@@ -1,4 +1,4 @@
-_: {
+{
   imports = [
     ./nvim-cmp
   ];

modules/completion/nvim-cmp/config.nix

@@ -4,8 +4,11 @@
   ...
 }: let
   inherit (builtins) toJSON;
-  inherit (lib) addDescriptionsToMappings concatMapStringsSep attrNames concatStringsSep mapAttrsToList mkIf mkSetLuaBinding mkMerge optionalString;
-  inherit (lib.nvim) dag;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.attrsets) attrNames mapAttrsToList;
+  inherit (lib.strings) concatMapStringsSep concatStringsSep optionalString;
+  inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLuaBinding;
+  inherit (lib.nvim.dag) entryAnywhere entryAfter;
 
   cfg = config.vim.autocomplete;
   lspkindEnabled = config.vim.lsp.enable && config.vim.lsp.lspkind.enable;
@@ -33,8 +36,8 @@
 
   dagPlacement =
     if lspkindEnabled
-    then dag.entryAfter ["lspkind"]
-    else dag.entryAnywhere;
+    then entryAfter ["lspkind"]
+    else entryAnywhere;
 in {
   config = mkIf cfg.enable {
     vim.startPlugins = [
@@ -195,7 +198,7 @@ in {
 
       local cmp = require'cmp'
       cmp.setup({
-        ${optionalString (config.vim.ui.borders.enable) ''
+        ${optionalString config.vim.ui.borders.enable ''
         -- explicitly enabled by setting ui.borders.enable = true
         -- TODO: try to get nvim-cmp to follow global border style
         window = {