ward/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: simplified and fixed a lot of keymaps

Browse Source
This commit is contained in:
Ward Truyen
2025-07-26 17:37:35 +02:00
parent 71edd9843a
commit 3bce3cb3ed
5 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/ward/plugins/mason.lua
View File

@@ -10,6 +10,8 @@ return {
"mason-org/mason.nvim",
config = function()
require("mason").setup()
vim.keymap.set("n", "<leader>xm", vim.cmd.Mason, { desc = "Mason" })
end,
},
"neovim/nvim-lspconfig",

3
lua/ward/plugins/nvim-tree.lua
View File

@@ -35,7 +35,8 @@ return {
vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help'))
end,
})
vim.keymap.set("n", "<leader>e", vim.cmd.NvimTreeToggle)
vim.keymap.set("n", "<leader>e", vim.cmd.NvimTreeToggle, { desc = "Explorer" })
vim.api.nvim_create_autocmd({ "QuitPre" }, { callback = function() vim.cmd("NvimTreeClose") end, })
end,
}

22
lua/ward/plugins/telescope.lua
View File

@@ -10,20 +10,24 @@ return {
require('telescope').setup()
local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
vim.keymap.set('n', '<leader>pg', builtin.git_files, {})
vim.keymap.set('n', '<leader>pws', function()
local wk = require("which-key")
wk.add({
{ "<leader>p", group = "Project" },
})
vim.keymap.set('n', '<leader>pf', builtin.find_files, { desc = "Find file" })
vim.keymap.set('n', '<leader>pg', builtin.git_files, { desc = "Git files" })
vim.keymap.set('n', '<leader>pw', function()
local word = vim.fn.expand("<cword>")
builtin.grep_string({ search = word })
end)
vim.keymap.set('n', '<leader>pWs', function()
end, { desc = "Grep word search" })
vim.keymap.set('n', '<leader>pW', function()
local word = vim.fn.expand("<cWORD>")
builtin.grep_string({ search = word })
end)
end, { desc = "Grep WORD search" })
vim.keymap.set('n', '<leader>ps', function()
builtin.grep_string({ search = vim.fn.input("Grep > ") })
end)
vim.keymap.set('n', '<leader>vh', builtin.help_tags, {desc = "Search [H]elp"})
vim.keymap.set('n', '<leader>vk', builtin.keymaps, {desc = "Search [K]eymaps"})
end, { desc = "Grep string search" })
vim.keymap.set('n', '<leader>vh', builtin.help_tags, { desc = "Search [H]elp" })
vim.keymap.set('n', '<leader>vk', builtin.keymaps, { desc = "Search [K]eymaps" })
end
}

39
lua/ward/plugins/which-key.lua
View File

@@ -21,33 +21,18 @@ return {
--# Structure of my standard keys
local wk = require("which-key")
wk.add({
{ "<leader>w", desc = "Write" },
{ "<leader>q", desc = "Quit" },
{ "<leader>e", desc = "Explore" },
{ "<leader><TAB>", desc = "Switch window" },
{ "<leader>n", desc = "Next buffer" },
{ "<leader>b", group = "Buffers" }, -- group
{ "<leader>bn", desc = "Next buffer" },
{ "<leader>bp", desc = "Pervious buffer" },
{ "<leader>bb", desc = "Pervious buffer" },
{ "<leader>bl", desc = "Buffer list" },
{ "<leader>bc", desc = "Close buffer" },
{ "<leader>t", group = "Terminal" },
-- {"<leader>tt", desc = "Bottom Terminal"},
-- {"<leader>tv", desc = "Vertical Terminal"},
-- {"<leader>tf", desc = "Floating Terminal"},
{ "<leader>p", group = "Project" },
{ "<leader>pf", desc = "Find file" },
{ "<leader>pg", desc = "Git files" },
{ "<leader>ps", desc = "Grep string search" },
{ "<leader>pw", desc = "Grep word search" },
{ "<leader>pW", desc = "Grep WORD search" },
{ "<leader>v", group = "Vim" },
{ "<leader>vh", desc = "Help search" },
{ "<leader>vm", "<Cmd>marks<Cr>", desc = "Marks", },
{ "<leader>vr", "<Cmd>registers<Cr>", desc = "Registers" },
{ "<leader>h", "<Cmd>nohlsearch<Cr>", desc = "Stop Highlight" },
{ "<leader>l", group = "LSP" },
{ "<leader>b", group = "Buffers" },
{ "<leader>t", group = "Terminal" },
{ "<leader>v", group = "Vim" },
{ "<leader>l", group = "LSP" },
{ "<leader>x", group = "Plugins" },
{ "<leader>xl", vim.cmd.Lazy, desc = "Lazy" },
{ "<leader>xw", vim.cmd.WhichKey, desc = "Which-key" },
{ "<leader>w", function()
wk.show({ keys = "<c-w>" })
end,
desc = "Windows"
},
})
end,
}

36
lua/ward/remap.lua
View File

@@ -3,22 +3,26 @@
vim.g.mapleader = " "
vim.g.maplocalleader = "\\"
vim.keymap.set("n", "<leader>bn", vim.cmd.bnext, { desc = "Next buffer" })
vim.keymap.set("n", "<leader>n", vim.cmd.bnext, { desc = "Next buffer" })
vim.keymap.set("n", "<leader>bw", vim.cmd.w, { desc = "Write buffer" })
vim.keymap.set("n", "<leader>bp", vim.cmd.bprevious, { desc = "Previous buffer" })
vim.keymap.set("n", "<leader>bb", vim.cmd.bprevious, { desc = "Previous buffer" })
vim.keymap.set("n", "<leader>bl", vim.cmd.buffers, { desc = "List buffers" })
vim.keymap.set("n", "<leader>bc", vim.cmd.bdelete, { desc = "Close buffer" })
vim.keymap.set("n", "<leader>e", vim.cmd.Ex, { desc = "Explore" })
vim.keymap.set("n", "<leader>vq", vim.cmd.qall, { desc = "Quit vim" })
vim.keymap.set("n", "<leader>bn", vim.cmd.bnext)
vim.keymap.set("n", "<leader>n", vim.cmd.bnext)
vim.keymap.set("n", "<leader>bp", vim.cmd.bprevious)
vim.keymap.set("n", "<leader>bb", vim.cmd.bprevious)
vim.keymap.set("n", "<leader>bl", vim.cmd.buffers)
vim.keymap.set("n", "<leader>bc", vim.cmd.bdelete)
vim.keymap.set("n", "<leader>e", vim.cmd.Ex)
vim.keymap.set("n", "<leader><TAB>", [[<C-w>w]])
vim.keymap.set("n", "<leader>vm", "<Cmd>marks<Cr>")
vim.keymap.set("n", "<leader>vr", "<Cmd>registers<Cr>")
vim.keymap.set("n", "<leader>h", "<Cmd>nohlsearch<Cr>")
vim.keymap.set("n", "<leader>vm", "<Cmd>marks<Cr>", {desc = "Marks"})
vim.keymap.set("n", "<leader>vr", "<Cmd>registers<Cr>", {desc = "Registers"})
vim.keymap.set("n", "<leader>h", "<Cmd>nohlsearch<Cr>", {desc = "Stop Highlight"})
vim.keymap.set("n", "<leader><TAB>", [[<C-w>w]], { desc = "Next Window" })
-- vim.keymap.set("n", "<leader>wh", [[<C-w>h]], { desc = "Window left" })
-- vim.keymap.set("n", "<leader>wl", [[<C-w>l]], { desc = "Window right" })
-- vim.keymap.set("n", "<leader>wj", [[<C-w>j]], { desc = "Window down" })
-- vim.keymap.set("n", "<leader>wk", [[<C-w>k]], { desc = "Window up" })
--"$ map exit terminal mode to Escape
vim.keymap.set("t", "<Esc>", [[<C-\><C-n>]])
vim.keymap.set("t", "<Esc>", [[<C-\><C-n>]], { desc = "Escape terminal" })
--"$ normal mappings
--"$ up/down half a page centered
@@ -32,7 +36,7 @@ vim.keymap.set("n", "N", [[Nzz]])
--nnoremap n nzzzv
--nnoremap N Nzzzv
vim.keymap.set({ "i", "c" }, "<C-S-V>", '<C-R>+', { desc = "Paste system clipboard" })
vim.keymap.set({ "n", "x", "c", "v" }, "<C-S-C>", '"+y', { desc = "Copy system clipboard" })
-- vim.keymap.set({ "n", "x" }, "<C-S-V>", '"+p', { desc = "Paste system clipboard" })
vim.keymap.set({ "n", "x", "c", "v" }, "<C-S>", vim.cmd.w)
vim.keymap.set({ "n", "x", "c", "v" }, "<C-S-C>", '"+y', { desc = "Copy system clipboard" }) -- ctrl+shift+c
vim.keymap.set({ "i", "c" }, "<C-S-V>", '<C-R>+', { desc = "Paste system clipboard" }) -- ctrl+shift+v
vim.keymap.set({ "n", "x" }, "<C-S-V>", '"+P', { desc = "Paste system clipboard" }) -- ctrl+shift+v
vim.keymap.set({ "n", "x", "c", "v" }, "<C-S>", vim.cmd.w) -- save=crtl+s