diff options
| -rw-r--r-- | .config/nvim/init.vim | 18 | ||||
| -rw-r--r-- | .config/nvim/plug-config/coc.vim | 149 | ||||
| -rw-r--r-- | .config/nvim/plug.vim | 6 | ||||
| -rwxr-xr-x | .local/bin/vimdate | 3 |
4 files changed, 13 insertions, 163 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index b18998b..f31923c 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,10 +1,15 @@ " init.vim -" _ -" | | ___ ___ -" _ | |/ _ \ / _ \ -" | |_| | (_) | __/ -" \___/ \___/ \___| -" +" ======================== +" ===== =============== +" ====== ================ +" ====== ================ +" ====== ==== ==== == +" ====== === == = = +" ====== === = == = +" = === === = == ==== +" = === === = == = = +" == ===== ==== == +" ======================== set runtimepath^=/home/jozan/.config/nvim runtimepath+=/home/jozan/.config/nvim/after let &packpath = &runtimepath @@ -21,7 +26,6 @@ source /home/jozan/.config/nvim/sidebars.vim source /home/jozan/.config/nvim/langs.vim source /home/jozan/.config/nvim/plug-config/airline.vim source /home/jozan/.config/nvim/plug-config/asyncomplete.vim -" source /home/jozan/.config/nvim/plug-config/coc.vim source /home/jozan/.config/nvim/plug-config/floaterm.vim source /home/jozan/.config/nvim/plug-config/nerd-commenter.vim source /home/jozan/.config/nvim/plug-config/org.vim diff --git a/.config/nvim/plug-config/coc.vim b/.config/nvim/plug-config/coc.vim deleted file mode 100644 index 51da998..0000000 --- a/.config/nvim/plug-config/coc.vim +++ /dev/null @@ -1,149 +0,0 @@ -" 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=100 - -" 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. -if has("patch-8.1.1564") - " Recently vim can merge signcolumn and number column into one - set signcolumn=number -else - set signcolumn=yes -endif - -" 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. -if has('nvim') - inoremap <silent><expr> <c-space> coc#refresh() -else - inoremap <silent><expr> <c-@> coc#refresh() -endif - -" Make <CR> auto-select the first completion item and notify coc.nvim to -" format on enter, <cr> could be remapped by other vim plugin -inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm() - \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>" - -" Use `[g` and `]g` to navigate diagnostics -" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. -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 CocActionAsync('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 buffer. -nmap <leader>ac <Plug>(coc-codeaction) -" Apply AutoFix to problem on the current line. -nmap <leader>qf <Plug>(coc-fix-current) - -" Map function and class text objects -" NOTE: Requires 'textDocument.documentSymbol' support from the language server. -xmap if <Plug>(coc-funcobj-i) -omap if <Plug>(coc-funcobj-i) -xmap af <Plug>(coc-funcobj-a) -omap af <Plug>(coc-funcobj-a) -xmap ic <Plug>(coc-classobj-i) -omap ic <Plug>(coc-classobj-i) -xmap ac <Plug>(coc-classobj-a) -omap ac <Plug>(coc-classobj-a) - -" Use CTRL-S for selections ranges. -" Requires 'textDocument/selectionRange' support of language server. -nmap <silent> <C-s> <Plug>(coc-range-select) -xmap <silent> <C-s> <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 for CoCList -" Show all diagnostics. -"nnoremap <silent><nowait> <space>a :<C-u>CocList diagnostics<cr> -" Manage extensions. -"nnoremap <silent><nowait> <space>e :<C-u>CocList extensions<cr> -" Show commands. -"nnoremap <silent><nowait> <space>c :<C-u>CocList commands<cr> -" Find symbol of current document. -"nnoremap <silent><nowait> <space>o :<C-u>CocList outline<cr> -" Search workspace symbols. -"nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<cr> -" Do default action for next item. -"nnoremap <silent><nowait> <space>j :<C-u>CocNext<CR> -" Do default action for previous item. -"nnoremap <silent><nowait> <space>k :<C-u>CocPrev<CR> -" Resume latest coc list. -"nnoremap <silent><nowait> <space>p :<C-u>CocListResume<CR> diff --git a/.config/nvim/plug.vim b/.config/nvim/plug.vim index 6848ebf..bd725c9 100644 --- a/.config/nvim/plug.vim +++ b/.config/nvim/plug.vim @@ -2,13 +2,11 @@ call plug#begin(system('echo -n "$XDG_DATA_HOME/nvim/plugged"')) Plug 'ap/vim-css-color' Plug 'brglng/vim-sidebar-manager' Plug 'dag/vim-fish' -" Plug 'honza/vim-snippets' Plug 'jackguo380/vim-lsp-cxx-highlight' Plug 'jceb/vim-orgmode' Plug 'jiangmiao/auto-pairs' Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' -Plug 'lambdalisue/battery.vim' Plug 'liuchengxu/vim-which-key' Plug 'luochen1990/rainbow' Plug 'mbbill/undotree' @@ -16,7 +14,6 @@ Plug 'mg979/vim-visual-multi' Plug 'mhinz/vim-signify' Plug 'mhinz/vim-startify' Plug 'morhetz/gruvbox' -Plug 'paretje/nvim-man' Plug 'prabirshrestha/async.vim' Plug 'prabirshrestha/asyncomplete.vim' Plug 'keremc/asyncomplete-clang.vim' @@ -26,9 +23,6 @@ Plug 'preservim/nerdcommenter' Plug 'preservim/nerdtree' Plug 'ryanoasis/vim-devicons' Plug 'sainnhe/gruvbox-material' -Plug 'SirVer/ultisnips' -Plug 'thomasfaingnaert/vim-lsp-snippets' -Plug 'thomasfaingnaert/vim-lsp-ultisnips' Plug 'tpope/vim-dispatch' Plug 'tpope/vim-fugitive' Plug 'tpope/vim-speeddating' diff --git a/.local/bin/vimdate b/.local/bin/vimdate index 8691a12..921e0d2 100755 --- a/.local/bin/vimdate +++ b/.local/bin/vimdate @@ -1,6 +1,7 @@ #!/usr/local/bin/dash printf ' * ' -date "+%Y-%m-%d %H:%M" +date +# date "+%Y-%m-%d %H:%M" # vim: filetype=sh |