From 3bce3cb3edc92380e4503e1860cca536a86499f1 Mon Sep 17 00:00:00 2001 From: Ward Truyen Date: Sat, 26 Jul 2025 17:37:35 +0200 Subject: [PATCH] fix: simplified and fixed a lot of keymaps --- lua/ward/plugins/mason.lua | 2 ++ lua/ward/plugins/nvim-tree.lua | 3 ++- lua/ward/plugins/telescope.lua | 22 +++++++++++-------- lua/ward/plugins/which-key.lua | 39 +++++++++++----------------------- lua/ward/remap.lua | 36 +++++++++++++++++-------------- 5 files changed, 49 insertions(+), 53 deletions(-) diff --git a/lua/ward/plugins/mason.lua b/lua/ward/plugins/mason.lua index db89616..8bc1444 100644 --- a/lua/ward/plugins/mason.lua +++ b/lua/ward/plugins/mason.lua @@ -10,6 +10,8 @@ return { "mason-org/mason.nvim", config = function() require("mason").setup() + + vim.keymap.set("n", "xm", vim.cmd.Mason, { desc = "Mason" }) end, }, "neovim/nvim-lspconfig", diff --git a/lua/ward/plugins/nvim-tree.lua b/lua/ward/plugins/nvim-tree.lua index 3072393..98f89bd 100644 --- a/lua/ward/plugins/nvim-tree.lua +++ b/lua/ward/plugins/nvim-tree.lua @@ -35,7 +35,8 @@ return { vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help')) end, }) - vim.keymap.set("n", "e", vim.cmd.NvimTreeToggle) + + vim.keymap.set("n", "e", vim.cmd.NvimTreeToggle, { desc = "Explorer" }) vim.api.nvim_create_autocmd({ "QuitPre" }, { callback = function() vim.cmd("NvimTreeClose") end, }) end, } diff --git a/lua/ward/plugins/telescope.lua b/lua/ward/plugins/telescope.lua index bd41c2d..e67ffc2 100644 --- a/lua/ward/plugins/telescope.lua +++ b/lua/ward/plugins/telescope.lua @@ -10,20 +10,24 @@ return { require('telescope').setup() local builtin = require('telescope.builtin') - vim.keymap.set('n', 'pf', builtin.find_files, {}) - vim.keymap.set('n', 'pg', builtin.git_files, {}) - vim.keymap.set('n', 'pws', function() + local wk = require("which-key") + wk.add({ + { "p", group = "Project" }, + }) + vim.keymap.set('n', 'pf', builtin.find_files, { desc = "Find file" }) + vim.keymap.set('n', 'pg', builtin.git_files, { desc = "Git files" }) + vim.keymap.set('n', 'pw', function() local word = vim.fn.expand("") builtin.grep_string({ search = word }) - end) - vim.keymap.set('n', 'pWs', function() + end, { desc = "Grep word search" }) + vim.keymap.set('n', 'pW', function() local word = vim.fn.expand("") builtin.grep_string({ search = word }) - end) + end, { desc = "Grep WORD search" }) vim.keymap.set('n', 'ps', function() builtin.grep_string({ search = vim.fn.input("Grep > ") }) - end) - vim.keymap.set('n', 'vh', builtin.help_tags, {desc = "Search [H]elp"}) - vim.keymap.set('n', 'vk', builtin.keymaps, {desc = "Search [K]eymaps"}) + end, { desc = "Grep string search" }) + vim.keymap.set('n', 'vh', builtin.help_tags, { desc = "Search [H]elp" }) + vim.keymap.set('n', 'vk', builtin.keymaps, { desc = "Search [K]eymaps" }) end } diff --git a/lua/ward/plugins/which-key.lua b/lua/ward/plugins/which-key.lua index e5edac5..f05e3c7 100644 --- a/lua/ward/plugins/which-key.lua +++ b/lua/ward/plugins/which-key.lua @@ -21,33 +21,18 @@ return { --# Structure of my standard keys local wk = require("which-key") wk.add({ - { "w", desc = "Write" }, - { "q", desc = "Quit" }, - { "e", desc = "Explore" }, - { "", desc = "Switch window" }, - { "n", desc = "Next buffer" }, - { "b", group = "Buffers" }, -- group - { "bn", desc = "Next buffer" }, - { "bp", desc = "Pervious buffer" }, - { "bb", desc = "Pervious buffer" }, - { "bl", desc = "Buffer list" }, - { "bc", desc = "Close buffer" }, - { "t", group = "Terminal" }, - -- {"tt", desc = "Bottom Terminal"}, - -- {"tv", desc = "Vertical Terminal"}, - -- {"tf", desc = "Floating Terminal"}, - { "p", group = "Project" }, - { "pf", desc = "Find file" }, - { "pg", desc = "Git files" }, - { "ps", desc = "Grep string search" }, - { "pw", desc = "Grep word search" }, - { "pW", desc = "Grep WORD search" }, - { "v", group = "Vim" }, - { "vh", desc = "Help search" }, - { "vm", "marks", desc = "Marks", }, - { "vr", "registers", desc = "Registers" }, - { "h", "nohlsearch", desc = "Stop Highlight" }, - { "l", group = "LSP" }, + { "b", group = "Buffers" }, + { "t", group = "Terminal" }, + { "v", group = "Vim" }, + { "l", group = "LSP" }, + { "x", group = "Plugins" }, + { "xl", vim.cmd.Lazy, desc = "Lazy" }, + { "xw", vim.cmd.WhichKey, desc = "Which-key" }, + { "w", function() + wk.show({ keys = "" }) + end, + desc = "Windows" + }, }) end, } diff --git a/lua/ward/remap.lua b/lua/ward/remap.lua index 3b0e7cd..eca06ff 100644 --- a/lua/ward/remap.lua +++ b/lua/ward/remap.lua @@ -3,22 +3,26 @@ vim.g.mapleader = " " vim.g.maplocalleader = "\\" +vim.keymap.set("n", "bn", vim.cmd.bnext, { desc = "Next buffer" }) +vim.keymap.set("n", "n", vim.cmd.bnext, { desc = "Next buffer" }) vim.keymap.set("n", "bw", vim.cmd.w, { desc = "Write buffer" }) +vim.keymap.set("n", "bp", vim.cmd.bprevious, { desc = "Previous buffer" }) +vim.keymap.set("n", "bb", vim.cmd.bprevious, { desc = "Previous buffer" }) +vim.keymap.set("n", "bl", vim.cmd.buffers, { desc = "List buffers" }) +vim.keymap.set("n", "bc", vim.cmd.bdelete, { desc = "Close buffer" }) +vim.keymap.set("n", "e", vim.cmd.Ex, { desc = "Explore" }) vim.keymap.set("n", "vq", vim.cmd.qall, { desc = "Quit vim" }) -vim.keymap.set("n", "bn", vim.cmd.bnext) -vim.keymap.set("n", "n", vim.cmd.bnext) -vim.keymap.set("n", "bp", vim.cmd.bprevious) -vim.keymap.set("n", "bb", vim.cmd.bprevious) -vim.keymap.set("n", "bl", vim.cmd.buffers) -vim.keymap.set("n", "bc", vim.cmd.bdelete) -vim.keymap.set("n", "e", vim.cmd.Ex) -vim.keymap.set("n", "", [[w]]) -vim.keymap.set("n", "vm", "marks") -vim.keymap.set("n", "vr", "registers") -vim.keymap.set("n", "h", "nohlsearch") +vim.keymap.set("n", "vm", "marks", {desc = "Marks"}) +vim.keymap.set("n", "vr", "registers", {desc = "Registers"}) +vim.keymap.set("n", "h", "nohlsearch", {desc = "Stop Highlight"}) +vim.keymap.set("n", "", [[w]], { desc = "Next Window" }) +-- vim.keymap.set("n", "wh", [[h]], { desc = "Window left" }) +-- vim.keymap.set("n", "wl", [[l]], { desc = "Window right" }) +-- vim.keymap.set("n", "wj", [[j]], { desc = "Window down" }) +-- vim.keymap.set("n", "wk", [[k]], { desc = "Window up" }) --"$ map exit terminal mode to Escape -vim.keymap.set("t", "", [[]]) +vim.keymap.set("t", "", [[]], { 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" }, "", '+', { desc = "Paste system clipboard" }) -vim.keymap.set({ "n", "x", "c", "v" }, "", '"+y', { desc = "Copy system clipboard" }) --- vim.keymap.set({ "n", "x" }, "", '"+p', { desc = "Paste system clipboard" }) -vim.keymap.set({ "n", "x", "c", "v" }, "", vim.cmd.w) +vim.keymap.set({ "n", "x", "c", "v" }, "", '"+y', { desc = "Copy system clipboard" }) -- ctrl+shift+c +vim.keymap.set({ "i", "c" }, "", '+', { desc = "Paste system clipboard" }) -- ctrl+shift+v +vim.keymap.set({ "n", "x" }, "", '"+P', { desc = "Paste system clipboard" }) -- ctrl+shift+v +vim.keymap.set({ "n", "x", "c", "v" }, "", vim.cmd.w) -- save=crtl+s