From db45af4429d7109586a8f171af5e346b2351b921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Fri, 1 Jul 2022 15:02:57 +0200 Subject: [PATCH] More coc plugins --- .vim/coc-settings.json | 4 +++- .vimrc | 49 +++++++++++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json index 1bcc330..a1be5af 100644 --- a/.vim/coc-settings.json +++ b/.vim/coc-settings.json @@ -1,3 +1,5 @@ { - "python.linting.enabled": false + "python.linting.enabled": false, + "ltex.enabled": ["latex", "markdown"], + "ltex.language":"en-GB" } diff --git a/.vimrc b/.vimrc index 2cb5d50..00d35bb 100644 --- a/.vimrc +++ b/.vimrc @@ -21,7 +21,7 @@ Plug 'editorconfig/editorconfig-vim' Plug 'gmarik/Vundle.vim' Plug 'hdima/python-syntax' Plug 'jeetsukumaran/vim-buffergator' -Plug 'kien/ctrlp.vim' +" Plug 'kien/ctrlp.vim' Plug 'kristijanhusak/vim-hybrid-material' Plug 'lambdalisue/fern.vim' Plug 'lervag/vimtex' @@ -47,6 +47,7 @@ let g:ycm_global_ycm_extra_conf = '~/.vim/.ycm_extra_conf.py' let mapleader="," + :command W w :command Q q :command WQ wq @@ -83,10 +84,10 @@ set splitbelow set splitright " CtrlP -let g:ctrlp_match_func = {'match': 'cpsm#CtrlPMatch'} -nnoremap :CtrlPBuffer -let g:cpsm_unicode=1 -let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] +" let g:ctrlp_match_func = {'match': 'cpsm#CtrlPMatch'} +" nnoremap :CtrlPBuffer +" let g:cpsm_unicode=1 +" let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] " Unsaved buffer switching set hidden @@ -128,11 +129,6 @@ if has("autocmd") autocmd FileType make set tabstop=8 shiftwidth=8 softtabstop=0 noexpandtab endif -" Quickfix -nnoremap f :YcmCompleter FixIt:cexpr []:cclose -nnoremap g :YcmCompleter GoTo - - " Terminal colors set t_Co=256 set background=dark @@ -197,8 +193,23 @@ set modelines=0 set nomodeline " Coc extensions +set updatetime=300 +set shortmess+=c +if has("nvim-0.5.0") || has("patch-8.1.1564") + " Recently vim can merge signcolumn and number column into one + set signcolumn=number +else + set signcolumn=yes +endif let g:coc_global_extensions = [] command! -nargs=1 Ext :call add(g:coc_global_extensions, ) +let g:coc_filetype_map = {'tex': 'latex', 'md': 'markdown'} +nmap p (coc-diagnostic-prev) +nmap n (coc-diagnostic-next) +nnoremap f :CocAction +vnoremap f :CocAction +nnoremap p :CocList yank +vnoremap p :CocList yank Ext 'coc-snippets' Ext 'coc-emoji' @@ -209,6 +220,24 @@ Ext 'coc-vimtex' Ext 'coc-json' Ext 'coc-java' Ext 'coc-pyright' +Ext 'coc-css' +Ext 'coc-html' +Ext 'coc-cmake' +Ext 'coc-clangd' +Ext 'coc-docker' +Ext 'coc-fzf-preview' +Ext 'coc-ltex' +Ext 'coc-vetur' +Ext 'coc-yank' +" Ext 'coc-sh' + +" FZF Preview +nnoremap / :CocCommand fzf-preview.Lines --add-fzf-arg=--no-sort --add-fzf-arg=--query="'" +nnoremap :CocCommand fzf-preview.FromResources project_mru git buffer +nnoremap :CocCommand fzf-preview.Buffers +nnoremap :CocCommand fzf-preview.ProjectGrepRecall +nnoremap d :CocCommand fzf-preview.CocCurrentDiagnostics +nnoremap d :CocCommand fzf-preview.CocCurrentDiagnostics delc Ext