summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lua/core/bufferline.lua4
-rw-r--r--lua/core/compe.lua12
-rw-r--r--lua/keymappings.lua92
-rw-r--r--lua/utils/keymap.lua4
-rw-r--r--utils/installer/config.example-no-ts.lua21
-rw-r--r--utils/installer/config.example.lua21
6 files changed, 70 insertions, 84 deletions
diff --git a/lua/core/bufferline.lua b/lua/core/bufferline.lua
index 1957226e..35831d03 100644
--- a/lua/core/bufferline.lua
+++ b/lua/core/bufferline.lua
@@ -2,8 +2,8 @@ lvim.builtin.bufferline = {
keymap = {
values = {
normal_mode = {
- { "<S-l>", ":BufferNext<CR>" },
- { "<S-h>", ":BufferPrevious<CR>" },
+ ["<S-l>"] = { ":BufferNext<CR>" },
+ ["<S-h>"] = { ":BufferPrevious<CR>" },
},
},
opts = {
diff --git a/lua/core/compe.lua b/lua/core/compe.lua
index e18147fc..5f1632f9 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 = {
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
diff --git a/lua/utils/keymap.lua b/lua/utils/keymap.lua
index 121a4888..1799e21f 100644
--- a/lua/utils/keymap.lua
+++ b/lua/utils/keymap.lua
@@ -14,8 +14,8 @@ local mode_adapters = {
-- @param opts The mapping options
M.load_mode = function(mode, keymaps, opts)
mode = mode_adapters[mode] and mode_adapters[mode] or mode
- for _, keymap in ipairs(keymaps) do
- vim.api.nvim_set_keymap(mode, keymap[1], keymap[2], opts)
+ for key, mapping in pairs(keymaps) do
+ vim.api.nvim_set_keymap(mode, key, mapping[1], opts)
end
end
diff --git a/utils/installer/config.example-no-ts.lua b/utils/installer/config.example-no-ts.lua
index c0df5b8b..c74548dc 100644
--- a/utils/installer/config.example-no-ts.lua
+++ b/utils/installer/config.example-no-ts.lua
@@ -7,23 +7,16 @@ lvim.colorscheme = "spacegray"
-- keymappings
lvim.leader = "space"
--- overwrite the key-mappings provided by LunarVim for any mode, or leave it empty to keep them
+-- overwrite/augment the key-mappings provided by LunarVim for any mode, or leave empty to keep the defaults.
-- lvim.keys.normal_mode = {
--- Page down/up
--- {'[d', '<PageUp>'},
--- {']d', '<PageDown>'},
+-- -- Page down/up
+-- ["[d"] = { "<PageUp>" },
+-- ["]d"] = { "<PageDown>" },
--
--- Navigate buffers
--- {'<Tab>', ':bnext<CR>'},
--- {'<S-Tab>', ':bprevious<CR>'},
+-- -- Navigate buffers
+-- ["<Tab>"] = { ":bnext<CR>" },
+-- ["<S-Tab>"] = { ":bprevious<CR>" },
-- }
--- if you just want to augment the existing ones then use the utility function
--- require("utils").add_keymap_insert_mode({ silent = true }, {
--- { "<C-s>", ":w<cr>" },
--- { "<C-c>", "<ESC>" },
--- })
--- you can also use the native vim way directly
--- vim.api.nvim_set_keymap("i", "<C-Space>", "compe#complete()", { noremap = true, silent = true, expr = true })
-- TODO: User Config for predefined plugins
-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua
index 843917a7..a7a55874 100644
--- a/utils/installer/config.example.lua
+++ b/utils/installer/config.example.lua
@@ -15,23 +15,16 @@ lvim.lint_on_save = true
lvim.colorscheme = "spacegray"
-- keymappings
lvim.leader = "space"
--- overwrite the key-mappings provided by LunarVim for any mode, or leave it empty to keep them
+-- overwrite/augment the key-mappings provided by LunarVim for any mode, or leave empty to keep the defaults.
-- lvim.keys.normal_mode = {
--- Page down/up
--- {'[d', '<PageUp>'},
--- {']d', '<PageDown>'},
+-- -- Page down/up
+-- ["[d"] = { "<PageUp>" },
+-- ["]d"] = { "<PageDown>" },
--
--- Navigate buffers
--- {'<Tab>', ':bnext<CR>'},
--- {'<S-Tab>', ':bprevious<CR>'},
+-- -- Navigate buffers
+-- ["<Tab>"] = { ":bnext<CR>" },
+-- ["<S-Tab>"] = { ":bprevious<CR>" },
-- }
--- if you just want to augment the existing ones then use the utility function
--- require("utils").add_keymap_insert_mode({ silent = true }, {
--- { "<C-s>", ":w<cr>" },
--- { "<C-c>", "<ESC>" },
--- })
--- you can also use the native vim way directly
--- vim.api.nvim_set_keymap("i", "<C-Space>", "compe#complete()", { noremap = true, silent = true, expr = true })
-- TODO: User Config for predefined plugins
-- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 05:43:48 +0000