From 679b8b69fb0ee8c5249a416845054a1734815d43 Mon Sep 17 00:00:00 2001
From: Luc Sinet <Tastyep@users.noreply.github.com>
Date: Sat, 31 Jul 2021 14:47:31 +0200
Subject: [Refactor] Define keymapppings helpers in utils.keymap (#1176)

---
 lua/keymappings.lua | 44 +++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

(limited to 'lua/keymappings.lua')

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 9c0ad217..3cbe797a 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -1,14 +1,12 @@
-local utils = require "utils"
-
 local opts = {
-  nnoremap = { noremap = true, silent = true },
-  inoremap = { noremap = true, silent = true },
-  vnoremap = { noremap = true, silent = true },
-  xnoremap = { noremap = true, silent = true },
-  generic = { silent = true },
+  insert_mode = { noremap = true, silent = true },
+  normal_mode = { noremap = true, silent = true },
+  visual_mode = { noremap = true, silent = true },
+  visual_block_mode = { noremap = true, silent = true },
+  term_mode = { silent = true },
 }
 
-local default_keys = {
+local keymaps = {
   insert_mode = {
     -- I hate escape
     { "jk", "<ESC>" },
@@ -83,33 +81,17 @@ local default_keys = {
 
 if vim.fn.has "mac" == 1 then
   -- TODO: fix this
-  default_keys.normal_mode[5][1] = "<A-Up>"
-  default_keys.normal_mode[6][1] = "<A-Down>"
-  default_keys.normal_mode[7][1] = "<A-Left>"
-  default_keys.normal_mode[8][1] = "<A-Right>"
-end
-
-if lvim.leader == " " or lvim.leader == "space" then
-  vim.g.mapleader = " "
-else
-  vim.g.mapleader = lvim.leader
+  keymaps.normal_mode[5][1] = "<A-Up>"
+  keymaps.normal_mode[6][1] = "<A-Down>"
+  keymaps.normal_mode[7][1] = "<A-Left>"
+  keymaps.normal_mode[8][1] = "<A-Right>"
 end
 
-local function get_user_keys(mode)
-  if lvim.keys[mode] == nil then
-    return default_keys[mode]
-  else
-    return lvim.keys[mode]
-  end
-end
-
-utils.add_keymap_normal_mode(opts.nnoremap, get_user_keys "normal_mode")
-utils.add_keymap_insert_mode(opts.inoremap, get_user_keys "insert_mode")
-utils.add_keymap_visual_mode(opts.vnoremap, get_user_keys "visual_mode")
-utils.add_keymap_visual_block_mode(opts.xnoremap, get_user_keys "visual_block_mode")
-utils.add_keymap_term_mode(opts.generic, get_user_keys "term_mode")
+vim.g.mapleader = lvim.leader == "space" and " " or lvim.leader
 
 -- navigate tab completion with <c-j> and <c-k>
 -- runs conditionally
 vim.cmd 'inoremap <expr> <C-j> pumvisible() ? "\\<C-n>" : "\\<C-j>"'
 vim.cmd 'inoremap <expr> <C-k> pumvisible() ? "\\<C-p>" : "\\<C-k>"'
+
+return { keymaps = keymaps, opts = opts }
-- 
cgit v1.2.3


From fe5daa722fb75ad85c24936cbb645018bb9d655b Mon Sep 17 00:00:00 2001
From: Luc Sinet <Tastyep@users.noreply.github.com>
Date: Sat, 31 Jul 2021 16:12:29 +0200
Subject: [Feature] Expose lsp config (#1156)

---
 lua/keymappings.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'lua/keymappings.lua')

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 3cbe797a..34116023 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -49,6 +49,18 @@ local keymaps = {
     { "<C-q>", ":call QuickFixToggle()<CR>" },
 
     -- {'<C-TAB>', 'compe#complete()', {noremap = true, silent = true, expr = true}},
+
+    -- LSP
+    { "gd", "<cmd>lua vim.lsp.buf.definition()<CR>" },
+    { "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>" },
+    { "gr", "<cmd>lua vim.lsp.buf.references()<CR>" },
+    { "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
+    { "gl", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = 'single' })<CR>" },
+    { "gp", "<cmd>lua require'lsp.peek'.Peek('definition')<CR>" },
+    { "K", "<cmd>lua vim.lsp.buf.hover()<CR>" },
+    { "<C-p>", "<cmd>lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
+    { "<C-n>", "<cmd>lua vim.lsp.diagnostic.goto_next({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
+    -- { "<tab>", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
   },
 
   term_mode = {
-- 
cgit v1.2.3


From c1ace3715447448c42837dac4851ddae90c65e56 Mon Sep 17 00:00:00 2001
From: Chris <chris@macbook.local>
Date: Sat, 31 Jul 2021 10:46:34 -0400
Subject: gs for signature help

---
 lua/keymappings.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lua/keymappings.lua')

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 34116023..3a509c69 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -56,11 +56,11 @@ local keymaps = {
     { "gr", "<cmd>lua vim.lsp.buf.references()<CR>" },
     { "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
     { "gl", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = 'single' })<CR>" },
+    { "gs", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
     { "gp", "<cmd>lua require'lsp.peek'.Peek('definition')<CR>" },
     { "K", "<cmd>lua vim.lsp.buf.hover()<CR>" },
     { "<C-p>", "<cmd>lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
     { "<C-n>", "<cmd>lua vim.lsp.diagnostic.goto_next({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
-    -- { "<tab>", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
   },
 
   term_mode = {
-- 
cgit v1.2.3


From d700a706b1c524197c3638d8d084b907db2cd623 Mon Sep 17 00:00:00 2001
From: rebuilt <memoryman51@hotmail.com>
Date: Sat, 31 Jul 2021 17:32:02 +0200
Subject: Wraps the logic in parenthesis so it works correctly (#1190)

---
 lua/keymappings.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lua/keymappings.lua')

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 3a509c69..937a5e8b 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -99,7 +99,7 @@ if vim.fn.has "mac" == 1 then
   keymaps.normal_mode[8][1] = "<A-Right>"
 end
 
-vim.g.mapleader = lvim.leader == "space" and " " or lvim.leader
+vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader
 
 -- navigate tab completion with <c-j> and <c-k>
 -- runs conditionally
-- 
cgit v1.2.3


From 6d14d7b5da54fffabfec18b2b09a488d3661d7f9 Mon Sep 17 00:00:00 2001
From: Luc Sinet <Tastyep@users.noreply.github.com>
Date: Mon, 2 Aug 2021 17:19:44 +0200
Subject: [Refactor] Adopt which key mapping style (#1210)

* Refactor keymappings to match which-key style

* Update confif example + remove redundant way of registering mappings
---
 lua/keymappings.lua | 92 ++++++++++++++++++++++++++---------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

(limited to 'lua/keymappings.lua')

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 937a5e8b..9ef37a39 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -9,72 +9,72 @@ local opts = {
 local keymaps = {
   insert_mode = {
     -- I hate escape
-    { "jk", "<ESC>" },
-    { "kj", "<ESC>" },
-    { "jj", "<ESC>" },
+    ["jk"] = { "<ESC>" },
+    ["kj"] = { "<ESC>" },
+    ["jj"] = { "<ESC>" },
     -- Move current line / block with Alt-j/k ala vscode.
-    { "<A-j>", "<Esc>:m .+1<CR>==gi" },
-    { "<A-k>", "<Esc>:m .-2<CR>==gi" },
+    ["<A-j>"] = { "<Esc>:m .+1<CR>==gi" },
+    ["<A-k>"] = { "<Esc>:m .-2<CR>==gi" },
     -- navigation
-    { "<A-Up>", "<C-\\><C-N><C-w>k" },
-    { "<A-Down>", "<C-\\><C-N><C-w>j" },
-    { "<A-Left>", "<C-\\><C-N><C-w>h" },
-    { "<A-Right>", "<C-\\><C-N><C-w>l" },
+    ["<A-Up>"] = { "<C-\\><C-N><C-w>k" },
+    ["<A-Down>"] = { "<C-\\><C-N><C-w>j" },
+    ["<A-Left>"] = { "<C-\\><C-N><C-w>h" },
+    ["<A-Right>"] = { "<C-\\><C-N><C-w>l" },
   },
 
   normal_mode = {
     -- Better window movement
-    { "<C-h>", "<C-w>h" },
-    { "<C-j>", "<C-w>j" },
-    { "<C-k>", "<C-w>k" },
-    { "<C-l>", "<C-w>l" },
+    ["<C-h>"] = { "<C-w>h" },
+    ["<C-j>"] = { "<C-w>j" },
+    ["<C-k>"] = { "<C-w>k" },
+    ["<C-l>"] = { "<C-w>l" },
 
     -- Resize with arrows
-    { "<C-Up>", ":resize -2<CR>" },
-    { "<C-Down>", ":resize +2<CR>" },
-    { "<C-Left>", ":vertical resize -2<CR>" },
-    { "<C-Right>", ":vertical resize +2<CR>" },
+    ["<C-Up>"] = { ":resize -2<CR>" },
+    ["<C-Down>"] = { ":resize +2<CR>" },
+    ["<C-Left>"] = { ":vertical resize -2<CR>" },
+    ["<C-Right>"] = { ":vertical resize +2<CR>" },
 
     -- Tab switch buffer
     -- { "<TAB>", ":bnext<CR>" },
     -- { "<S-TAB>", ":bprevious<CR>" },
 
     -- Move current line / block with Alt-j/k a la vscode.
-    { "<A-j>", ":m .+1<CR>==" },
-    { "<A-k>", ":m .-2<CR>==" },
+    ["<A-j>"] = { ":m .+1<CR>==" },
+    ["<A-k>"] = { ":m .-2<CR>==" },
 
     -- QuickFix
-    { "]q", ":cnext<CR>" },
-    { "[q", ":cprev<CR>" },
-    { "<C-q>", ":call QuickFixToggle()<CR>" },
+    ["]q"] = { ":cnext<CR>" },
+    ["[q"] = { ":cprev<CR>" },
+    ["<C-q>"] = { ":call QuickFixToggle()<CR>" },
 
     -- {'<C-TAB>', 'compe#complete()', {noremap = true, silent = true, expr = true}},
 
     -- LSP
-    { "gd", "<cmd>lua vim.lsp.buf.definition()<CR>" },
-    { "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>" },
-    { "gr", "<cmd>lua vim.lsp.buf.references()<CR>" },
-    { "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
-    { "gl", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = 'single' })<CR>" },
-    { "gs", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
-    { "gp", "<cmd>lua require'lsp.peek'.Peek('definition')<CR>" },
-    { "K", "<cmd>lua vim.lsp.buf.hover()<CR>" },
-    { "<C-p>", "<cmd>lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
-    { "<C-n>", "<cmd>lua vim.lsp.diagnostic.goto_next({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
+    ["gd"] = { "<cmd>lua vim.lsp.buf.definition()<CR>" },
+    ["gD"] = { "<cmd>lua vim.lsp.buf.declaration()<CR>" },
+    ["gr"] = { "<cmd>lua vim.lsp.buf.references()<CR>" },
+    ["gi"] = { "<cmd>lua vim.lsp.buf.implementation()<CR>" },
+    ["gl"] = { "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = 'single' })<CR>" },
+    ["gs"] = { "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
+    ["gp"] = { "<cmd>lua require'lsp.peek'.Peek('definition')<CR>" },
+    ["K"] = { "<cmd>lua vim.lsp.buf.hover()<CR>" },
+    ["<C-p>"] = { "<cmd>lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
+    ["<C-n>"] = { "<cmd>lua vim.lsp.diagnostic.goto_next({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
   },
 
   term_mode = {
     -- Terminal window navigation
-    { "<C-h>", "<C-\\><C-N><C-w>h" },
-    { "<C-j>", "<C-\\><C-N><C-w>j" },
-    { "<C-k>", "<C-\\><C-N><C-w>k" },
-    { "<C-l>", "<C-\\><C-N><C-w>l" },
+    ["<C-h>"] = { "<C-\\><C-N><C-w>h" },
+    ["<C-j>"] = { "<C-\\><C-N><C-w>j" },
+    ["<C-k>"] = { "<C-\\><C-N><C-w>k" },
+    ["<C-l>"] = { "<C-\\><C-N><C-w>l" },
   },
 
   visual_mode = {
     -- Better indenting
-    { "<", "<gv" },
-    { ">", ">gv" },
+    ["<"] = { "<gv" },
+    [">"] = { ">gv" },
 
     -- { "p", '"0p', { silent = true } },
     -- { "P", '"0P', { silent = true } },
@@ -82,21 +82,21 @@ local keymaps = {
 
   visual_block_mode = {
     -- Move selected line / block of text in visual mode
-    { "K", ":move '<-2<CR>gv-gv" },
-    { "J", ":move '>+1<CR>gv-gv" },
+    ["K"] = { ":move '<-2<CR>gv-gv" },
+    ["J"] = { ":move '>+1<CR>gv-gv" },
 
     -- Move current line / block with Alt-j/k ala vscode.
-    { "<A-j>", ":m '>+1<CR>gv-gv" },
-    { "<A-k>", ":m '<-2<CR>gv-gv" },
+    ["<A-j>"] = { ":m '>+1<CR>gv-gv" },
+    ["<A-k>"] = { ":m '<-2<CR>gv-gv" },
   },
 }
 
 if vim.fn.has "mac" == 1 then
   -- TODO: fix this
-  keymaps.normal_mode[5][1] = "<A-Up>"
-  keymaps.normal_mode[6][1] = "<A-Down>"
-  keymaps.normal_mode[7][1] = "<A-Left>"
-  keymaps.normal_mode[8][1] = "<A-Right>"
+  keymaps.normal_mode["<A-Up>"] = keymaps.normal_mode["<C-Up>"]
+  keymaps.normal_mode["<A-Down>"] = keymaps.normal_mode["<C-Down>"]
+  keymaps.normal_mode["<A-Left>"] = keymaps.normal_mode["<C-Left>"]
+  keymaps.normal_mode["<A-Right>"] = keymaps.normal_mode["<C-Right>"]
 end
 
 vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader
-- 
cgit v1.2.3


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/keymappings.lua | 252 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 150 insertions(+), 102 deletions(-)

(limited to 'lua/keymappings.lua')

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 9ef37a39..038ebed4 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -1,109 +1,157 @@
-local opts = {
-  insert_mode = { noremap = true, silent = true },
-  normal_mode = { noremap = true, silent = true },
-  visual_mode = { noremap = true, silent = true },
-  visual_block_mode = { noremap = true, silent = true },
-  term_mode = { silent = true },
-}
+local M = {}
+
+local generic_opts_any = { noremap = true, silent = true }
 
-local keymaps = {
-  insert_mode = {
-    -- I hate escape
-    ["jk"] = { "<ESC>" },
-    ["kj"] = { "<ESC>" },
-    ["jj"] = { "<ESC>" },
-    -- Move current line / block with Alt-j/k ala vscode.
-    ["<A-j>"] = { "<Esc>:m .+1<CR>==gi" },
-    ["<A-k>"] = { "<Esc>:m .-2<CR>==gi" },
-    -- navigation
-    ["<A-Up>"] = { "<C-\\><C-N><C-w>k" },
-    ["<A-Down>"] = { "<C-\\><C-N><C-w>j" },
-    ["<A-Left>"] = { "<C-\\><C-N><C-w>h" },
-    ["<A-Right>"] = { "<C-\\><C-N><C-w>l" },
-  },
-
-  normal_mode = {
-    -- Better window movement
-    ["<C-h>"] = { "<C-w>h" },
-    ["<C-j>"] = { "<C-w>j" },
-    ["<C-k>"] = { "<C-w>k" },
-    ["<C-l>"] = { "<C-w>l" },
-
-    -- Resize with arrows
-    ["<C-Up>"] = { ":resize -2<CR>" },
-    ["<C-Down>"] = { ":resize +2<CR>" },
-    ["<C-Left>"] = { ":vertical resize -2<CR>" },
-    ["<C-Right>"] = { ":vertical resize +2<CR>" },
-
-    -- Tab switch buffer
-    -- { "<TAB>", ":bnext<CR>" },
-    -- { "<S-TAB>", ":bprevious<CR>" },
-
-    -- Move current line / block with Alt-j/k a la vscode.
-    ["<A-j>"] = { ":m .+1<CR>==" },
-    ["<A-k>"] = { ":m .-2<CR>==" },
-
-    -- QuickFix
-    ["]q"] = { ":cnext<CR>" },
-    ["[q"] = { ":cprev<CR>" },
-    ["<C-q>"] = { ":call QuickFixToggle()<CR>" },
-
-    -- {'<C-TAB>', 'compe#complete()', {noremap = true, silent = true, expr = true}},
-
-    -- LSP
-    ["gd"] = { "<cmd>lua vim.lsp.buf.definition()<CR>" },
-    ["gD"] = { "<cmd>lua vim.lsp.buf.declaration()<CR>" },
-    ["gr"] = { "<cmd>lua vim.lsp.buf.references()<CR>" },
-    ["gi"] = { "<cmd>lua vim.lsp.buf.implementation()<CR>" },
-    ["gl"] = { "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics({ show_header = false, border = 'single' })<CR>" },
-    ["gs"] = { "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
-    ["gp"] = { "<cmd>lua require'lsp.peek'.Peek('definition')<CR>" },
-    ["K"] = { "<cmd>lua vim.lsp.buf.hover()<CR>" },
-    ["<C-p>"] = { "<cmd>lua vim.lsp.diagnostic.goto_prev({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
-    ["<C-n>"] = { "<cmd>lua vim.lsp.diagnostic.goto_next({popup_opts = {border = lvim.lsp.popup_border}})<CR>" },
-  },
-
-  term_mode = {
-    -- Terminal window navigation
-    ["<C-h>"] = { "<C-\\><C-N><C-w>h" },
-    ["<C-j>"] = { "<C-\\><C-N><C-w>j" },
-    ["<C-k>"] = { "<C-\\><C-N><C-w>k" },
-    ["<C-l>"] = { "<C-\\><C-N><C-w>l" },
-  },
-
-  visual_mode = {
-    -- Better indenting
-    ["<"] = { "<gv" },
-    [">"] = { ">gv" },
-
-    -- { "p", '"0p', { silent = true } },
-    -- { "P", '"0P', { silent = true } },
-  },
-
-  visual_block_mode = {
-    -- Move selected line / block of text in visual mode
-    ["K"] = { ":move '<-2<CR>gv-gv" },
-    ["J"] = { ":move '>+1<CR>gv-gv" },
-
-    -- Move current line / block with Alt-j/k ala vscode.
-    ["<A-j>"] = { ":m '>+1<CR>gv-gv" },
-    ["<A-k>"] = { ":m '<-2<CR>gv-gv" },
-  },
+local mode_adapters = {
+  insert_mode = "i",
+  normal_mode = "n",
+  term_mode = "t",
+  visual_mode = "v",
+  visual_block_mode = "x",
 }
 
-if vim.fn.has "mac" == 1 then
-  -- TODO: fix this
-  keymaps.normal_mode["<A-Up>"] = keymaps.normal_mode["<C-Up>"]
-  keymaps.normal_mode["<A-Down>"] = keymaps.normal_mode["<C-Down>"]
-  keymaps.normal_mode["<A-Left>"] = keymaps.normal_mode["<C-Left>"]
-  keymaps.normal_mode["<A-Right>"] = keymaps.normal_mode["<C-Right>"]
+-- Append key mappings to lunarvim's defaults for a given mode
+-- @param keymaps The table of key mappings containing a list per mode (normal_mode, insert_mode, ..)
+function M.append_to_defaults(keymaps)
+  for mode, mappings in pairs(keymaps) do
+    for k, v in ipairs(mappings) do
+      lvim.keys[mode][k] = v
+    end
+  end
+end
+
+-- Load key mappings for a given mode
+-- @param mode The keymap mode, can be one of the keys of mode_adapters
+-- @param keymaps The list of key mappings
+-- @param opts The mapping options
+function M.load_mode(mode, keymaps, opts)
+  mode = mode_adapters[mode] and mode_adapters[mode] or mode
+  for k, v in pairs(keymaps) do
+    vim.api.nvim_set_keymap(mode, k, v, opts)
+  end
+end
+
+-- Load key mappings for all provided modes
+-- @param keymaps A list of key mappings for each mode
+-- @param opts The mapping options for each mode
+function M.load(keymaps, opts)
+  for mode, mapping in pairs(keymaps) do
+    M.load_mode(mode, mapping, opts[mode])
+  end
 end
 
-vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader
+function M.config()
+  lvim.keys = {
+    ---@usage change or add keymappings for insert mode
+    insert_mode = {
+      -- 'jk' for quitting insert mode
+      ["jk"] = "<ESC>",
+      -- 'kj' for quitting insert mode
+      ["kj"] = "<ESC>",
+      -- 'jj' for quitting insert mode
+      ["jj"] = "<ESC>",
+      -- Move current line / block with Alt-j/k ala vscode.
+      ["<A-j>"] = "<Esc>:m .+1<CR>==gi",
+      -- Move current line / block with Alt-j/k ala vscode.
+      ["<A-k>"] = "<Esc>:m .-2<CR>==gi",
+      -- navigation
+      ["<A-Up>"] = "<C-\\><C-N><C-w>k",
+      ["<A-Down>"] = "<C-\\><C-N><C-w>j",
+      ["<A-Left>"] = "<C-\\><C-N><C-w>h",
+      ["<A-Right>"] = "<C-\\><C-N><C-w>l",
+    },
+
+    ---@usage change or add keymappings for normal mode
+    normal_mode = {
+      -- Better window movement
+      ["<C-h>"] = "<C-w>h",
+      ["<C-j>"] = "<C-w>j",
+      ["<C-k>"] = "<C-w>k",
+      ["<C-l>"] = "<C-w>l",
+
+      -- Resize with arrows
+      ["<C-Up>"] = ":resize -2<CR>",
+      ["<C-Down>"] = ":resize +2<CR>",
+      ["<C-Left>"] = ":vertical resize -2<CR>",
+      ["<C-Right>"] = ":vertical resize +2<CR>",
+
+      -- Tab switch buffer
+      ["<S-l>"] = ":BufferNext<CR>",
+      ["<S-h>"] = ":BufferPrevious<CR>",
+
+      -- Move current line / block with Alt-j/k a la vscode.
+      ["<A-j>"] = ":m .+1<CR>==",
+      ["<A-k>"] = ":m .-2<CR>==",
+
+      -- QuickFix
+      ["]q"] = ":cnext<CR>",
+      ["[q"] = ":cprev<CR>",
+      ["<C-q>"] = ":call QuickFixToggle()<CR>",
+    },
+
+    ---@usage change or add keymappings for terminal mode
+    term_mode = {
+      -- Terminal window navigation
+      ["<C-h>"] = "<C-\\><C-N><C-w>h",
+      ["<C-j>"] = "<C-\\><C-N><C-w>j",
+      ["<C-k>"] = "<C-\\><C-N><C-w>k",
+      ["<C-l>"] = "<C-\\><C-N><C-w>l",
+    },
+
+    ---@usage change or add keymappings for visual mode
+    visual_mode = {
+      -- Better indenting
+      ["<"] = "<gv",
+      [">"] = ">gv",
+
+      -- ["p"] = '"0p',
+      -- ["P"] = '"0P',
+    },
+
+    ---@usage change or add keymappings for visual block mode
+    visual_block_mode = {
+      -- Move selected line / block of text in visual mode
+      ["K"] = ":move '<-2<CR>gv-gv",
+      ["J"] = ":move '>+1<CR>gv-gv",
+
+      -- Move current line / block with Alt-j/k ala vscode.
+      ["<A-j>"] = ":m '>+1<CR>gv-gv",
+      ["<A-k>"] = ":m '<-2<CR>gv-gv",
+    },
+  }
+
+  if vim.fn.has "mac" == 1 then
+    lvim.keys.normal_mode["<A-Up>"] = lvim.keys.normal_mode["<C-Up>"]
+    lvim.keys.normal_mode["<A-Down>"] = lvim.keys.normal_mode["<C-Down>"]
+    lvim.keys.normal_mode["<A-Left>"] = lvim.keys.normal_mode["<C-Left>"]
+    lvim.keys.normal_mode["<A-Right>"] = lvim.keys.normal_mode["<C-Right>"]
+  end
+end
 
--- navigate tab completion with <c-j> and <c-k>
--- runs conditionally
-vim.cmd 'inoremap <expr> <C-j> pumvisible() ? "\\<C-n>" : "\\<C-j>"'
-vim.cmd 'inoremap <expr> <C-k> pumvisible() ? "\\<C-p>" : "\\<C-k>"'
+function M.print(mode)
+  print "List of LunarVim's default keymappings (not including which-key)"
+  if mode then
+    print(vim.inspect(lvim.keys[mode]))
+  else
+    print(vim.inspect(lvim.keys))
+  end
+end
+
+function M.setup()
+  -- navigate tab completion with <c-j> and <c-k>
+  -- runs conditionally
+  vim.cmd 'inoremap <expr> <C-j> pumvisible() ? "\\<C-n>" : "\\<C-j>"'
+  vim.cmd 'inoremap <expr> <C-k> pumvisible() ? "\\<C-p>" : "\\<C-k>"'
+  local generic_opts = {
+    insert_mode = generic_opts_any,
+    normal_mode = generic_opts_any,
+    visual_mode = generic_opts_any,
+    visual_block_mode = generic_opts_any,
+    term_mode = { silent = true },
+  }
+
+  vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader
+  M.load(lvim.keys, generic_opts)
+end
 
-return { keymaps = keymaps, opts = opts }
+return M
-- 
cgit v1.2.3


From 21419b244c40350ee09ef3a5cf6b1ad19054b23f Mon Sep 17 00:00:00 2001
From: Dery Rahman Ahaddienata <dery.ra@gmail.com>
Date: Tue, 3 Aug 2021 12:04:51 +0700
Subject: Keymapping custom opts (#1215)

---
 lua/keymappings.lua | 49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

(limited to 'lua/keymappings.lua')

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index 038ebed4..d14bedad 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -2,6 +2,14 @@ local M = {}
 
 local generic_opts_any = { noremap = true, silent = true }
 
+local generic_opts = {
+  insert_mode = generic_opts_any,
+  normal_mode = generic_opts_any,
+  visual_mode = generic_opts_any,
+  visual_block_mode = generic_opts_any,
+  term_mode = { silent = true },
+}
+
 local mode_adapters = {
   insert_mode = "i",
   normal_mode = "n",
@@ -20,23 +28,34 @@ function M.append_to_defaults(keymaps)
   end
 end
 
+-- Set key mappings individually
+-- @param mode The keymap mode, can be one of the keys of mode_adapters
+-- @param key The key of keymap
+-- @param val Can be form as a mapping or tuple of mapping and user defined opt
+function M.set_keymaps(mode, key, val)
+  local opt = generic_opts[mode] and generic_opts[mode] or generic_opts_any
+  if type(val) == "table" then
+    opt = val[2]
+    val = val[1]
+  end
+  vim.api.nvim_set_keymap(mode, key, val, opt)
+end
+
 -- Load key mappings for a given mode
 -- @param mode The keymap mode, can be one of the keys of mode_adapters
 -- @param keymaps The list of key mappings
--- @param opts The mapping options
-function M.load_mode(mode, keymaps, opts)
+function M.load_mode(mode, keymaps)
   mode = mode_adapters[mode] and mode_adapters[mode] or mode
   for k, v in pairs(keymaps) do
-    vim.api.nvim_set_keymap(mode, k, v, opts)
+    M.set_keymaps(mode, k, v)
   end
 end
 
 -- Load key mappings for all provided modes
 -- @param keymaps A list of key mappings for each mode
--- @param opts The mapping options for each mode
-function M.load(keymaps, opts)
+function M.load(keymaps)
   for mode, mapping in pairs(keymaps) do
-    M.load_mode(mode, mapping, opts[mode])
+    M.load_mode(mode, mapping)
   end
 end
 
@@ -59,6 +78,10 @@ function M.config()
       ["<A-Down>"] = "<C-\\><C-N><C-w>j",
       ["<A-Left>"] = "<C-\\><C-N><C-w>h",
       ["<A-Right>"] = "<C-\\><C-N><C-w>l",
+      -- navigate tab completion with <c-j> and <c-k>
+      -- runs conditionally
+      ["<C-j>"] = { 'pumvisible() ? "\\<C-n>" : "\\<C-j>"', { expr = true, noremap = true } },
+      ["<C-k>"] = { 'pumvisible() ? "\\<C-p>" : "\\<C-k>"', { expr = true, noremap = true } },
     },
 
     ---@usage change or add keymappings for normal mode
@@ -138,20 +161,8 @@ function M.print(mode)
 end
 
 function M.setup()
-  -- navigate tab completion with <c-j> and <c-k>
-  -- runs conditionally
-  vim.cmd 'inoremap <expr> <C-j> pumvisible() ? "\\<C-n>" : "\\<C-j>"'
-  vim.cmd 'inoremap <expr> <C-k> pumvisible() ? "\\<C-p>" : "\\<C-k>"'
-  local generic_opts = {
-    insert_mode = generic_opts_any,
-    normal_mode = generic_opts_any,
-    visual_mode = generic_opts_any,
-    visual_block_mode = generic_opts_any,
-    term_mode = { silent = true },
-  }
-
   vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader
-  M.load(lvim.keys, generic_opts)
+  M.load(lvim.keys)
 end
 
 return M
-- 
cgit v1.2.3


From 405423108fc31981c40116a827e845a1179c9053 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Mon, 9 Aug 2021 19:02:37 +0200
Subject: feat: Add an async logger using plenary (#1207)

Co-authored-by: rebuilt <memoryman51@hotmail.com>
---
 lua/keymappings.lua | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lua/keymappings.lua')

diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index d14bedad..e82df5ae 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -1,4 +1,5 @@
 local M = {}
+local Log = require "core.log"
 
 local generic_opts_any = { noremap = true, silent = true }
 
@@ -148,6 +149,9 @@ function M.config()
     lvim.keys.normal_mode["<A-Down>"] = lvim.keys.normal_mode["<C-Down>"]
     lvim.keys.normal_mode["<A-Left>"] = lvim.keys.normal_mode["<C-Left>"]
     lvim.keys.normal_mode["<A-Right>"] = lvim.keys.normal_mode["<C-Right>"]
+    if Log:get_default() then
+      Log:get_default().info "Activated mac keymappings"
+    end
   end
 end
 
-- 
cgit v1.2.3