diff options
Diffstat (limited to 'nvim')
| -rw-r--r-- | nvim/.config/nvim/coc-settings.json | 89 | ||||
| -rw-r--r-- | nvim/.config/nvim/coc.vim | 128 | ||||
| -rw-r--r-- | nvim/.config/nvim/fzf.vim | 5 | ||||
| -rw-r--r-- | nvim/.config/nvim/init.vim | 6 | ||||
| -rw-r--r-- | nvim/.config/nvim/plugins.vim | 23 | ||||
| -rw-r--r-- | nvim/.vimrc | 13 |
6 files changed, 264 insertions, 0 deletions
diff --git a/nvim/.config/nvim/coc-settings.json b/nvim/.config/nvim/coc-settings.json new file mode 100644 index 0000000..18223ed --- /dev/null +++ b/nvim/.config/nvim/coc-settings.json @@ -0,0 +1,89 @@ +{ + "python.linting.pylintEnabled": true, + "python.linting.flake8Enabled": false, + "python.linting.enabled": true, + "python.pythonPath": "/usr/bin/python", + + "languageserver": { + "ccls": { + "command": "ccls", + "filetypes": ["c", "cpp", "cuda", "objc", "objcpp"], + "rootPatterns": [".ccls-root", ".git/"], + "initializationOptions": { + "highlight": { + "lsRanges": true + }, + "cache": { + "directory": ".ccls-cache" + } + } + }, + "python": { + "command": "python", + "args": [ + "-mpylsp", + "-vv", + "--log-file", + "/tmp/lsp_python.log" + ], + "trace.server": "verbose", + "filetypes": [ + "python" + ], + "settings": { + "pyls": { + "enable": true, + "trace": { + "server": "verbose" + }, + "commandPath": "", + "configurationSources": [ + "pycodestyle" + ], + "plugins": { + "jedi_completion": { + "enabled": true + }, + "jedi_hover": { + "enabled": true + }, + "jedi_references": { + "enabled": true + }, + "jedi_signature_help": { + "enabled": true + }, + "jedi_symbols": { + "enabled": true, + "all_scopes": true + }, + "mccabe": { + "enabled": true, + "threshold": 15 + }, + "preload": { + "enabled": true + }, + "pycodestyle": { + "enabled": true + }, + "pydocstyle": { + "enabled": false, + "match": "(?!test_).*\\.py", + "matchDir": "[^\\.].*" + }, + "pyflakes": { + "enabled": true + }, + "rope_completion": { + "enabled": true + }, + "yapf": { + "enabled": true + } + } + } + } + } + } +} diff --git a/nvim/.config/nvim/coc.vim b/nvim/.config/nvim/coc.vim new file mode 100644 index 0000000..da06334 --- /dev/null +++ b/nvim/.config/nvim/coc.vim @@ -0,0 +1,128 @@ +" if hidden is not set, TextEdit might fail. +set hidden + +" Some servers have issues with backup files, see #649 +set nobackup +set nowritebackup + +" Better display for messages +set cmdheight=2 + +" You will have bad experience for diagnostic messages when it's default 4000. +set updatetime=300 + +" don't give |ins-completion-menu| messages. +set shortmess+=c + +" always show signcolumns +set signcolumn=yes + +" Use tab for trigger completion with characters ahead and navigate. +" Use command ':verbose imap <tab>' to make sure tab is not mapped by other plugin. +inoremap <silent><expr> <TAB> + \ pumvisible() ? "\<C-n>" : + \ <SID>check_back_space() ? "\<TAB>" : + \ coc#refresh() +inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>" + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use <c-space> to trigger completion. +inoremap <silent><expr> <c-space> coc#refresh() + +" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position. +" Coc only does snippet and additional edit on confirm. +inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>" +" Or use `complete_info` if your vim support it, like: +" inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>" + +" Use `[g` and `]g` to navigate diagnostics +nmap <silent> [g <Plug>(coc-diagnostic-prev) +nmap <silent> ]g <Plug>(coc-diagnostic-next) + +" Remap keys for gotos +nmap <silent> gd <Plug>(coc-definition) +nmap <silent> gy <Plug>(coc-type-definition) +nmap <silent> gi <Plug>(coc-implementation) +nmap <silent> gr <Plug>(coc-references) + +" Use K to show documentation in preview window +nnoremap <silent> K :call <SID>show_documentation()<CR> + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('<cword>') + else + call CocAction('doHover') + endif +endfunction + +" Highlight symbol under cursor on CursorHold +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Remap for rename current word +nmap <leader>rn <Plug>(coc-rename) + +" Remap for format selected region +xmap <leader>f <Plug>(coc-format-selected) +nmap <leader>f <Plug>(coc-format-selected) + +augroup mygroup + autocmd! + " Setup formatexpr specified filetype(s). + autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected') + " Update signature help on jump placeholder + autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp') +augroup end + +" Remap for do codeAction of selected region, ex: `<leader>aap` for current paragraph +xmap <leader>a <Plug>(coc-codeaction-selected) +nmap <leader>a <Plug>(coc-codeaction-selected) + +" Remap for do codeAction of current line +nmap <leader>ac <Plug>(coc-codeaction) +" Fix autofix problem of current line +nmap <leader>qf <Plug>(coc-fix-current) + +" Create mappings for function text object, requires document symbols feature of languageserver. +xmap if <Plug>(coc-funcobj-i) +xmap af <Plug>(coc-funcobj-a) +omap if <Plug>(coc-funcobj-i) +omap af <Plug>(coc-funcobj-a) + +" Use <TAB> for select selections ranges, needs server support, like: coc-tsserver, coc-python +nmap <silent> <TAB> <Plug>(coc-range-select) +xmap <silent> <TAB> <Plug>(coc-range-select) + +" Use `:Format` to format current buffer +command! -nargs=0 Format :call CocAction('format') + +" Use `:Fold` to fold current buffer +command! -nargs=? Fold :call CocAction('fold', <f-args>) + +" use `:OR` for organize import of current buffer +command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') + +" Add status line support, for integration with other plugin, checkout `:h coc-status` +set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} + +" Using CocList +" Show all diagnostics +nnoremap <silent> <space>a :<C-u>CocList diagnostics<cr> +" Manage extensions +nnoremap <silent> <space>e :<C-u>CocList extensions<cr> +" Show commands +nnoremap <silent> <space>c :<C-u>CocList commands<cr> +" Find symbol of current document +nnoremap <silent> <space>o :<C-u>CocList outline<cr> +" Search workspace symbols +nnoremap <silent> <space>s :<C-u>CocList -I symbols<cr> +" Do default action for next item. +nnoremap <silent> <space>j :<C-u>CocNext<CR> +" Do default action for previous item. +nnoremap <silent> <space>k :<C-u>CocPrev<CR> +" Resume latest coc list +nnoremap <silent> <space>p :<C-u>CocListResume<CR> diff --git a/nvim/.config/nvim/fzf.vim b/nvim/.config/nvim/fzf.vim new file mode 100644 index 0000000..cef3936 --- /dev/null +++ b/nvim/.config/nvim/fzf.vim @@ -0,0 +1,5 @@ +map <leader>b :Buffers<cr> + +nnoremap <silent> <Leader>gr :Rg<CR> +nnoremap <silent> <Leader>gg :GFiles<CR> +nnoremap <silent> <Leader>gf :Files<CR> diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim new file mode 100644 index 0000000..91e3378 --- /dev/null +++ b/nvim/.config/nvim/init.vim @@ -0,0 +1,6 @@ +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath = &runtimepath +source ~/.vimrc +source ~/.config/nvim/coc.vim +source ~/.config/nvim/fzf.vim +source ~/.config/nvim/plugins.vim diff --git a/nvim/.config/nvim/plugins.vim b/nvim/.config/nvim/plugins.vim new file mode 100644 index 0000000..b485d9b --- /dev/null +++ b/nvim/.config/nvim/plugins.vim @@ -0,0 +1,23 @@ +call plug#begin() +Plug 'airblade/vim-rooter' +Plug 'bogado/file-line' +Plug 'editorconfig/editorconfig-vim' +Plug 'google/vim-searchindex' +Plug 'igankevich/mesonic' +Plug 'jackguo380/vim-lsp-cxx-highlight' +Plug 'jamessan/vim-gnupg' +Plug 'javier-lopez/sprunge.vim' +Plug 'junegunn/fzf.vim' +Plug 'neoclide/coc.nvim', {'branch': 'release'} +Plug 'preservim/nerdcommenter' +Plug 'preservim/nerdtree' +Plug 'saltstack/salt-vim' +Plug 'sheerun/vim-polyglot' +Plug 'tmsvg/pear-tree' +Plug 'tpope/vim-eunuch' +Plug 'tpope/vim-fugitive' +Plug 'tpope/vim-surround' +Plug 'vim-scripts/AnsiEsc.vim' +Plug 'vim-scripts/git_patch_tags.vim' +Plug 'Yggdroot/indentLine' +call plug#end() diff --git a/nvim/.vimrc b/nvim/.vimrc new file mode 100644 index 0000000..3aa7046 --- /dev/null +++ b/nvim/.vimrc @@ -0,0 +1,13 @@ +autocmd BufNewFile,BufRead *.frag,*.vert,*.fp,*.vp,*.glsl,*.shader_test set syntax=glsl + +autocmd BufNewFile,BufRead /home/mattst88/projects/mesa/* set expandtab tabstop=8 softtabstop=3 shiftwidth=3 +autocmd BufNewFile,BufRead /home/mattst88/projects/piglit/* set noexpandtab tabstop=8 softtabstop=8 shiftwidth=8 +autocmd BufNewFile,BufRead Makefile* set noexpandtab tabstop=8 softtabstop=8 shiftwidth=8 +autocmd BufNewFile,BufRead *.mk set noexpandtab tabstop=8 softtabstop=8 shiftwidth=8 + +autocmd BufNewFile,BufRead *.py set tabstop=4 softtabstop=4 shiftwidth=4 textwidth=80 smarttab expandtab + +set bg=dark +set modeline +set number relativenumber +set colorcolumn=+0 |