From d589775634b4c2daca1b03bfe43c985161b7bd32 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Fri, 30 Dec 2022 23:37:48 +0100 Subject: [PATCH] feat: added better bindings for lsp --- nvim/init.lua | 2 +- nvim/lua/settings/keymaps.lua | 4 ++++ nvim/lua/settings/lsp.lua | 17 +++++++++++++---- nvim/lua/settings/options.lua | 9 ++++++--- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/nvim/init.lua b/nvim/init.lua index 2cacb12..ea8c8a2 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,5 +1,5 @@ -require("settings.plugins") require("settings.options") +require("settings.plugins") require("settings.cmp") require("settings.lsp") require("settings.devicons") diff --git a/nvim/lua/settings/keymaps.lua b/nvim/lua/settings/keymaps.lua index b9e12a2..45bc265 100644 --- a/nvim/lua/settings/keymaps.lua +++ b/nvim/lua/settings/keymaps.lua @@ -7,6 +7,10 @@ local keymap = vim.api.nvim_set_keymap --vim.lsp.handlers["textDocument/codeAction"] = require'lspactions'.codeaction --vim.cmd [[ nnoremap af :lua require'lspactions'.code_action() ]] + +-- keymap('n', '', '', { noremap = true, silent = true }) +-- keymap('n', '', '', { noremap = true, silent = true }) +-- keymap("n", "", "", opts) -- keymap("n", "", ":CodeActionMenu", opts) keymap("n", "", "TroubleToggle", term_opts) --keymap("n", "", ':lua require("vgit").buffer_stage()', opts) diff --git a/nvim/lua/settings/lsp.lua b/nvim/lua/settings/lsp.lua index 6ca7dad..e5cd32e 100644 --- a/nvim/lua/settings/lsp.lua +++ b/nvim/lua/settings/lsp.lua @@ -27,8 +27,8 @@ require("mason-lspconfig").setup({ "cmake", -- cmake "bashls", -- shell "ansiblels", -- ansible - "omnisharp", -- dotnot - "hls", -- haskel + -- "omnisharp", -- dotnot + -- "hls", -- haskel }, automatic_installation = true, }) @@ -39,8 +39,17 @@ local on_attach = function(client, bufnr) -- Enable completion triggered by vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") local opts = { noremap = true, silent = true, buffer=bufnr } - vim.keymap.set("n", "", "lua vim.lsp.buf.hover()", opts) - vim.keymap.set("n", "", "lua vim.lsp.buf.code_action()", opts) + vim.keymap.set("n", "h", "lua vim.lsp.buf.declaration()", opts) + vim.keymap.set("n", "j", "lua vim.lsp.buf.definition()", opts) + vim.keymap.set("n", "k", "lua vim.lsp.buf.implementation()", opts) + vim.keymap.set("n", "l", "lua vim.lsp.buf.references()", opts) + vim.keymap.set("n", ";", "lua vim.lsp.buf.code_action()", opts) + vim.keymap.set("n", "u", "lua vim.lsp.buf.signature_help()", opts) + vim.keymap.set("n", "g", "lua vim.lsp.buf.hover()", opts) + + + + end require("mason-lspconfig").setup_handlers({ diff --git a/nvim/lua/settings/options.lua b/nvim/lua/settings/options.lua index 71a4c39..316582b 100644 --- a/nvim/lua/settings/options.lua +++ b/nvim/lua/settings/options.lua @@ -3,8 +3,8 @@ local options = { mouse = "n", fileencoding = "utf-8", relativenumber = true, - cursorline = false, - number = true, + cursorline = false, + number = true, smartindent = true, smartcase = true, showmode = true, @@ -21,11 +21,14 @@ local options = { scrolloff = 8, -- is one of my fav sidescrolloff = 8, spell = false, - syntax = "off", + syntax = "off", spelllang = "en_us", mousemodel = "popup_setpos", } +vim.keymap.set("n", "", "", { silent = true, remap = false }) +vim.g.mapleader = " " + --vim.opt.shortmess:append "c" for k, v in pairs(options) do