From f88ac8a820d6c454faf4ce30b64d44ecee37d7f6 Mon Sep 17 00:00:00 2001 From: Jaroslaw Konik Date: Fri, 14 Jul 2023 21:52:19 +0200 Subject: [PATCH] Update --- init.lua | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index 13dd3c1..ada4328 100644 --- a/init.lua +++ b/init.lua @@ -94,6 +94,8 @@ require("lazy").setup({ }, }) +local wk = require("which-key") + -- Stick buffer require("stickybuf").setup() @@ -139,7 +141,14 @@ local function on_attach(client, buffer) local keymap_opts = { buffer = buffer } - -- TODO: Register in which-key + wk.register({ + w = { + name = "Word", + h = { vim.lsp.buf.hover, "LSP Hover" }, + }, + }, { prefix = "" }) + + -- TODO: Register all in which-key vim.keymap.set("n", "", vim.lsp.buf.definition, keymap_opts) vim.keymap.set("n", "gD", vim.lsp.buf.implementation, keymap_opts) vim.keymap.set("n", "", vim.lsp.buf.signature_help, keymap_opts) @@ -150,7 +159,6 @@ local function on_attach(client, buffer) vim.keymap.set("n", "gd", vim.lsp.buf.definition, keymap_opts) vim.keymap.set("n", "ga", vim.lsp.buf.code_action, keymap_opts) vim.keymap.set("n", "r", "lua vim.lsp.buf.rename()", { noremap = true }) - vim.keymap.set("n", "h", vim.lsp.buf.hover, keymap_opts) -- Show diagnostic popup on cursor hover local diag_float_grp = vim.api.nvim_create_augroup("DiagnosticFloat", { clear = true }) @@ -274,12 +282,11 @@ require("scope").setup({ -- Keybinds local telescope_builtin = require("telescope.builtin") -local wk = require("which-key") wk.register({ - o = { - name = "Open", - t = { "terminal", "Open Terminal" }, + n = { + name = "New", + t = { "terminal", "New Terminal" }, }, f = { name = "Find", @@ -293,7 +300,10 @@ wk.register({ f = { "NvimTreeFindFile", "Focus current file in tree" }, t = { require("nvim-tree.api").tree.toggle, "Toggle tree" }, }, - g = { neogit.open, "Open git" }, + g = { + name = "Git", + o = { neogit.open, "Open Git" }, + }, r = { name = "Refresh", d = { vim.diagnostic.reset, "Refresh diagnostic" },