From a54216006d076e391c53abb54db5fb268f450b68 Mon Sep 17 00:00:00 2001
From: n3oney <neo@neoney.dev>
Date: Mon, 10 Apr 2023 13:42:31 +0200
Subject: [PATCH] refactor!: use a new keymaps configuration format

---
 modules/basic/config.nix                     |  56 +++-
 modules/core/default.nix                     | 297 +++++++++++++------
 modules/lsp/lspsaga/config.nix               |  30 +-
 modules/lsp/lspsaga/lspsaga.nix              |  30 +-
 modules/lsp/nvim-code-action-menu/config.nix |   4 +-
 modules/lsp/trouble/config.nix               |  14 +-
 modules/notes/mind-nvim/config.nix           |   8 +-
 modules/notes/todo-comments/config.nix       |   8 +-
 modules/tabline/nvim-bufferline/config.nix   |  36 +--
 modules/utility/motion/hop/config.nix        |   4 +-
 modules/utility/telescope/config.nix         |  38 +--
 11 files changed, 343 insertions(+), 182 deletions(-)

diff --git a/modules/basic/config.nix b/modules/basic/config.nix
index a06cae2..3fdb45e 100644
--- a/modules/basic/config.nix
+++ b/modules/basic/config.nix
@@ -10,21 +10,51 @@ in {
   config = {
     vim.startPlugins = ["plenary-nvim"];
 
-    vim.nmap = mkIf cfg.disableArrows {
-      "<up>" = "<nop>";
-      "<down>" = "<nop>";
-      "<left>" = "<nop>";
-      "<right>" = "<nop>";
-    };
+    vim.maps.normal =
+      mkIf cfg.disableArrows {
+        "<up>" = {
+          action = "<nop>";
 
-    vim.imap = mkIf cfg.disableArrows {
-      "<up>" = "<nop>";
-      "<down>" = "<nop>";
-      "<left>" = "<nop>";
-      "<right>" = "<nop>";
-    };
+          noremap = false;
+        };
+        "<down>" = {
+          action = "<nop>";
 
-    vim.nnoremap = mkIf cfg.mapLeaderSpace {"<space>" = "<nop>";};
+          noremap = false;
+        };
+        "<left>" = {
+          action = "<nop>";
+          noremap = false;
+        };
+        "<right>" = {
+          action = "<nop>";
+          noremap = false;
+        };
+      }
+      // mkIf cfg.mapLeaderSpace {
+        "<space>" = {
+          action = "<nop>";
+        };
+      };
+
+    vim.maps.insert = mkIf cfg.disableArrows {
+      "<up>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<down>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<left>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+      "<right>" = {
+        action = "<nop>";
+        noremap = false;
+      };
+    };
 
     vim.configRC.basic = nvim.dag.entryAfter ["globalsScript"] ''
       " Debug mode settings
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 78232b3..6e92cff 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -19,6 +19,107 @@ with builtins; let
         type = with types; attrsOf (nullOr str);
       }
       // it);
+
+  mkBool = value: description:
+    mkOption {
+      type = types.bool;
+      default = value;
+      description = description;
+    };
+
+  # Most of the keybindings code is highly inspired by pta2002/nixvim. Thank you!
+  mapConfigOptions = {
+    silent =
+      mkBool false
+      "Whether this mapping should be silent. Equivalent to adding <silent> to a map.";
+
+    nowait =
+      mkBool false
+      "Whether to wait for extra input on ambiguous mappings. Equivalent to adding <nowait> to a map.";
+
+    script =
+      mkBool false
+      "Equivalent to adding <script> to a map.";
+
+    expr =
+      mkBool false
+      "Means that the action is actually an expression. Equivalent to adding <expr> to a map.";
+
+    unique =
+      mkBool false
+      "Whether to fail if the map is already defined. Equivalent to adding <unique> to a map.";
+
+    noremap =
+      mkBool true
+      "Whether to use the 'noremap' variant of the command, ignoring any custom mappings on the defined action. It is highly advised to keep this on, which is the default.";
+
+    desc = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "A description of this keybind, to be shown in which-key, if you have it enabled.";
+    };
+  };
+
+  genMaps = mode: maps: let
+    /*
+    Take a user-defined action (string or attrs) and return the following attribute set:
+    {
+      action = (string) the actual action to map to this key
+      config = (attrs) the configuration options for this mapping (noremap, silent...)
+    }
+    */
+    normalizeAction = action: let
+      # Extract the values of the config options that have been explicitly set by the user
+      config =
+        filterAttrs (n: v: v != null)
+        (getAttrs (attrNames mapConfigOptions) action);
+    in {
+      config =
+        if config == {}
+        then {"__empty" = null;}
+        else config;
+      action =
+        if action.lua
+        then {"__raw" = action.action;}
+        else action.action;
+    };
+  in
+    builtins.attrValues (builtins.mapAttrs
+      (key: action: let
+        normalizedAction = normalizeAction action;
+      in {
+        inherit (normalizedAction) action config;
+        key = key;
+        mode = mode;
+      })
+      maps);
+
+  mapOption = types.submodule {
+    options =
+      mapConfigOptions
+      // {
+        action = mkOption {
+          type = types.str;
+          description = "The action to execute.";
+        };
+
+        lua = mkOption {
+          type = types.bool;
+          description = ''
+            If true, `action` is considered to be lua code.
+            Thus, it will not be wrapped in `""`.
+          '';
+          default = false;
+        };
+      };
+  };
+
+  mapOptions = mode:
+    mkOption {
+      description = "Mappings for ${mode} mode";
+      type = types.attrsOf mapOption;
+      default = {};
+    };
 in {
   options.vim = {
     viAlias = mkOption {
@@ -67,64 +168,39 @@ in {
       type = types.attrs;
     };
 
-    nnoremap =
-      mkMappingOption {description = "Defines 'Normal mode' mappings";};
+    maps = mkOption {
+      type = types.submodule {
+        options = {
+          normal = mapOptions "normal";
+          insert = mapOptions "insert";
+          select = mapOptions "select";
+          visual = mapOptions "visual and select";
+          terminal = mapOptions "terminal";
+          normalVisualOp = mapOptions "normal, visual, select and operator-pending (same as plain 'map')";
 
-    inoremap = mkMappingOption {
-      description = "Defines 'Insert and Replace mode' mappings";
-    };
+          visualOnly = mapOptions "visual only";
+          operator = mapOptions "operator-pending";
+          insertCommand = mapOptions "insert and command-line";
+          lang = mapOptions "insert, command-line and lang-arg";
+          command = mapOptions "command-line";
+        };
+      };
+      default = {};
+      description = ''
+        Custom keybindings for any mode.
 
-    vnoremap = mkMappingOption {
-      description = "Defines 'Visual and Select mode' mappings";
-    };
+        For plain maps (e.g. just 'map' or 'remap') use maps.normalVisualOp.
+      '';
 
-    xnoremap =
-      mkMappingOption {description = "Defines 'Visual mode' mappings";};
-
-    snoremap =
-      mkMappingOption {description = "Defines 'Select mode' mappings";};
-
-    cnoremap =
-      mkMappingOption {description = "Defines 'Command-line mode' mappings";};
-
-    onoremap = mkMappingOption {
-      description = "Defines 'Operator pending mode' mappings";
-    };
-
-    tnoremap = mkMappingOption {
-      description = "Defines 'Terminal mode' mappings";
-    };
-
-    nmap = mkMappingOption {
-      description = "Defines 'Normal mode' mappings";
-    };
-
-    imap = mkMappingOption {
-      description = "Defines 'Insert and Replace mode' mappings";
-    };
-
-    vmap = mkMappingOption {
-      description = "Defines 'Visual and Select mode' mappings";
-    };
-
-    xmap = mkMappingOption {
-      description = "Defines 'Visual mode' mappings";
-    };
-
-    smap = mkMappingOption {
-      description = "Defines 'Select mode' mappings";
-    };
-
-    cmap = mkMappingOption {
-      description = "Defines 'Command-line mode' mappings";
-    };
-
-    omap = mkMappingOption {
-      description = "Defines 'Operator pending mode' mappings";
-    };
-
-    tmap = mkMappingOption {
-      description = "Defines 'Terminal mode' mappings";
+      example = ''
+        maps = {
+          normalVisualOp.";" = ":"; # Same as noremap ; :
+          normal."<leader>m" = {
+            silent = true;
+            action = "<cmd>make<CR>";
+          }; # Same as nnoremap <leader>m <silent> <cmd>make<CR>
+        };
+      '';
     };
   };
 
@@ -148,34 +224,66 @@ in {
       mapAttrsFlatten (name: value: "let g:${name}=${valToVim value}")
       (filterNonNull cfg.globals);
 
-    matchCtrl = it: match "Ctrl-(.)(.*)" it;
-    mapKeyBinding = it: let
-      groups = matchCtrl it;
-    in
-      if groups == null
-      then it
-      else "<C-${toUpper (head groups)}>${head (tail groups)}";
-    mapVimBinding = prefix: mappings:
-      mapAttrsFlatten (name: value: "${prefix} ${mapKeyBinding name} ${value}")
-      (filterNonNull mappings);
+    toLuaObject = args:
+      if builtins.isAttrs args
+      then
+        if hasAttr "__raw" args
+        then args.__raw
+        else if hasAttr "__empty" args
+        then "{ }"
+        else
+          "{"
+          + (concatStringsSep ","
+            (mapAttrsToList
+              (n: v:
+                if head (stringToCharacters n) == "@"
+                then toLuaObject v
+                else "[${toLuaObject n}] = " + (toLuaObject v))
+              (filterAttrs
+                (
+                  n: v:
+                    !isNull v && (toLuaObject v != "{}")
+                )
+                args)))
+          + "}"
+      else if builtins.isList args
+      then "{" + concatMapStringsSep "," toLuaObject args + "}"
+      else if builtins.isString args
+      then
+        # This should be enough!
+        builtins.toJSON args
+      else if builtins.isPath args
+      then builtins.toJSON (toString args)
+      else if builtins.isBool args
+      then "${boolToString args}"
+      else if builtins.isFloat args
+      then "${toString args}"
+      else if builtins.isInt args
+      then "${toString args}"
+      else if isNull args
+      then "nil"
+      else "";
 
-    nmap = mapVimBinding "nmap" config.vim.nmap;
-    imap = mapVimBinding "imap" config.vim.imap;
-    vmap = mapVimBinding "vmap" config.vim.vmap;
-    xmap = mapVimBinding "xmap" config.vim.xmap;
-    smap = mapVimBinding "smap" config.vim.smap;
-    cmap = mapVimBinding "cmap" config.vim.cmap;
-    omap = mapVimBinding "omap" config.vim.omap;
-    tmap = mapVimBinding "tmap" config.vim.tmap;
+    toLuaBindings = mode: maps:
+      builtins.map (value: ''
+        map("${mode}", "${value.key}", ${
+          if value.action ? "__raw"
+          then value.action."__raw"
+          else "\"${value.action}\""
+        }, ${toLuaObject value.config})'') (genMaps mode maps);
 
-    nnoremap = mapVimBinding "nnoremap" config.vim.nnoremap;
-    inoremap = mapVimBinding "inoremap" config.vim.inoremap;
-    vnoremap = mapVimBinding "vnoremap" config.vim.vnoremap;
-    xnoremap = mapVimBinding "xnoremap" config.vim.xnoremap;
-    snoremap = mapVimBinding "snoremap" config.vim.snoremap;
-    cnoremap = mapVimBinding "cnoremap" config.vim.cnoremap;
-    onoremap = mapVimBinding "onoremap" config.vim.onoremap;
-    tnoremap = mapVimBinding "tnoremap" config.vim.tnoremap;
+    # I'm not sure if every one of these will work.
+    allmap = toLuaBindings "" config.vim.maps.normalVisualOp;
+    nmap = toLuaBindings "n" config.vim.maps.normal;
+    vmap = toLuaBindings "v" config.vim.maps.visual;
+    xmap = toLuaBindings "x" config.vim.maps.visualOnly;
+    smap = toLuaBindings "s" config.vim.maps.select;
+    imap = toLuaBindings "u" config.vim.maps.insert;
+    cmap = toLuaBindings "c" config.vim.maps.command;
+    tmap = toLuaBindings "t" config.vim.maps.terminal;
+    lmap = toLuaBindings "l" config.vim.maps.lang;
+    omap = toLuaBindings "o" config.vim.maps.operator;
+    icmap = toLuaBindings "ic" config.vim.maps.insertCommand;
 
     resolveDag = {
       name,
@@ -209,8 +317,31 @@ in {
           nvim.dag.entryAfter ["globalsScript"] luaConfig;
 
         mappings = let
-          maps = [nmap imap vmap xmap smap cmap omap tmap nnoremap inoremap vnoremap xnoremap snoremap cnoremap onoremap tnoremap];
-          mapConfig = concatStringsSep "\n" (map (v: concatStringsSep "\n" v) maps);
+          maps = [
+            (splitString
+              "\n"
+              ''
+                local function map(mode, lhs, rhs, opts)
+                  local options = { noremap=true, silent=true }
+                  if opts then
+                    options = vim.tbl_extend('force', options, opts)
+                  end
+                  vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+                end
+              '')
+            nmap
+            imap
+            vmap
+            xmap
+            smap
+            cmap
+            omap
+            tmap
+            lmap
+            icmap
+            allmap
+          ];
+          mapConfig = wrapLuaConfig (concatStringsSep "\n" (map (v: concatStringsSep "\n" v) maps));
         in
           nvim.dag.entryAfter ["globalsScript"] mapConfig;
       };
diff --git a/modules/lsp/lspsaga/config.nix b/modules/lsp/lspsaga/config.nix
index f8f8024..e8c71fa 100644
--- a/modules/lsp/lspsaga/config.nix
+++ b/modules/lsp/lspsaga/config.nix
@@ -10,34 +10,34 @@ in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim.startPlugins = ["lspsaga"];
 
-    vim.vnoremap = {
-      "<silent><leader>ca" = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";
+    vim.maps.visual = {
+      "<silent><leader>ca" = {action = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";};
     };
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<silent><leader>lf" = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";
-        "<silent><leader>lh" = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";
-        "<silent><C-f>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";
-        "<silent><C-b>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";
-        "<silent><leader>lr" = "<cmd>lua require'lspsaga.rename'.rename()<CR>";
-        "<silent><leader>ld" = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";
-        "<silent><leader>ll" = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";
-        "<silent><leader>lc" = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";
-        "<silent><leader>lp" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";
-        "<silent><leader>ln" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";
+        "<silent><leader>lf" = {action = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";};
+        "<silent><leader>lh" = {action = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";};
+        "<silent><C-f>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";};
+        "<silent><C-b>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";};
+        "<silent><leader>lr" = {action = "<cmd>lua require'lspsaga.rename'.rename()<CR>";};
+        "<silent><leader>ld" = {action = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";};
+        "<silent><leader>ll" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";};
+        "<silent><leader>lc" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";};
+        "<silent><leader>lp" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";};
+        "<silent><leader>ln" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";};
       }
       // (
         if (!cfg.nvimCodeActionMenu.enable)
         then {
-          "<silent><leader>ca" = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";
+          "<silent><leader>ca" = {action = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";};
         }
         else {}
       )
       // (
         if (!cfg.lspSignature.enable)
         then {
-          "<silent><leader>ls" = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";
+          "<silent><leader>ls" = {action = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";};
         }
         else {}
       );
diff --git a/modules/lsp/lspsaga/lspsaga.nix b/modules/lsp/lspsaga/lspsaga.nix
index eecfa42..6107273 100644
--- a/modules/lsp/lspsaga/lspsaga.nix
+++ b/modules/lsp/lspsaga/lspsaga.nix
@@ -12,34 +12,34 @@ in {
   config = mkIf (cfg.enable && cfg.lspsaga.enable) {
     vim.startPlugins = ["lspsaga"];
 
-    vim.vnoremap = {
-      "<silent><leader>ca" = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";
+    vim.maps.visual = {
+      "<silent><leader>ca" = {action = ":<C-U>lua require('lspsaga.codeaction').range_code_action()<CR>";};
     };
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<silent><leader>lf" = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";
-        "<silent><leader>lh" = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";
-        "<silent><C-f>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";
-        "<silent><C-b>" = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";
-        "<silent><leader>lr" = "<cmd>lua require'lspsaga.rename'.rename()<CR>";
-        "<silent><leader>ld" = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";
-        "<silent><leader>ll" = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";
-        "<silent><leader>lc" = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";
-        "<silent><leader>lp" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";
-        "<silent><leader>ln" = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";
+        "<silent><leader>lf" = {action = "<cmd>lua require'lspsaga.provider'.lsp_finder()<CR>";};
+        "<silent><leader>lh" = {action = "<cmd>lua require('lspsaga.hover').render_hover_doc()<CR>";};
+        "<silent><C-f>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(1)<CR>";};
+        "<silent><C-b>" = {action = "<cmd>lua require('lspsaga.action').smart_scroll_with_saga(-1)<CR>";};
+        "<silent><leader>lr" = {action = "<cmd>lua require'lspsaga.rename'.rename()<CR>";};
+        "<silent><leader>ld" = {action = "<cmd>lua require'lspsaga.provider'.preview_definition()<CR>";};
+        "<silent><leader>ll" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_line_diagnostics()<CR>";};
+        "<silent><leader>lc" = {action = "<cmd>lua require'lspsaga.diagnostic'.show_cursor_diagnostics()<CR>";};
+        "<silent><leader>lp" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_prev()<CR>";};
+        "<silent><leader>ln" = {action = "<cmd>lua require'lspsaga.diagnostic'.lsp_jump_diagnostic_next()<CR>";};
       }
       // (
         if (!cfg.nvimCodeActionMenu.enable)
         then {
-          "<silent><leader>ca" = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";
+          "<silent><leader>ca" = {action = "<cmd>lua require('lspsaga.codeaction').code_action()<CR>";};
         }
         else {}
       )
       // (
         if (!cfg.lspSignature.enable)
         then {
-          "<silent><leader>ls" = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";
+          "<silent><leader>ls" = {action = "<cmd>lua require('lspsaga.signaturehelp').signature_help()<CR>";};
         }
         else {}
       );
diff --git a/modules/lsp/nvim-code-action-menu/config.nix b/modules/lsp/nvim-code-action-menu/config.nix
index 27d3cbb..dd7a1a5 100644
--- a/modules/lsp/nvim-code-action-menu/config.nix
+++ b/modules/lsp/nvim-code-action-menu/config.nix
@@ -10,8 +10,8 @@ in {
   config = mkIf (cfg.enable && cfg.nvimCodeActionMenu.enable) {
     vim.startPlugins = ["nvim-code-action-menu"];
 
-    vim.nnoremap = {
-      "<silent><leader>ca" = ":CodeActionMenu<CR>";
+    vim.maps.normal = {
+      "<silent><leader>ca" = {action = ":CodeActionMenu<CR>";};
     };
   };
 }
diff --git a/modules/lsp/trouble/config.nix b/modules/lsp/trouble/config.nix
index 092802a..bb6536c 100644
--- a/modules/lsp/trouble/config.nix
+++ b/modules/lsp/trouble/config.nix
@@ -10,13 +10,13 @@ in {
   config = mkIf (cfg.enable && cfg.trouble.enable) {
     vim.startPlugins = ["trouble"];
 
-    vim.nnoremap = {
-      "<leader>xx" = "<cmd>TroubleToggle<CR>";
-      "<leader>lwd" = "<cmd>TroubleToggle workspace_diagnostics<CR>";
-      "<leader>ld" = "<cmd>TroubleToggle document_diagnostics<CR>";
-      "<leader>lr" = "<cmd>TroubleToggle lsp_references<CR>";
-      "<leader>xq" = "<cmd>TroubleToggle quickfix<CR>";
-      "<leader>xl" = "<cmd>TroubleToggle loclist<CR>";
+    vim.maps.normal = {
+      "<leader>xx" = {action = "<cmd>TroubleToggle<CR>";};
+      "<leader>lwd" = {action = "<cmd>TroubleToggle workspace_diagnostics<CR>";};
+      "<leader>ld" = {action = "<cmd>TroubleToggle document_diagnostics<CR>";};
+      "<leader>lr" = {action = "<cmd>TroubleToggle lsp_references<CR>";};
+      "<leader>xq" = {action = "<cmd>TroubleToggle quickfix<CR>";};
+      "<leader>xl" = {action = "<cmd>TroubleToggle loclist<CR>";};
     };
 
     vim.luaConfigRC.trouble = nvim.dag.entryAnywhere ''
diff --git a/modules/notes/mind-nvim/config.nix b/modules/notes/mind-nvim/config.nix
index befbf70..5e23f06 100644
--- a/modules/notes/mind-nvim/config.nix
+++ b/modules/notes/mind-nvim/config.nix
@@ -12,10 +12,10 @@ in {
       "mind-nvim"
     ];
 
-    vim.nnoremap = {
-      "<leader>om" = ":MindOpenMain<CR>";
-      "<leader>op" = ":MindOpenProject<CR>";
-      "<leader>oc" = ":MindClose<CR>";
+    vim.maps.normal = {
+      "<leader>om" = {action = ":MindOpenMain<CR>";};
+      "<leader>op" = {action = ":MindOpenProject<CR>";};
+      "<leader>oc" = {action = ":MindClose<CR>";};
     };
 
     vim.luaConfigRC.mind-nvim = nvim.dag.entryAnywhere ''
diff --git a/modules/notes/todo-comments/config.nix b/modules/notes/todo-comments/config.nix
index c04aa8d..45a26bc 100644
--- a/modules/notes/todo-comments/config.nix
+++ b/modules/notes/todo-comments/config.nix
@@ -13,10 +13,10 @@ in {
       "todo-comments"
     ];
 
-    vim.nnoremap = {
-      "<leader>tdq" = ":TodoQuickFix<CR>";
-      "<leader>tds" = ":TodoTelescope<CR>";
-      "<leader>tdt" = ":TodoTrouble<CR>";
+    vim.maps.normal = {
+      "<leader>tdq" = {action = ":TodoQuickFix<CR>";};
+      "<leader>tds" = {action = ":TodoTelescope<CR>";};
+      "<leader>tdt" = {action = ":TodoTrouble<CR>";};
     };
 
     vim.luaConfigRC.todo-comments = ''
diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/tabline/nvim-bufferline/config.nix
index 4ed2820..960eb00 100644
--- a/modules/tabline/nvim-bufferline/config.nix
+++ b/modules/tabline/nvim-bufferline/config.nix
@@ -23,24 +23,24 @@ in {
         "bufdelete-nvim"
       ];
 
-      vim.nnoremap = {
-        "<silent><leader>bn" = ":BufferLineCycleNext<CR>";
-        "<silent><leader>bp" = ":BufferLineCyclePrev<CR>";
-        "<silent><leader>bc" = ":BufferLinePick<CR>";
-        "<silent><leader>bse" = ":BufferLineSortByExtension<CR>";
-        "<silent><leader>bsd" = ":BufferLineSortByDirectory<CR>";
-        "<silent><leader>bsi" = ":lua require'bufferline'.sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end)<CR>";
-        "<silent><leader>bmn" = ":BufferLineMoveNext<CR>";
-        "<silent><leader>bmp" = ":BufferLineMovePrev<CR>";
-        "<silent><leader>b1" = "<Cmd>BufferLineGoToBuffer 1<CR>";
-        "<silent><leader>b2" = "<Cmd>BufferLineGoToBuffer 2<CR>";
-        "<silent><leader>b3" = "<Cmd>BufferLineGoToBuffer 3<CR>";
-        "<silent><leader>b4" = "<Cmd>BufferLineGoToBuffer 4<CR>";
-        "<silent><leader>b5" = "<Cmd>BufferLineGoToBuffer 5<CR>";
-        "<silent><leader>b6" = "<Cmd>BufferLineGoToBuffer 6<CR>";
-        "<silent><leader>b7" = "<Cmd>BufferLineGoToBuffer 7<CR>";
-        "<silent><leader>b8" = "<Cmd>BufferLineGoToBuffer 8<CR>";
-        "<silent><leader>b9" = "<Cmd>BufferLineGoToBuffer 9<CR>";
+      vim.maps.normal = {
+        "<silent><leader>bn" = {action = ":BufferLineCycleNext<CR>";};
+        "<silent><leader>bp" = {action = ":BufferLineCyclePrev<CR>";};
+        "<silent><leader>bc" = {action = ":BufferLinePick<CR>";};
+        "<silent><leader>bse" = {action = ":BufferLineSortByExtension<CR>";};
+        "<silent><leader>bsd" = {action = ":BufferLineSortByDirectory<CR>";};
+        "<silent><leader>bsi" = {action = ":lua require'bufferline'.sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end)<CR>";};
+        "<silent><leader>bmn" = {action = ":BufferLineMoveNext<CR>";};
+        "<silent><leader>bmp" = {action = ":BufferLineMovePrev<CR>";};
+        "<silent><leader>b1" = {action = "<Cmd>BufferLineGoToBuffer 1<CR>";};
+        "<silent><leader>b2" = {action = "<Cmd>BufferLineGoToBuffer 2<CR>";};
+        "<silent><leader>b3" = {action = "<Cmd>BufferLineGoToBuffer 3<CR>";};
+        "<silent><leader>b4" = {action = "<Cmd>BufferLineGoToBuffer 4<CR>";};
+        "<silent><leader>b5" = {action = "<Cmd>BufferLineGoToBuffer 5<CR>";};
+        "<silent><leader>b6" = {action = "<Cmd>BufferLineGoToBuffer 6<CR>";};
+        "<silent><leader>b7" = {action = "<Cmd>BufferLineGoToBuffer 7<CR>";};
+        "<silent><leader>b8" = {action = "<Cmd>BufferLineGoToBuffer 8<CR>";};
+        "<silent><leader>b9" = {action = "<Cmd>BufferLineGoToBuffer 9<CR>";};
       };
 
       vim.luaConfigRC.nvimBufferline = nvim.dag.entryAnywhere ''
diff --git a/modules/utility/motion/hop/config.nix b/modules/utility/motion/hop/config.nix
index 3f25a07..b2b1a8e 100644
--- a/modules/utility/motion/hop/config.nix
+++ b/modules/utility/motion/hop/config.nix
@@ -9,8 +9,8 @@ in {
   config = mkIf cfg.enable {
     vim.startPlugins = ["hop-nvim"];
 
-    vim.nnoremap = {
-      "<leader>h" = "<cmd> HopPattern<CR>";
+    vim.maps.normal."<leader>h" = {
+      action = "<cmd> HopPattern<CR>";
     };
 
     vim.luaConfigRC.hop-nvim = nvim.dag.entryAnywhere ''
diff --git a/modules/utility/telescope/config.nix b/modules/utility/telescope/config.nix
index 36b1823..01a96a3 100644
--- a/modules/utility/telescope/config.nix
+++ b/modules/utility/telescope/config.nix
@@ -13,38 +13,38 @@ in {
       "telescope"
     ];
 
-    vim.nnoremap =
+    vim.maps.normal =
       {
-        "<leader>ff" = "<cmd> Telescope find_files<CR>";
-        "<leader>fg" = "<cmd> Telescope live_grep<CR>";
-        "<leader>fb" = "<cmd> Telescope buffers<CR>";
-        "<leader>fh" = "<cmd> Telescope help_tags<CR>";
-        "<leader>ft" = "<cmd> Telescope<CR>";
+        "<leader>ff" = {action = "<cmd> Telescope find_files<CR>";};
+        "<leader>fg" = {action = "<cmd> Telescope live_grep<CR>";};
+        "<leader>fb" = {action = "<cmd> Telescope buffers<CR>";};
+        "<leader>fh" = {action = "<cmd> Telescope help_tags<CR>";};
+        "<leader>ft" = {action = "<cmd> Telescope<CR>";};
 
-        "<leader>fvcw" = "<cmd> Telescope git_commits<CR>";
-        "<leader>fvcb" = "<cmd> Telescope git_bcommits<CR>";
-        "<leader>fvb" = "<cmd> Telescope git_branches<CR>";
-        "<leader>fvs" = "<cmd> Telescope git_status<CR>";
-        "<leader>fvx" = "<cmd> Telescope git_stash<CR>";
+        "<leader>fvcw" = {action = "<cmd> Telescope git_commits<CR>";};
+        "<leader>fvcb" = {action = "<cmd> Telescope git_bcommits<CR>";};
+        "<leader>fvb" = {action = "<cmd> Telescope git_branches<CR>";};
+        "<leader>fvs" = {action = "<cmd> Telescope git_status<CR>";};
+        "<leader>fvx" = {action = "<cmd> Telescope git_stash<CR>";};
       }
       // (
         if config.vim.lsp.enable
         then {
-          "<leader>flsb" = "<cmd> Telescope lsp_document_symbols<CR>";
-          "<leader>flsw" = "<cmd> Telescope lsp_workspace_symbols<CR>";
+          "<leader>flsb" = {action = "<cmd> Telescope lsp_document_symbols<CR>";};
+          "<leader>flsw" = {action = "<cmd> Telescope lsp_workspace_symbols<CR>";};
 
-          "<leader>flr" = "<cmd> Telescope lsp_references<CR>";
-          "<leader>fli" = "<cmd> Telescope lsp_implementations<CR>";
-          "<leader>flD" = "<cmd> Telescope lsp_definitions<CR>";
-          "<leader>flt" = "<cmd> Telescope lsp_type_definitions<CR>";
-          "<leader>fld" = "<cmd> Telescope diagnostics<CR>";
+          "<leader>flr" = {action = "<cmd> Telescope lsp_references<CR>";};
+          "<leader>fli" = {action = "<cmd> Telescope lsp_implementations<CR>";};
+          "<leader>flD" = {action = "<cmd> Telescope lsp_definitions<CR>";};
+          "<leader>flt" = {action = "<cmd> Telescope lsp_type_definitions<CR>";};
+          "<leader>fld" = {action = "<cmd> Telescope diagnostics<CR>";};
         }
         else {}
       )
       // (
         if config.vim.treesitter.enable
         then {
-          "<leader>fs" = "<cmd> Telescope treesitter<CR>";
+          "<leader>fs" = {action = "<cmd> Telescope treesitter<CR>";};
         }
         else {}
       );