dhalucario/devconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up vim config and WIP autocomplete

Browse source
This commit is contained in:
Leon Grünewald 2021-08-29 20:20:36 +02:00
parent f85dc5cce3
commit bf729262cc
2 changed files with 10 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
.config/nvim/init.vim
View file

@ -1,45 +1,9 @@
source ~/.vimrc source ~/.vimrc
set inccommand=nosplit
lua << EOF lua << EOF
local nvim_lsp = require('lspconfig') local nvim_lsp = require('lspconfig')
local on_attach = require'completion'.on_attach
-- 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)
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
-- Enable completion triggered by <c-x><c-o>
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Mappings.
local opts = { noremap=true, silent=true }
-- See `:help vim.lsp.*` for documentation on any of the below functions
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
buf_set_keymap('n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
buf_set_keymap('n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
buf_set_keymap('n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
buf_set_keymap('n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
buf_set_keymap('n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
buf_set_keymap('n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
buf_set_keymap('n', '<space>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
buf_set_keymap('n', '<space>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
buf_set_keymap('n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
end
-- Use a loop to conveniently call 'setup' on multiple servers and
-- map buffer local keybindings when the language server attaches
local servers = { "html", "clangd", "vimls", "vuels", "phpactor", "rust_analyzer", "tsserver" } local servers = { "html", "clangd", "vimls", "vuels", "phpactor", "rust_analyzer", "tsserver" }
for _, lsp in ipairs(servers) do for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup { nvim_lsp[lsp].setup {
on_attach = on_attach, on_attach = on_attach,

7
.vimrc
View file

@ -1,5 +1,8 @@
call plug#begin('~/.vim/plugged') call plug#begin('~/.vim/plugged')
if has('nvim')
Plug 'neovim/nvim-lspconfig' Plug 'neovim/nvim-lspconfig'
Plug 'nvim-lua/completion-nvim'
endif
Plug 'adelarsq/vim-matchit' Plug 'adelarsq/vim-matchit'
Plug 'tpope/vim-surround' Plug 'tpope/vim-surround'
Plug 'bronson/vim-trailing-whitespace' Plug 'bronson/vim-trailing-whitespace'
@ -15,6 +18,10 @@ Plug 'alvan/vim-closetag'
Plug 'mipmip/vim-fluid' Plug 'mipmip/vim-fluid'
call plug#end() call plug#end()
if has('nvim')
set inccommand=nosplit
endif
"" NERDTree config "" NERDTree config
" Autostart NERDTree on start " Autostart NERDTree on start
autocmd vimenter * NERDTree | wincmd w autocmd vimenter * NERDTree | wincmd w