From 5f02bd18516a1ae41dba936bb3da6720737d6b8e Mon Sep 17 00:00:00 2001 From: pr0c3550r Date: Sun, 26 Mar 2023 14:05:17 +0200 Subject: [PATCH] Keymaps: changed Keymaps for LSP --- nvim/.config/nvim/ftplugin/c.lua | 2 +- nvim/.config/nvim/ftplugin/python.lua | 2 +- nvim/.config/nvim/ftplugin/sh.lua | 2 +- nvim/.config/nvim/ftplugin/tex.lua | 2 +- nvim/.config/nvim/lua/plugin/lspconfig.lua | 21 ++++++++++++--------- nvim/.config/nvim/lua/plugin/null-ls.lua | 12 ++++++------ 6 files changed, 22 insertions(+), 19 deletions(-) diff --git a/nvim/.config/nvim/ftplugin/c.lua b/nvim/.config/nvim/ftplugin/c.lua index f0978a7..10a7974 100644 --- a/nvim/.config/nvim/ftplugin/c.lua +++ b/nvim/.config/nvim/ftplugin/c.lua @@ -1,5 +1,5 @@ -- Compile c from file -vim.api.nvim_buf_set_keymap(0, "n", "c", ":exec 'w' :exec '!gcc % -o %<'", {}) +vim.api.nvim_buf_set_keymap(0, "n", "cc", ":exec 'w' :exec '!gcc % -o %<'", {}) vim.api.nvim_buf_set_keymap(0, "n", "", ":exec 'w' :exec '!gcc % -o %<'", {}) vim.api.nvim_buf_set_keymap(0, "i", "", ":exec 'w' :exec '!gcc % -o %<'", {}) vim.api.nvim_buf_set_keymap(0, "v", "", ":exec 'w' :exec '!gcc % -o %<'", {}) diff --git a/nvim/.config/nvim/ftplugin/python.lua b/nvim/.config/nvim/ftplugin/python.lua index 2a4b5d8..ff19b97 100644 --- a/nvim/.config/nvim/ftplugin/python.lua +++ b/nvim/.config/nvim/ftplugin/python.lua @@ -1,5 +1,5 @@ -- Run python from file -vim.api.nvim_buf_set_keymap(0, "n", "c", ":exec 'w' :exec '!python3 %'", {}) +vim.api.nvim_buf_set_keymap(0, "n", "cc", ":exec 'w' :exec '!python3 %'", {}) vim.api.nvim_buf_set_keymap(0, "n", "", ":exec 'w' :exec '!python3 %'", {}) vim.api.nvim_buf_set_keymap(0, "i", "", ":exec 'w' :exec '!python3 %'", {}) vim.api.nvim_buf_set_keymap(0, "v", "", ":exec 'w' :exec '!python3 %'", {}) diff --git a/nvim/.config/nvim/ftplugin/sh.lua b/nvim/.config/nvim/ftplugin/sh.lua index a28acd4..d11f497 100644 --- a/nvim/.config/nvim/ftplugin/sh.lua +++ b/nvim/.config/nvim/ftplugin/sh.lua @@ -1,5 +1,5 @@ -- Run python from file -vim.api.nvim_buf_set_keymap(0, "n", "c", ":exec 'w' :exec '!sh %'", {}) +vim.api.nvim_buf_set_keymap(0, "n", "cc", ":exec 'w' :exec '!sh %'", {}) vim.api.nvim_buf_set_keymap(0, "n", "", ":exec 'w' :exec '!./%'", {}) vim.api.nvim_buf_set_keymap(0, "i", "", ":exec 'w' :exec '!./%'", {}) vim.api.nvim_buf_set_keymap(0, "v", "", ":exec 'w' :exec '!./%'", {}) diff --git a/nvim/.config/nvim/ftplugin/tex.lua b/nvim/.config/nvim/ftplugin/tex.lua index dc2ded3..6262f2e 100644 --- a/nvim/.config/nvim/ftplugin/tex.lua +++ b/nvim/.config/nvim/ftplugin/tex.lua @@ -1,5 +1,5 @@ -- Compile LaTeX from file -vim.api.nvim_buf_set_keymap(0, "n", "c", ":exec 'w' :exec '!xelatex %'", {}) +vim.api.nvim_buf_set_keymap(0, "n", "cc", ":exec 'w' :exec '!xelatex %'", {}) vim.api.nvim_buf_set_keymap(0, "n", "", ":exec 'w' :exec 'w' :exec '!xelatex %'", {}) vim.api.nvim_buf_set_keymap(0, "i", "", " :exec 'w' :exec '!xelatex %'", {}) vim.api.nvim_buf_set_keymap(0, "v", "", " :exec 'w' :exec '!xelatex %'", {}) diff --git a/nvim/.config/nvim/lua/plugin/lspconfig.lua b/nvim/.config/nvim/lua/plugin/lspconfig.lua index d64be55..33f2688 100644 --- a/nvim/.config/nvim/lua/plugin/lspconfig.lua +++ b/nvim/.config/nvim/lua/plugin/lspconfig.lua @@ -6,13 +6,14 @@ return { require('lspconfig.ui.windows').default_options.border = 'rounded' vim.api.nvim_set_hl(0, "LspInfoBorder", { bg = none, fg = "#d4be98" }) local opts = { noremap = true, silent = true } - vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) + vim.keymap.set('n', 'cd', vim.diagnostic.open_float, opts) + vim.keymap.set('n', 'cl', "LspInfo", opts) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) local on_attach = function(client, bufnr) - -- Enable completion triggered by + -- enable completion triggered by vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') -- Mappings. @@ -20,19 +21,21 @@ return { local bufopts = { noremap = true, silent = true, buffer = bufnr } vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'k', vim.lsp.buf.hover, bufopts) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'gK', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) vim.keymap.set('n', 'wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, bufopts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'a', vim.lsp.buf.code_action, bufopts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'Fm', function() vim.lsp.buf.format { async = true } end, bufopts) + vim.keymap.set('n', 'gt', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'cr', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'cf', function() vim.lsp.buf.format { async = true } end, bufopts) + vim.keymap.set('v', 'cf', function() vim.lsp.buf.format { async = true } end, bufopts) end local signs = { Error = "✘ ", Warn = " ", Hint = " ", Info = " " } diff --git a/nvim/.config/nvim/lua/plugin/null-ls.lua b/nvim/.config/nvim/lua/plugin/null-ls.lua index ca8e7a5..a68490f 100644 --- a/nvim/.config/nvim/lua/plugin/null-ls.lua +++ b/nvim/.config/nvim/lua/plugin/null-ls.lua @@ -27,16 +27,16 @@ return { border = 'rounded', on_attach = function(client, bufnr) local bufopts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set('n', 'a', vim.lsp.buf.code_action, bufopts) vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'k', vim.lsp.buf.hover, bufopts) vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'a', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gt', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'cr', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'Fm', function() vim.lsp.buf.format { async = true } end, bufopts) + vim.keymap.set('n', 'cf', function() vim.lsp.buf.format { async = true } end, bufopts) + vim.keymap.set('v', 'cf', function() vim.lsp.buf.format { async = true } end, bufopts) end, sources = { null_ls.builtins.diagnostics.trail_space.with {