From 77e283bd9c33166937756250918b12e349caf050 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Mon, 2 Aug 2021 23:42:56 +0200
Subject: [Refactor] Allow editing default keymaps (#1213)

---
 lua/core/bufferline.lua | 15 +++++----------
 lua/core/compe.lua      | 14 +++++++-------
 lua/core/which-key.lua  |  4 ++++
 3 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'lua/core')

diff --git a/lua/core/bufferline.lua b/lua/core/bufferline.lua
index 35831d03..68030c81 100644
--- a/lua/core/bufferline.lua
+++ b/lua/core/bufferline.lua
@@ -1,16 +1,11 @@
 lvim.builtin.bufferline = {
   keymap = {
-    values = {
-      normal_mode = {
-        ["<S-l>"] = { ":BufferNext<CR>" },
-        ["<S-h>"] = { ":BufferPrevious<CR>" },
-      },
-    },
-    opts = {
-      normal_mode = { noremap = true, silent = true },
+    normal_mode = {
+      ["<S-l>"] = ":BufferNext<CR>",
+      ["<S-h>"] = ":BufferPrevious<CR>",
     },
   },
 }
 
-local keymap = require "utils.keymap"
-keymap.load(lvim.builtin.bufferline.keymap.values, lvim.builtin.bufferline.keymap.opts)
+local keymap = require "keymappings"
+keymap.append_to_defaults(lvim.builtin.bufferline.keymap)
diff --git a/lua/core/compe.lua b/lua/core/compe.lua
index 5f1632f9..2d183683 100644
--- a/lua/core/compe.lua
+++ b/lua/core/compe.lua
@@ -42,12 +42,12 @@ M.config = function()
     keymap = {
       values = {
         insert_mode = {
-          ["<Tab>"] = { 'pumvisible() ? "<C-n>" : "<Tab>"' },
-          ["<S-Tab>"] = { 'pumvisible() ? "<C-p>" : "<S-Tab>"' },
-          ["<C-Space>"] = { "compe#complete()" },
-          ["<C-e>"] = { "compe#close('<C-e>')" },
-          ["<C-f>"] = { "compe#scroll({ 'delta': +4 })" },
-          ["<C-d>"] = { "compe#scroll({ 'delta': -4 })" },
+          ["<Tab>"] = 'pumvisible() ? "<C-n>" : "<Tab>"',
+          ["<S-Tab>"] = 'pumvisible() ? "<C-p>" : "<S-Tab>"',
+          ["<C-Space>"] = "compe#complete()",
+          ["<C-e>"] = "compe#close('<C-e>')",
+          ["<C-f>"] = "compe#scroll({ 'delta': +4 })",
+          ["<C-d>"] = "compe#scroll({ 'delta': -4 })",
         },
       },
       opts = {
@@ -105,7 +105,7 @@ M.setup = function()
     end
   end
 
-  local keymap = require "utils.keymap"
+  local keymap = require "keymappings"
   keymap.load(lvim.builtin.compe.keymap.values, lvim.builtin.compe.keymap.opts)
 end
 
diff --git a/lua/core/which-key.lua b/lua/core/which-key.lua
index 17995e87..eab9266a 100644
--- a/lua/core/which-key.lua
+++ b/lua/core/which-key.lua
@@ -166,6 +166,10 @@ M.config = function()
           "Workspace Symbols",
         },
       },
+      L = {
+        name = "+LunarVim",
+        k = { "<cmd>lua require('keymappings').print()<cr>", "View LunarVim's default keymappings" },
+      },
 
       s = {
         name = "Search",
-- 
cgit v1.2.3