fixed all problems that occured during the upgrade to nvim 0.5+

This commit is contained in:
paul-loedige
2022-01-05 22:33:39 +01:00
parent 9e83b12906
commit 176434952f
3 changed files with 42 additions and 66 deletions
+4 -2
View File
@@ -1,8 +1,10 @@
{ {
"git.removedSign.text": "✗",
"git.addedSign.hlGroup": "GitGutterAdd", "git.addedSign.hlGroup": "GitGutterAdd",
"git.changedSign.hlGroup": "GitGutterChange", "git.changedSign.hlGroup": "GitGutterChange",
"git.removedSign.hlGroup": "GitGutterDelete", "git.removedSign.hlGroup": "GitGutterDelete",
"git.topRemovedSign.hlGroup": "GitGutterDelete", "git.topRemovedSign.hlGroup": "GitGutterDelete",
"git.changeRemovedSign.hlGroup": "GitGutterChangeDelete" "git.changeRemovedSign.hlGroup": "GitGutterChangeDelete",
"snippets.extends":{
"latex":["tex","texmath"]
}
} }
-9
View File
@@ -15,15 +15,6 @@ set updatetime=300
" Don't pass messages to |ins-completion-menu|. " Don't pass messages to |ins-completion-menu|.
set shortmess+=c set shortmess+=c
" Always show the signcolumn, otherwise it would shift the text each time
" diagnostics appear/become resolved.
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
" Use tab for trigger completion with characters ahead and navigate. " Use tab for trigger completion with characters ahead and navigate.
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by " NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
" other plugin before putting this into your config. " other plugin before putting this into your config.
+38 -55
View File
@@ -2,15 +2,14 @@ let $MYPLUGDIRECTORY = "~/.config/nvim/plugged/"
let $MYNVIMINIT = "~/.config/nvim/init.vim" let $MYNVIMINIT = "~/.config/nvim/init.vim"
let $MYCOCVIM = "~/.config/nvim/coc.vim" let $MYCOCVIM = "~/.config/nvim/coc.vim"
"-------------------- " Plugins {{{ "
"plugins " automatic vim-plug install {{{ "
"--------------------
" autoinstall vim-plug if it is not installed
if empty(glob('~/.local/share/nvim/site/autoload/plug.vim')) if empty(glob('~/.local/share/nvim/site/autoload/plug.vim'))
silent !curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs silent !curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall | source $MYNVIMINIT autocmd VimEnter * PlugInstall | source $MYNVIMINIT
endif endif
" }}} automatic vim-plug install "
call plug#begin($MYPLUGDIRECTORY) call plug#begin($MYPLUGDIRECTORY)
" automatically install all plugins that are not already installed " automatically install all plugins that are not already installed
@@ -38,10 +37,9 @@ Plug 'Yggdroot/indentLine' " ident guides
Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']} Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']}
Plug 'elkowar/yuck.vim', {'for': 'yuck'} " for yuck (eww) configuration Plug 'elkowar/yuck.vim', {'for': 'yuck'} " for yuck (eww) configuration
call plug#end() call plug#end()
" }}} Plugins "
"-------------------- " General Settings {{{ "
" general settings
"--------------------
let mapleader=" " " set mapleader to space let mapleader=" " " set mapleader to space
let maplocalleader=" " " set localleader to space let maplocalleader=" " " set localleader to space
set timeoutlen=1000 " set timeout length set timeoutlen=1000 " set timeout length
@@ -60,19 +58,29 @@ set wildmode=longest,list " get bash-like tab completions
filetype plugin indent on " allows auto-indenting depending on file type filetype plugin indent on " allows auto-indenting depending on file type
syntax on " syntax highlighting syntax on " syntax highlighting
set cc=80 " set an 80 column border for good coding style set cc=80 " set an 80 column border for good coding style
" folding
set foldmethod=marker
set foldtext=gitgutter#fold#foldtext()
"toggle cc when reasonable "toggle cc when reasonable
augroup cctoggle augroup cctoggle
autocmd! autocmd!
autocmd BufEnter,FocusGained * set cc=80 autocmd BufEnter,FocusGained * set cc=80
autocmd BufLeave,FocusLost * set cc=0 autocmd BufLeave,FocusLost * set cc=0
augroup END augroup END
"toggle relativenumber when reasonable
set number relativenumber
augroup numbertoggle
autocmd!
autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
augroup END
" sign column
set signcolumn=yes
" }}} General Settings "
"-------------------- " Mappings {{{ "
"mappings
"--------------------
"disable colorizer mappings "disable colorizer mappings
let g:colorizer_nomap = 1 let g:colorizer_nomap = 1
" enable copy and past to and fro clipboard " enable copy and past to and fro clipboard
vnoremap <leader>y "+y vnoremap <leader>y "+y
nnoremap <leader>Y "+yg_ nnoremap <leader>Y "+yg_
@@ -106,43 +114,28 @@ nnoremap <leader>nt :NERDTreeToggle<CR>
nnoremap <leader>f :NERDTreeFind<CR> nnoremap <leader>f :NERDTreeFind<CR>
"symbol renaming "symbol renaming
nnoremap <leader>rn <Plug>(coc-reame) nnoremap <leader>rn <Plug>(coc-reame)
" }}} Mappings "
"-------------------- " CoC (Conquer of Completion) {{{ "
" coc (Conquer of Completion)
"--------------------
" coc plugins (will automatically install) " coc plugins (will automatically install)
let g:coc_global_extensions = ['coc-snippets', 'coc-git', 'coc-vimtex', 'coc-python', 'coc-vimlsp', 'coc-json'] let g:coc_global_extensions = [
\'coc-texlab',
\'coc-snippets',
\'coc-git',
\'coc-vimtex',
\'coc-python',
\'coc-vimlsp',
\'coc-json']
source $MYCOCVIM source $MYCOCVIM
"" use <tab> for trigger completion and navigate to the next complete item " }}} CoC (Conquer of Completion) "
"function! s:check_back_space() abort
"let col = col('.')- 1
"return !col || getline('.')[col - 1] =~ '\s'
"endfunction
"" Make <tab> used for trigger completion, completion confirm, snippet expand and jump like VSCode. " Airline {{{ "
"inoremap <silent><expr> <TAB>
"\ pumvisible() ? coc#_select_confirm() :
"\ coc#expandableOrJumpable() ? "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
"\ <SID>check_back_space() ? "\<TAB>" :
"\ coc#refresh()
"function! s:check_back_space() abort
"let col = col('.') - 1
"return !col || getline('.')[col - 1] =~# '\s'
"endfunction
"let g:coc_snippet_next = '<tab>'
"--------------------
" airline
"--------------------
set laststatus=2 " start in 'normal' mode set laststatus=2 " start in 'normal' mode
let g:airline#extensions#tabline#enabled = 1 " enable tabline for buffers let g:airline#extensions#tabline#enabled = 1 " enable tabline for buffers
let g:airline#extensions#tabline#formatter = 'unique_tail' " set tabline item style let g:airline#extensions#tabline#formatter = 'unique_tail' " set tabline item style
" }}} Airline "
"-------------------- " NERDTree {{{ "
"NERDTree
"--------------------
set modifiable set modifiable
let NERDTreeShowHidden=1 " show hidden files in NERDTree let NERDTreeShowHidden=1 " show hidden files in NERDTree
let NERDTreeAutoDeleteBuffer=1 " automatically delete the buffer of the file deleted with NERDTree let NERDTreeAutoDeleteBuffer=1 " automatically delete the buffer of the file deleted with NERDTree
@@ -158,11 +151,9 @@ autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTr
" If another buffer tries to replace NERDTree, put it in the other window, and bring back NERDTree. " If another buffer tries to replace NERDTree, put it in the other window, and bring back NERDTree.
autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 | autocmd BufEnter * if bufname('#') =~ 'NERD_tree_\d\+' && bufname('%') !~ 'NERD_tree_\d\+' && winnr('$') > 1 |
\ let buf=bufnr() | buffer# | execute "normal! \<C-W>w" | execute 'buffer'.buf | endif \ let buf=bufnr() | buffer# | execute "normal! \<C-W>w" | execute 'buffer'.buf | endif
" }}} NERDTree "
" Color Scheme {{{ "
"--------------------
"colors
"--------------------
" set colorscheme " set colorscheme
let g:gruvbox_contrast_dark='hard' let g:gruvbox_contrast_dark='hard'
colorscheme gruvbox colorscheme gruvbox
@@ -175,18 +166,10 @@ highlight GitGutterChange ctermfg=208
highlight GitGutterDelete ctermfg=124 highlight GitGutterDelete ctermfg=124
highlight LineNr ctermfg=7 highlight LineNr ctermfg=7
highlight CursorLineNr ctermfg=7 highlight CursorLineNr ctermfg=7
" }}} Color Scheme "
"toggle relativenumber when reasonable
set number relativenumber
augroup numbertoggle
autocmd!
autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
augroup END
"-------------------- " VimTeX {{{ "
"vimtex
"--------------------
let g:vimtex_compiler_progname = 'nvr' " neovim-remote for vimtex let g:vimtex_compiler_progname = 'nvr' " neovim-remote for vimtex
let g:vimtex_view_method = 'zathura' " set zathura as basic pdf viewer let g:vimtex_view_method = 'zathura' " set zathura as basic pdf viewer
"open TOC "open TOC
@@ -202,4 +185,4 @@ let g:vimtex_compiler_latexmk = {
\ '-interaction=nonstopmode', \ '-interaction=nonstopmode',
\ ], \ ],
\} \}
" }}} VimTeX "