From 611860b2276fd9f0edde6436a2b02e8e0882f053 Mon Sep 17 00:00:00 2001 From: Jeff LANCE Date: Wed, 3 Mar 2021 17:40:10 +0100 Subject: [PATCH] update coc install --- conf.d/nvim/functions.vim | 32 +--------------- conf.d/nvim/init.vim | 11 ++++-- conf.d/nvim/keybindings.vim | 73 ++----------------------------------- conf.d/nvim/startscreen.vim | 20 +++++----- 4 files changed, 23 insertions(+), 113 deletions(-) diff --git a/conf.d/nvim/functions.vim b/conf.d/nvim/functions.vim index 20d26cf..5110516 100644 --- a/conf.d/nvim/functions.vim +++ b/conf.d/nvim/functions.vim @@ -1,7 +1,7 @@ " File : functions.vim " Author : Jeff LANCE " Date : 15.04.2015 -" Last Modified Date: 24.06.2020 +" Last Modified Date: 03.03.2021 " Last Modified By : Jeff LANCE """"""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -83,34 +83,4 @@ function! BufClose() endfunction -" COC functions {{{ -" ----- - -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - elseif (coc#rpc#ready()) - call CocActionAsync('doHover') - else - execute '!' . &keywordprg . " " . expand('') - endif -endfunction - -"function! s:show_documentation() -" if (index(['vim','help'], &filetype) >= 0) -" execute 'h '.expand('') -" else -" call CocAction('doHover') -" endif -"endfunction - -" ----- -" }}} - - " vim:ft=vim diff --git a/conf.d/nvim/init.vim b/conf.d/nvim/init.vim index d9e8b12..863a748 100644 --- a/conf.d/nvim/init.vim +++ b/conf.d/nvim/init.vim @@ -476,6 +476,9 @@ let g:deoplete#enable_at_startup = 0 let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] au FileType gitcommit let b:EditorConfig_disable = 1 +au FileType cls let b:EditorConfig_disable = 1 +au FileType sty let b:EditorConfig_disable = 1 +au FileType tex let b:EditorConfig_disable = 1 " ----- " }}} @@ -598,9 +601,10 @@ let g:tmux_navigator_save_on_switch = 2 " Vimroom {{{ " ----- -let g:goyo_width=200 -let g:goyo_margin_top = 2 -let g:goyo_margin_bottom = 2 +let g:goyo_height = '100%' +let g:goyo_width = '90%' +let g:goyo_margin_top = 0 +let g:goyo_margin_bottom = 0 " ----- " }}} @@ -643,6 +647,7 @@ source ${HOME}/.config/nvim/startscreen.vim " Load functions from file source ${HOME}/.config/nvim/functions.vim +source ${HOME}/.config/nvim/coc.vim diff --git a/conf.d/nvim/keybindings.vim b/conf.d/nvim/keybindings.vim index f1f9f49..12b46fa 100644 --- a/conf.d/nvim/keybindings.vim +++ b/conf.d/nvim/keybindings.vim @@ -1,16 +1,16 @@ " File : keybindings.vim " Author : Jeff LANCE " Date : 15.04.2015 -" Last Modified Date: 24.06.2020 +" Last Modified Date: 03.03.2021 " Last Modified By : Jeff LANCE """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " _ _________ ______ ___ _ _ ____ ___ _ _ ____ ____ " | |/ / ____\ \ / / __ )_ _| \ | | _ \_ _| \ | |/ ___/ ___| " | ' /| _| \ V /| _ \| || \| | | | | || \| | | _\___ \ -" | . \| |___ | | | |_) | || |\ | |_| | || |\ | |_| |___) | +" | . \| |___ | | | |_) | || |\ | |_| | || |\ | |_| |___) | " |_|\_\_____| |_| |____/___|_| \_|____/___|_| \_|\____|____/ -" +" """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Custom {{{ @@ -62,7 +62,7 @@ command! -bang -nargs=? -complete=dir Files \ 0 \ ) map :echom 'Close buffer' :call BufClose() -map :e +map :e map :Startify map :bn map :bp @@ -95,59 +95,6 @@ map :call WinMove('l') " }}} -" COC {{{ -" ----- - -" Use tab for trigger completion with characters ahead and navigate. -" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by -" other plugin before putting this into your config. -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() -inoremap pumvisible() ? "\" : "\" - -" Use to confirm completion, `u` means break undo chain at current -" position. Coc only does snippet and additional edit on confirm. -" could be remapped by other vim plugin, try `:verbose imap `. -if exists('*complete_info') - inoremap complete_info()["selected"] != "-1" ? "\" : "\u\" -else - inoremap pumvisible() ? "\" : "\u\" -endif - -" Use to trigger completion. -if has('nvim') - inoremap coc#refresh() -else - inoremap coc#refresh() -endif - -" Use `[g` and `]g` to navigate diagnostics -" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. -nmap [g (coc-diagnostic-prev) -nmap ]g (coc-diagnostic-next) - -" GoTo code navigation. -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() - -" Symbol renaming. -nmap rn (coc-rename) - -" Formatting selected code. -xmap f (coc-format-selected) -nmap f (coc-format-selected) - -" ----- -" }}} - - " Defx {{{ " ----- @@ -263,18 +210,6 @@ map Pui :PlugInstall " }}} -"" REPL {{{ -"" ----- -" -"nnoremap rp :REPLToggle -"autocmd Filetype python nnoremap :REPLDebugStopAtCurrentLine -"autocmd Filetype python nnoremap :REPLPDBN -"autocmd Filetype python nnoremap :REPLPDBS -" -"" ----- -"" }}} - - " Vimroom {{{ " ----- diff --git a/conf.d/nvim/startscreen.vim b/conf.d/nvim/startscreen.vim index 122d38f..aa3abb3 100644 --- a/conf.d/nvim/startscreen.vim +++ b/conf.d/nvim/startscreen.vim @@ -1,17 +1,17 @@ " File : startscreen.vim " Author : Jeff LANCE " Date : 01.11.2020 -" Last Modified Date: 27.01.2021 +" Last Modified Date: 03.03.2021 " Last Modified By : Jeff LANCE """"""""""""""""""""""""""""""""""""""""""""""""" " " ____ _____ _ ____ _____ ___ _______ __ " / ___|_ _|/ \ | _ \_ _|_ _| ___\ \ / / -" \___ \ | | / _ \ | |_) || | | || |_ \ V / -" ___) || |/ ___ \| _ < | | | || _| | | -" |____/ |_/_/ \_\_| \_\|_| |___|_| |_| -" +" \___ \ | | / _ \ | |_) || | | || |_ \ V / +" ___) || |/ ___ \| _ < | | | || _| | | +" |____/ |_/_/ \_\_| \_\|_| |___|_| |_| +" " """""""""""""""""""""""""""""""""""""""""""""""" @@ -63,11 +63,11 @@ let g:startify_lists = [ \ ] let g:startify_bookmarks = [ - \ '${HOME}/.config/', - \ '${HOME}/dotfiles/', - \ '${HOME}/Projets', - \ '${HOME}/Projets/latex/latex-homework', - \ '${HOME}/.asy' + \ '~/.config/', + \ '~/dotfiles/', + \ '~/Projets/', + \ '~/Projets/latex/latex-homework/', + \ '~/.asy/' \ ] let g:startify_commands = [