From 55a9acabdb17fb449c7d413b5c280a5fa7ad135f Mon Sep 17 00:00:00 2001 From: AngeD Date: Sat, 6 Aug 2022 15:38:16 +0200 Subject: [PATCH 1/2] feat: lsp servers --- .config/nvim/ftplugin/dockerfile.vim | 6 ++++ .config/nvim/ftplugin/python.vim | 2 +- .config/nvim/ftplugin/sh.vim | 2 ++ .config/nvim/ftplugin/yaml.vim | 1 + .config/nvim/init.vim | 5 +-- .config/nvim/lspconfig.lua | 54 ++++++++++++++++++++++++++++ 6 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 .config/nvim/ftplugin/dockerfile.vim create mode 100644 .config/nvim/ftplugin/sh.vim create mode 100644 .config/nvim/lspconfig.lua diff --git a/.config/nvim/ftplugin/dockerfile.vim b/.config/nvim/ftplugin/dockerfile.vim new file mode 100644 index 0000000..091d981 --- /dev/null +++ b/.config/nvim/ftplugin/dockerfile.vim @@ -0,0 +1,6 @@ +" variables +setlocal shiftwidth=2 +setlocal tabstop=2 + +" packages +lua require'lspconfig'.dockerls.setup{} diff --git a/.config/nvim/ftplugin/python.vim b/.config/nvim/ftplugin/python.vim index 3a66405..b186f8a 100644 --- a/.config/nvim/ftplugin/python.vim +++ b/.config/nvim/ftplugin/python.vim @@ -1,7 +1,7 @@ " variables let g:black_linelength=79 -" plugins +" packages lua require'lspconfig'.pyright.setup{} " keybindings diff --git a/.config/nvim/ftplugin/sh.vim b/.config/nvim/ftplugin/sh.vim new file mode 100644 index 0000000..3253f31 --- /dev/null +++ b/.config/nvim/ftplugin/sh.vim @@ -0,0 +1,2 @@ +" packages +lua require'lspconfig'.bashls.setup{} diff --git a/.config/nvim/ftplugin/yaml.vim b/.config/nvim/ftplugin/yaml.vim index 071756e..9eb9d4a 100644 --- a/.config/nvim/ftplugin/yaml.vim +++ b/.config/nvim/ftplugin/yaml.vim @@ -3,5 +3,6 @@ setlocal shiftwidth=2 setlocal tabstop=2 " packages +lua require'lspconfig'.yamlls.setup{} " keybindings diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 7b65666..35400bd 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -23,14 +23,15 @@ au BufWrite * :%s/\s\+$//e so ~/.config/nvim/epitech_header.vim packadd! nvim-treesitter -lua require('nvim-treesitter.configs').setup{highlight = {enable = true}} +lua require'nvim-treesitter.configs'.setup{highlight = {enable = true}} packadd! black packadd! nvim-lspconfig +lua require'lspconfig' packadd! indent-blankline -lua require("indent_blankline").setup{space_char_blankline = " ", show_current_context = true, show_current_context_start = true} +lua require'indent_blankline'.setup{space_char_blankline = " ", show_current_context = true, show_current_context_start = true} " keybindings nnoremap :Header diff --git a/.config/nvim/lspconfig.lua b/.config/nvim/lspconfig.lua new file mode 100644 index 0000000..85c5217 --- /dev/null +++ b/.config/nvim/lspconfig.lua @@ -0,0 +1,54 @@ +-- Mappings. +-- See `:help vim.diagnostic.*` for documentation on any of the below functions +local opts = { noremap=true, silent=true } +vim.keymap.set('n', 'e', vim.diagnostic.open_float, 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) + +-- Use an on_attach function to only map the following keys +-- after the language server attaches to the current buffer +local on_attach = function(client, bufnr) + -- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + 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', 'gi', vim.lsp.buf.implementation, 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', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'f', vim.lsp.buf.formatting, bufopts) +end + +local lsp_flags = { + -- This is the default in Nvim 0.7+ + debounce_text_changes = 150, +} +require('lspconfig')['pyright'].setup{ + on_attach = on_attach, + flags = lsp_flags, +} +require('lspconfig')['tsserver'].setup{ + on_attach = on_attach, + flags = lsp_flags, +} +require('lspconfig')['rust_analyzer'].setup{ + on_attach = on_attach, + flags = lsp_flags, + -- Server-specific settings... + settings = { + ["rust-analyzer"] = {} + } +} From 5900263e45ed4424d10195a01c94add8594cfbb1 Mon Sep 17 00:00:00 2001 From: aduhayon Date: Mon, 8 Aug 2022 12:02:49 +0200 Subject: [PATCH 2/2] feat: update submodules --- .config/nvim/pack/plugins/opt/nvim-lspconfig | 2 +- .config/nvim/pack/plugins/opt/nvim-treesitter | 2 +- .pyenv | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/nvim/pack/plugins/opt/nvim-lspconfig b/.config/nvim/pack/plugins/opt/nvim-lspconfig index 6e047f1..a78831f 160000 --- a/.config/nvim/pack/plugins/opt/nvim-lspconfig +++ b/.config/nvim/pack/plugins/opt/nvim-lspconfig @@ -1 +1 @@ -Subproject commit 6e047f11861bfb6ec28a6ad0138a8f0a62bb8806 +Subproject commit a78831f97564b4344953ce1ba0f53fc5d034472d diff --git a/.config/nvim/pack/plugins/opt/nvim-treesitter b/.config/nvim/pack/plugins/opt/nvim-treesitter index a9a6493..7e41005 160000 --- a/.config/nvim/pack/plugins/opt/nvim-treesitter +++ b/.config/nvim/pack/plugins/opt/nvim-treesitter @@ -1 +1 @@ -Subproject commit a9a6493b1eeba458757903352e0d3dc4b54fd4f2 +Subproject commit 7e410054235ea84c817fc2b93f8df359ba6545eb diff --git a/.pyenv b/.pyenv index 37a6070..ae22c69 160000 --- a/.pyenv +++ b/.pyenv @@ -1 +1 @@ -Subproject commit 37a6070855d7053c34441b01b79ac6133ae5e5d9 +Subproject commit ae22c6950563af3e0ff5405367d42ceed40997d5