From 01204fff758637398ce3a9d2b6ca20038016e45b Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 6 Mar 2023 11:12:20 -0500 Subject: Rearrange for better usage with GNU stow --- nvim/.config/nvim/coc-settings.json | 89 +++++++++++++++++++++++++ nvim/.config/nvim/coc.vim | 128 ++++++++++++++++++++++++++++++++++++ nvim/.config/nvim/fzf.vim | 5 ++ nvim/.config/nvim/init.vim | 6 ++ nvim/.config/nvim/plugins.vim | 23 +++++++ nvim/.vimrc | 13 ++++ 6 files changed, 264 insertions(+) create mode 100644 nvim/.config/nvim/coc-settings.json create mode 100644 nvim/.config/nvim/coc.vim create mode 100644 nvim/.config/nvim/fzf.vim create mode 100644 nvim/.config/nvim/init.vim create mode 100644 nvim/.config/nvim/plugins.vim create mode 100644 nvim/.vimrc (limited to 'nvim') 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 ' to make sure tab is not mapped by other plugin. +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use to trigger completion. +inoremap coc#refresh() + +" Use to confirm completion, `u` means break undo chain at current position. +" Coc only does snippet and additional edit on confirm. +inoremap pumvisible() ? "\" : "\u\" +" Or use `complete_info` if your vim support it, like: +" inoremap complete_info()["selected"] != "-1" ? "\" : "\u\" + +" Use `[g` and `]g` to navigate diagnostics +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) + +" Remap keys for gotos +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +" Use K to show documentation in preview window +nnoremap K :call show_documentation() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + else + call CocAction('doHover') + endif +endfunction + +" Highlight symbol under cursor on CursorHold +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Remap for rename current word +nmap rn (coc-rename) + +" Remap for format selected region +xmap f (coc-format-selected) +nmap f (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: `aap` for current paragraph +xmap a (coc-codeaction-selected) +nmap a (coc-codeaction-selected) + +" Remap for do codeAction of current line +nmap ac (coc-codeaction) +" Fix autofix problem of current line +nmap qf (coc-fix-current) + +" Create mappings for function text object, requires document symbols feature of languageserver. +xmap if (coc-funcobj-i) +xmap af (coc-funcobj-a) +omap if (coc-funcobj-i) +omap af (coc-funcobj-a) + +" Use for select selections ranges, needs server support, like: coc-tsserver, coc-python +nmap (coc-range-select) +xmap (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', ) + +" 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 a :CocList diagnostics +" Manage extensions +nnoremap e :CocList extensions +" Show commands +nnoremap c :CocList commands +" Find symbol of current document +nnoremap o :CocList outline +" Search workspace symbols +nnoremap s :CocList -I symbols +" Do default action for next item. +nnoremap j :CocNext +" Do default action for previous item. +nnoremap k :CocPrev +" Resume latest coc list +nnoremap p :CocListResume 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 b :Buffers + +nnoremap gr :Rg +nnoremap gg :GFiles +nnoremap gf :Files 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 -- cgit v1.2.3