diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | coc-settings.json | 14 | ||||
| -rw-r--r-- | general/paths.vim | 2 | ||||
| -rw-r--r-- | general/settings.vim | 2 | ||||
| -rw-r--r-- | init.vim | 4 | ||||
| -rw-r--r-- | plug-config/coc.vim | 139 | ||||
| -rw-r--r-- | themes/airline.vim | 20 | ||||
| -rw-r--r-- | themes/lightline.vim | 2 | ||||
| -rw-r--r-- | themes/material.vim | 7 | ||||
| -rw-r--r-- | themes/onedark.vim | 2 | ||||
| -rw-r--r-- | themes/syntax.vim | 8 | ||||
| -rw-r--r-- | vim-plug/plugins.vim | 67 |
12 files changed, 209 insertions, 60 deletions
@@ -1,4 +1,4 @@ -# Chris's Neovim Config +# Nvim Mach 2 ## Install Neovim diff --git a/coc-settings.json b/coc-settings.json new file mode 100644 index 00000000..f7b2799c --- /dev/null +++ b/coc-settings.json @@ -0,0 +1,14 @@ +{ + "coc.preferences.formatOnSaveFiletypes": ["css", "markdown", "javascript", "graphql", "html", "yaml", "json", "python"], + + // python config + "python.linting.enabled": true, + "python.linting.pylintEnabled": true, + + "snippets.ultisnips.directories": + [ + "UltiSnips", + "~/.config/nvim/utils/snips" + ] + +} diff --git a/general/paths.vim b/general/paths.vim new file mode 100644 index 00000000..d786bf66 --- /dev/null +++ b/general/paths.vim @@ -0,0 +1,2 @@ +let g:python3_host_prog = expand("~/.miniconda/envs/neovim/bin/python3.8") + diff --git a/general/settings.vim b/general/settings.vim index 90d464ef..3ca089d6 100644 --- a/general/settings.vim +++ b/general/settings.vim @@ -29,6 +29,8 @@ set showtabline=2 " Always show tabs set noshowmode " We don't need to see things like -- INSERT -- anymore set nobackup " This is recommended by coc set nowritebackup " This is recommended by coc +set shortmess+=c " Don't pass messages to |ins-completion-menu|. +set signcolumn=yes " Always show the signcolumn, otherwise it would shift the text each time set updatetime=300 " Faster completion set timeoutlen=100 " By default timeoutlen is 1000 ms set formatoptions-=cro " Stop newline continution of comments @@ -1,4 +1,8 @@ source $HOME/.config/nvim/vim-plug/plugins.vim source $HOME/.config/nvim/general/settings.vim +source $HOME/.config/nvim/general/paths.vim source $HOME/.config/nvim/keys/mappings.vim +source $HOME/.config/nvim/themes/syntax.vim source $HOME/.config/nvim/themes/onedark.vim +source $HOME/.config/nvim/themes/airline.vim +source $HOME/.config/nvim/plug-config/coc.vim diff --git a/plug-config/coc.vim b/plug-config/coc.vim new file mode 100644 index 00000000..d9818de4 --- /dev/null +++ b/plug-config/coc.vim @@ -0,0 +1,139 @@ +" TextEdit might fail if hidden is not set. +set hidden + +" Some servers have issues with backup files, see #649. +set nobackup +set nowritebackup + +" Give more space for displaying messages. +set cmdheight=2 + +" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable +" delays and poor user experience. +set updatetime=300 + +" Don't pass messages to |ins-completion-menu|. +set shortmess+=c + +" Always show the signcolumn, otherwise it would shift the text each time +" diagnostics appear/become resolved. +set signcolumn=yes + +" Use tab for trigger completion with characters ahead and navigate. +" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by +" other plugin before putting this into your config. +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. +if exists('*complete_info') + inoremap <expr> <cr> complete_info()["selected"] != "-1" ? "\<C-y>" : "\<C-g>u\<CR>" +else + imap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>" +endif + +" Use `[g` and `]g` to navigate diagnostics +nmap <silent> [g <Plug>(coc-diagnostic-prev) +nmap <silent> ]g <Plug>(coc-diagnostic-next) + +" GoTo code navigation. +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 the symbol and its references when holding the cursor. +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Symbol renaming. +nmap <leader>rn <Plug>(coc-rename) + +" Formatting selected code. +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 + +" Applying codeAction to the selected region. +" Example: `<leader>aap` for current paragraph +xmap <leader>a <Plug>(coc-codeaction-selected) +nmap <leader>a <Plug>(coc-codeaction-selected) + +" Remap keys for applying codeAction to the current line. +nmap <leader>ac <Plug>(coc-codeaction) +" Apply AutoFix to problem on the current line. +nmap <leader>qf <Plug>(coc-fix-current) + +" Introduce function text object +" NOTE: Requires 'textDocument.documentSymbol' support from the language server. +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 selections ranges. +" NOTE: Requires 'textDocument/selectionRange' support from the language server. +" coc-tsserver, coc-python are the examples of servers that support it. +" nmap <silent> <TAB> <Plug>(coc-range-select) +" xmap <silent> <TAB> <Plug>(coc-range-select) + +" Add `:Format` command to format current buffer. +command! -nargs=0 Format :call CocAction('format') + +" Add `:Fold` command to fold current buffer. +command! -nargs=? Fold :call CocAction('fold', <f-args>) + +" Add `:OR` command for organize imports of the current buffer. +command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') + +" Add (Neo)Vim's native statusline support. +" NOTE: Please see `:h coc-status` for integrations with external plugins that +" provide custom statusline: lightline.vim, vim-airline. +set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} + +" Mappings 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/themes/airline.vim b/themes/airline.vim new file mode 100644 index 00000000..c46d5bce --- /dev/null +++ b/themes/airline.vim @@ -0,0 +1,20 @@ +" enable tabline +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#left_sep = '' +let g:airline#extensions#tabline#left_alt_sep = '' +let g:airline#extensions#tabline#right_sep = '' +let g:airline#extensions#tabline#right_alt_sep = '' + +" enable powerline fonts +let g:airline_powerline_fonts = 1 +let g:airline_left_sep = '' +let g:airline_right_sep = '' + +" Switch to your current theme +let g:airline_theme = 'onedark' + +" Always show tabs +set showtabline=2 + +" We don't need to see things like -- INSERT -- anymore +set noshowmode diff --git a/themes/lightline.vim b/themes/lightline.vim new file mode 100644 index 00000000..6d371a7a --- /dev/null +++ b/themes/lightline.vim @@ -0,0 +1,2 @@ +let g:lightline = { 'colorscheme': 'material_vim' } + diff --git a/themes/material.vim b/themes/material.vim new file mode 100644 index 00000000..1f039487 --- /dev/null +++ b/themes/material.vim @@ -0,0 +1,7 @@ +if (has('termguicolors')) + set termguicolors +endif + +let g:material_terminal_italics = 1 +let g:material_theme_style = 'darker' +colorscheme material diff --git a/themes/onedark.vim b/themes/onedark.vim index 99ad7bb5..c1d8af56 100644 --- a/themes/onedark.vim +++ b/themes/onedark.vim @@ -7,6 +7,8 @@ if (has("autocmd") && !has("gui_running")) augroup END endif +"autocmd ColorScheme * call onedark#set_highlight("Normal", { "fg": s:white }) " `bg` will not be styled since there is no `bg` setting + hi Comment cterm=italic let g:onedark_hide_endofbuffer=1 let g:onedark_terminal_italics=1 diff --git a/themes/syntax.vim b/themes/syntax.vim new file mode 100644 index 00000000..131266c6 --- /dev/null +++ b/themes/syntax.vim @@ -0,0 +1,8 @@ +" Syntax highlighting +let g:python_highlight_all=1 + +" Change this when you know where i3 will be +aug i3config_ft_detection + au! + au BufNewFile,BufRead ~/.config/i3/config set filetype=i3config +aug end diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index baaab75c..0ec61f48 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -3,7 +3,7 @@ if empty(glob('~/.config/nvim/autoload/plug.vim')) silent !curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim "autocmd VimEnter * PlugInstall - "autocmd VimEnter * PlugInstall | source $MYVIMRC + autocmd VimEnter * PlugInstall | source $MYVIMRC endif call plug#begin('~/.config/nvim/autoload/plugged') @@ -15,43 +15,13 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Auto pairs for '(' '[' '{' Plug 'jiangmiao/auto-pairs' " Themes - Plug 'joshdick/onedark.vim' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Plug 'christianchiarulli/onedark.vim' + Plug 'kaicataldo/material.vim' + " Intellisense + Plug 'neoclide/coc.nvim', {'branch': 'release'} + " Status Line + Plug 'vim-airline/vim-airline' + Plug 'vim-airline/vim-airline-themes' call plug#end() @@ -61,24 +31,3 @@ autocmd VimEnter * \ if len(filter(values(g:plugs), '!isdirectory(v:val.dir)')) \| PlugInstall --sync | q \| endif - -" Press gx to open the GitHub URL for a plugin or a commit with the default browser. -function! s:plug_gx() - let line = getline('.') - let sha = matchstr(line, '^ \X*\zs\x\{7,9}\ze ') - let name = empty(sha) ? matchstr(line, '^[-x+] \zs[^:]\+\ze:') - \ : getline(search('^- .*:$', 'bn'))[2:-2] - let uri = get(get(g:plugs, name, {}), 'uri', '') - if uri !~ 'github.com' - return - endif - let repo = matchstr(uri, '[^:/]*/'.name) - let url = empty(sha) ? 'https://github.com/'.repo - \ : printf('https://github.com/%s/commit/%s', repo, sha) - call netrw#BrowseX(url, 0) -endfunction - -augroup PlugGx - autocmd! - autocmd FileType vim-plug nnoremap <buffer> <silent> gx :call <sid>plug_gx()<cr> -augroup END |