diff --git a/home/user/.config/nvim/lua/base/plugins/mason.lua b/home/user/.config/nvim/lua/base/plugins/mason.lua index 676b62c..1530934 100644 --- a/home/user/.config/nvim/lua/base/plugins/mason.lua +++ b/home/user/.config/nvim/lua/base/plugins/mason.lua @@ -1,5 +1,4 @@ local on_attach = function(client, bufnr) - local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end @@ -13,20 +12,20 @@ local on_attach = function(client, bufnr) buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) + buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', 'k', 'lua vim.lsp.buf.hover()', opts) + buf_set_keymap('n', 'K', 'lua vim.lsp.buf.signature_help()', opts) buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) buf_set_keymap('n', 'e', 'lua vim.diagnostic.open_float()', opts) - buf_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', opts) - buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) + buf_set_keymap('n', 'p', 'lua vim.diagnostic.goto_prev()', opts) + buf_set_keymap('n', 'n', 'lua vim.diagnostic.goto_next()', opts) + buf_set_keymap('n', 'q', 'lua vim.diagnostic.setloclist()', opts) buf_set_keymap('n', 'f', 'lua vim.lsp.buf.format()', opts) - end return { diff --git a/home/user/.config/nvim/lua/base/plugins/nvim_cmp.lua b/home/user/.config/nvim/lua/base/plugins/nvim_cmp.lua index d5bbab9..b191d29 100644 --- a/home/user/.config/nvim/lua/base/plugins/nvim_cmp.lua +++ b/home/user/.config/nvim/lua/base/plugins/nvim_cmp.lua @@ -53,22 +53,6 @@ local function setup_cmp() }, { }), }) - - cmp.setup.cmdline({ '/', '?' }, { - mapping = cmp.mapping.preset.cmdline(), - sources = { - { name = 'buffer' } - } - }) - - cmp.setup.cmdline(':', { - mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ - { name = 'path' } - }, { - { name = 'cmdline' } - }) - }) end return { @@ -82,15 +66,9 @@ return { 'hrsh7th/cmp-nvim-lsp', }, config = setup_cmp, - keys = { - - }, }, { 'neovim/nvim-lspconfig', - keys = { - - }, }, { 'L3MON4D3/LuaSnip', @@ -102,14 +80,12 @@ return { vim.g.snips_email = 'thek4n@yandex.com' vim.g.snips_github = 'https://github.com/thek4n' - local function jump(val) return function() ls.jump(val) end end - local map = vim.keymap.set map({'i', 's'}, '', jump(1)) map({'i', 's'}, '', jump(-1))