modules/minimap: switch to explicit lib calls

modules/minimap/codewindow/codewindow.nix

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

modules/minimap/codewindow/config.nix

@@ -3,7 +3,9 @@
   lib,
   ...
 }: let
-  inherit (lib) addDescriptionsToMappings mkIf mkMerge mkSetLuaBinding nvim pushDownDefault;
+  inherit (lib.modules) mkIf mkMerge;
+  inherit (lib.nvim.dag) entryAnywhere;
+  inherit (lib.nvim.binds) addDescriptionsToMappings mkSetLuaBinding pushDownDefault;
 
   cfg = config.vim.minimap.codewindow;
 
@@ -13,26 +15,28 @@
   mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = [
+    vim = {
+      startPlugins = [
         "codewindow-nvim"
       ];
 
-    vim.maps.normal = mkMerge [
+      maps.normal = mkMerge [
         (mkSetLuaBinding mappings.open "require('codewindow').open_minimap")
         (mkSetLuaBinding mappings.close "require('codewindow').close_minimap")
         (mkSetLuaBinding mappings.toggle "require('codewindow').toggle_minimap")
         (mkSetLuaBinding mappings.toggleFocus "require('codewindow').toggle_focus")
       ];
 
-    vim.binds.whichKey.register = pushDownDefault {
+      binds.whichKey.register = pushDownDefault {
         "<leader>m" = "+Minimap";
       };
 
-    vim.luaConfigRC.codewindow = nvim.dag.entryAnywhere ''
+      luaConfigRC.codewindow = entryAnywhere ''
         local codewindow = require('codewindow')
         codewindow.setup({
           exclude_filetypes = { 'NvimTree', 'orgagenda', 'Alpha'},
         })
       '';
     };
+  };
 }

modules/minimap/codewindow/default.nix

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

modules/minimap/default.nix

@@ -1,4 +1,4 @@
-{...}: {
+{
   imports = [
     ./minimap-vim
     ./codewindow

modules/minimap/minimap-vim/config.nix

@@ -1,10 +1,11 @@
 {
-  pkgs,
   config,
+  pkgs,
   lib,
   ...
 }: let
-  inherit (lib) mkIf pushDownDefault;
+  inherit (lib.modules) mkIf;
+  inherit (lib.nvim.binds) pushDownDefault;
 
   cfg = config.vim.minimap.minimap-vim;
 in {

modules/minimap/minimap-vim/default.nix

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

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

@@ -1,11 +1,7 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  inherit (lib) mkEnableOption;
+{lib, ...}: let
+  inherit (lib.options) mkEnableOption;
 in {
   options.vim.minimap.minimap-vim = {
-    enable = mkEnableOption "minimap-vim plugin for minimap view";
+    enable = mkEnableOption "minimap view [minimap-vim]";
   };
 }