diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/nvim/lua/mappings.lua | 3 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 29 |
2 files changed, 25 insertions, 7 deletions
diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 1e051d7..008405d 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -7,6 +7,9 @@ map('n', '<leader>sc', '<cmd>source $MYVIMRC<cr>', {}) -- source vimrc map('n', '<leader>;', 'mqA;<esc>`q', {}) -- put semicolon at the end of line map('n', 'cu', 'ct_', {}) -- common change until map('n', '<leader>ss', '<cmd>setlocal spell!<cr>', {}) -- toggle spelling check +map('n', '<leader>]', '<C-]>', {}) -- toggle spelling check +map('n', '<leader>t', '<C-t>', {}) -- toggle spelling check + -- split navigation map('n', '<C-j>', '<C-w><C-j>', {}) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 3a365e3..8786fe0 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -13,10 +13,25 @@ return require('packer').startup(function() 'neovim/nvim-lspconfig', ft = {'rust', 'python', 'c', 'cpp'}, config = function() + local on_attach = function(client, bufnr) + local opts = { noremap = true, silent = true } + local map = function(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end + map('n', '<leader>[', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts) + map('n', '<leader>]', '<cmd>lua vim.lsp.buf.definition()<CR>', opts) + map('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts) + map('n', '[d', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts) + map('n', ']d', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts) + map('n', '<leader>q', '<cmd>Telescope lsp_workspace_diagnostics<CR>', opts) + map('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) + end local lspconfig = require('lspconfig') - lspconfig.clangd.setup {} + lspconfig.clangd.setup { on_attach = on_attach } -- need python-lsp-server and pyls-flake8 - lspconfig.pylsp.setup {} + lspconfig.pylsp.setup { on_attach = on_attach } + vim.diagnostic.config { + signs = false, + update_in_insert = false, + } -- lspconfig.rust_analyser.setup {} end, } @@ -155,11 +170,11 @@ return require('packer').startup(function() config = function() local map = vim.api.nvim_set_keymap map('n', '<leader>m', "nvim_exec('MagmaEvaluateOperator', v:true)", { expr = true}) - map('n', '<leader>mm', ':MagmaEvaluateLine<CR>', {}) - map('x', '<leader>m', ':<C-u>MagmaEvaluateVisual<CR>', {}) - map('n', '<leader>mc', ':MagmaReevaluateCell<CR>', {}) - map('n', '<leader>md', ':MagmaDelete<CR>', {}) - map('n', '<leader>mo', ':MagmaShowOutput<CR>', {}) + map('n', '<leader>mm', '<cmd>MagmaEvaluateLine<CR>', {}) + map('x', '<leader>m', '<cmd><C-u>MagmaEvaluateVisual<CR>', {}) + map('n', '<leader>mc', '<cmd>MagmaReevaluateCell<CR>', {}) + map('n', '<leader>md', '<cmd>MagmaDelete<CR>', {}) + map('n', '<leader>mo', '<cmd>MagmaShowOutput<CR>', {}) end } |