diff --git a/nvim/mappings.vim b/nvim/mappings.vim index 7aa9cbe..edfb182 100644 --- a/nvim/mappings.vim +++ b/nvim/mappings.vim @@ -17,3 +17,28 @@ inoremap [, [],O " toggle hybrid mode nnoremap h :set rnu! + +" nerdtree +map e :NERDTreeToggle + +" fzf +nmap :Buffers +nmap f :GFiles +nmap l :Lines + +" vim fugitive +nnoremap gg :G + +" neo formatter +nnoremap p :Neoformat + +" lsp mappings +imap (completion_trigger) + +nnoremap gd lua vim.lsp.buf.definition() +nnoremap gh lua vim.lsp.buf.hover() +nnoremap gH lua vim.lsp.buf.code_action() +nnoremap gD lua vim.lsp.buf.implementation() +nnoremap gs lua vim.lsp.buf.signature_help() +nnoremap gr lua vim.lsp.buf.references() +nnoremap gR lua vim.lsp.buf.rename() diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim index 99d03d9..1ac6ac3 100644 --- a/nvim/pluginoptions.vim +++ b/nvim/pluginoptions.vim @@ -5,8 +5,6 @@ let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree -map e :NERDTreeToggle - " AIRLINE SETUP " ========================= @@ -38,15 +36,10 @@ augroup END " FZF SETUP " ========================= - -nmap :Buffers -nmap f :GFiles -nmap l :Lines let g:fzf_buffers_jump = 1 " VIMWIKI SETUP " ========================= - let g:vimwiki_list = [{'path': '~/.wiki/'}] " VIMTEX SETUP @@ -82,12 +75,6 @@ lua require'colorizer'.setup() let g:tmuxcomplete#trigger = '' -" neo formatter -nnoremap p :Neoformat - -" vim fugitive -nnoremap gg :G - " GOYO " ========================= @@ -111,23 +98,14 @@ let g:goyo_linenr = 0 lua require'lspconfig'.tsserver.setup{ on_attach=require'completion'.on_attach } lua require'lspconfig'.intelephense.setup{ on_attach=require'completion'.on_attach } lua require'lspconfig'.vuels.setup{ on_attach=require'completion'.on_attach } -lua require'lspconfig'.pyls.setup{ on_attach=require'completion'.on_attach, plugins = {pycodestyle = {maxLineLength=120}} } +lua require'lspconfig'.pyls.setup{ on_attach=require'completion'.on_attach } -imap (completion_trigger) set completeopt=menuone,noinsert,noselect set shortmess+=c -nnoremap gd lua vim.lsp.buf.definition() -nnoremap gh lua vim.lsp.buf.hover() -nnoremap gH lua vim.lsp.buf.code_action() -nnoremap gD lua vim.lsp.buf.implementation() -nnoremap gs lua vim.lsp.buf.signature_help() -nnoremap gr lua vim.lsp.buf.references() -nnoremap gR lua vim.lsp.buf.rename() " EMMET SETUP " ========================= - let g:user_emmet_leader_key='' " LANGUAGETOOL SETUP