From 0125f4bd09f32304ddec656ab32c7e63e87d4f8a Mon Sep 17 00:00:00 2001 From: Jidbo Date: Fri, 4 Oct 2019 23:34:42 +0200 Subject: [PATCH 01/34] switch to gfiles; add shortcut for visual search --- .vimrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 056ec40..591285c 100644 --- a/.vimrc +++ b/.vimrc @@ -115,6 +115,9 @@ nnoremap t :tabnew nnoremap gT nnoremap gt +" search for visual selection +vnoremap // y/" + " Enable folding set foldmethod=indent set foldlevel=99 @@ -259,7 +262,7 @@ augroup END " fzf setup nmap :Buffers -nmap f :Files +nmap f :GFiles let g:fzf_buffers_jump = 1 " vim-ale setup From bbee68a4af43dcd912d5f8027cc77501487fb4b2 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Fri, 4 Oct 2019 23:35:10 +0200 Subject: [PATCH 02/34] add artisan zsh plugin --- .zshrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.zshrc b/.zshrc index 27e3e25..dc60727 100644 --- a/.zshrc +++ b/.zshrc @@ -9,6 +9,7 @@ plugins=( pip screen fzf + artisan ) source $ZSH/oh-my-zsh.sh From b33e2ef61d7378a28094d3c26c9b0f8023520a95 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Thu, 24 Oct 2019 11:55:49 +0200 Subject: [PATCH 03/34] add nvim config --- nvim/.gitignore | 1 + nvim/init.vim | 306 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 307 insertions(+) create mode 100644 nvim/.gitignore create mode 100644 nvim/init.vim diff --git a/nvim/.gitignore b/nvim/.gitignore new file mode 100644 index 0000000..ddf2379 --- /dev/null +++ b/nvim/.gitignore @@ -0,0 +1 @@ +bundle/ diff --git a/nvim/init.vim b/nvim/init.vim new file mode 100644 index 0000000..f00e6cb --- /dev/null +++ b/nvim/init.vim @@ -0,0 +1,306 @@ +set nocompatible " required +filetype off " required + +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +let s:editor_root=expand("~/.config/nvim") +call vundle#rc(s:editor_root . '/bundle') +call vundle#begin() + +" let Vundle manage Vundle, required +Plugin 'VundleVim/Vundle.vim' + +" add all your plugins here (note older versions of Vundle +" used Bundle instead of Plugin) + +" USEFUL +" comment plugin +Plugin 'tpope/vim-commentary' +" Color higlighting +Plugin 'norcalli/nvim-colorizer.lua' + +" brackets management +Plugin 'machakann/vim-sandwich' + +" snippets +Plugin 'SirVer/ultisnips' + +" WINDOW MANAGEMENT +" tmux navigator +Plugin 'christoomey/vim-tmux-navigator' + +" winresizer +Plugin 'simeji/winresizer' + +" FILE MANAGEMENT +" nert-tree +Plugin 'scrooloose/nerdtree' + +" fzf plugin +Plugin 'junegunn/fzf.vim' + +" GIT STUFF +" git +Plugin 'tpope/vim-fugitive' + +" vim gitgutter +Plugin 'airblade/vim-gitgutter' + +" COLORS +" color schemes +Plugin 'flazz/vim-colorschemes' + +" powerline +Plugin 'vim-airline/vim-airline' +Plugin 'vim-airline/vim-airline-themes' + +" LANGUAGE SUPPORT +" vim-coc +Plugin 'neoclide/coc.nvim', {'tag': '*', 'branch': 'release'} + +" nvim-remote +Plugin 'mhinz/neovim-remote' + +" editorconfig plugin +Plugin 'editorconfig/editorconfig-vim' + +" language packs +Plugin 'sheerun/vim-polyglot' + +" latex +Plugin 'lervag/vimtex' + +" All of your Plugins must be added before the following line +call vundle#end() " required +filetype plugin indent on " required + +" nvim setup +" syntax +set termguicolors +syntax on +colorscheme Benokai +let mapleader=" " + +" random settings +set number +set clipboard=unnamed +set mouse=nvi +set smarttab +set visualbell +set virtualedit=block +set scrolloff=1 +set wildmenu +set autoread +set lazyredraw +set history=250 + +" tabs and line wrap +set tabstop=4 +set wrapmargin=8 +set softtabstop=0 noexpandtab +set shiftwidth=4 +set backspace=2 +set backspace=indent,eol,start +set encoding=utf-8 +set autoindent + +" search +set incsearch +set hlsearch +set smartcase + +" search for visual selection +vnoremap // y/" + +" Disable Backup and Swap files +set noswapfile +set nobackup +set nowritebackup + +" setup split +set splitbelow +set splitright + +" tabs +nnoremap t :tabnew +nnoremap gT +nnoremap gt + +" Enable folding +set foldmethod=indent +set foldlevel=99 + +" remap code folding +nnoremap g za + +" auto reload .vimrc on write +autocmd BufWritePost init.vim source % + +" ex command +cnoremap +cnoremap + +" toggle hybrid number mode +nnoremap h :set rnu! +:augroup numbertoggle +: autocmd! +: autocmd BufEnter,FocusGained,InsertLeave * set relativenumber +: autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber +:augroup END + +" disable arrow keys +noremap +noremap +noremap +noremap + +" auto expand brackets +inoremap (; ()O +inoremap (, (),O +inoremap {; {}O +inoremap {, {},O +inoremap [; []O +inoremap [, [],O + +" Delete buffer while keeping window layout (don't close buffer's windows). +" Version 2008-11-18 from http://vim.wikia.com/wiki/VimTip165 +if v:version < 700 || exists('loaded_bclose') || &cp + finish +endif +let loaded_bclose = 1 +if !exists('bclose_multiple') + let bclose_multiple = 1 +endif + +" Display an error message. +function! s:Warn(msg) + echohl ErrorMsg + echomsg a:msg + echohl NONE +endfunction + +" Command ':Bclose' executes ':bd' to delete buffer in current window. +" The window will show the alternate buffer (Ctrl-^) if it exists, +" or the previous buffer (:bp), or a blank buffer if no previous. +" Command ':Bclose!' is the same, but executes ':bd!' (discard changes). +" An optional argument can specify which buffer to close (name or number). +function! s:Bclose(bang, buffer) + if empty(a:buffer) + let btarget = bufnr('%') + elseif a:buffer =~ '^\d\+$' + let btarget = bufnr(str2nr(a:buffer)) + else + let btarget = bufnr(a:buffer) + endif + if btarget < 0 + call s:Warn('No matching buffer for '.a:buffer) + return + endif + if empty(a:bang) && getbufvar(btarget, '&modified') + call s:Warn('No write since last change for buffer '.btarget.' (use :Bclose!)') + return + endif + " Numbers of windows that view target buffer which we will delete. + let wnums = filter(range(1, winnr('$')), 'winbufnr(v:val) == btarget') + if !g:bclose_multiple && len(wnums) > 1 + call s:Warn('Buffer is in multiple windows (use ":let bclose_multiple=1")') + return + endif + let wcurrent = winnr() + for w in wnums + execute w.'wincmd w' + let prevbuf = bufnr('#') + if prevbuf > 0 && buflisted(prevbuf) && prevbuf != btarget + buffer # + else + bprevious + endif + if btarget == bufnr('%') + " Numbers of listed buffers which are not the target to be deleted. + let blisted = filter(range(1, bufnr('$')), 'buflisted(v:val) && v:val != btarget') + " Listed, not target, and not displayed. + let bhidden = filter(copy(blisted), 'bufwinnr(v:val) < 0') + " Take the first buffer, if any (could be more intelligent). + let bjump = (bhidden + blisted + [-1])[0] + if bjump > 0 + execute 'buffer '.bjump + else + execute 'enew'.a:bang + endif + endif + endfor + execute 'bdelete'.a:bang.' '.btarget + execute wcurrent.'wincmd w' +endfunction +command! -bang -complete=buffer -nargs=? Bclose call Bclose(, ) +nnoremap bd :Bclose + +" PLUGIN SETTINGS +" polyglot setup +let g:polyglot_disabled = ["latex"] +" nerd tree setup +let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree +map e :NERDTreeToggle + +" AIRLINE SETUP +" sections +let g:airline_section_y = "" +let g:airline_section_z = "%l/%L:%c" +let g:airline_section_b = "%{airline#util#wrap(airline#extensions#branch#get_head(),0)}" +" other stuff +let g:airline_theme='solarized' +let g:airline_solarized_bg='dark' +let g:airline_powerline_fonts = 1 +let g:airline_inactive_collapse=1 +let g:airline_skip_empty_sections = 1 +let g:airline#extensions#whitespace#enabled = 0 +let g:airline#extensions#wordcount#enabled = 0 +let g:airline#extensions#keymap#enabled = 0 +set ttimeoutlen=50 + +" gitgutter setup +let g:gitgutter_sign_added = '∙' +let g:gitgutter_sign_modified = '∙' +let g:gitgutter_sign_removed = '∙' +let g:gitgutter_sign_modified_removed = '∙' +augroup VimDiff + autocmd! + autocmd VimEnter,FilterWritePre * if &diff | GitGutterDisable | endif +augroup END + +" fzf setup +nmap :Buffers +nmap f :GFiles +let g:fzf_buffers_jump = 1 + +" vim-ale setup +let g:ale_completion_enabled = 1 +let g:ale_lint_on_text_changed = 'never' +let g:ale_fixers = { +\ '*': ['trim_whitespace'], +\ 'python': ['autopep8'] +\ } +nmap d :ALEGoToDefinition +nmap r :ALEFindReferences +nmap b :ALEFix +nnoremap l :lnext +nnoremap p :lprevious + +" vimtex setup +let g:vimtex_compile_progname = 'nvr' + +" UltiSnip setup +" Trigger configuration +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" + +" If you want :UltiSnipsEdit to split your window. +let g:UltiSnipsEditSplit="vertical" +let g:UltiSnipsSnippetDirectories=[$HOME."/.vim/snipps"] + +" colors.lua setup +lua require'colorizer'.setup() + +" coc vim setup +let g:python3_host_prog = '/usr/bin/python' From cfd8185894e22b4527ae966b5a2619a64389845d Mon Sep 17 00:00:00 2001 From: Jidbo Date: Thu, 24 Oct 2019 12:43:34 +0200 Subject: [PATCH 04/34] update colorschemes --- nvim/init.vim | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index f00e6cb..929683b 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -16,8 +16,6 @@ Plugin 'VundleVim/Vundle.vim' " USEFUL " comment plugin Plugin 'tpope/vim-commentary' -" Color higlighting -Plugin 'norcalli/nvim-colorizer.lua' " brackets management Plugin 'machakann/vim-sandwich' @@ -26,6 +24,7 @@ Plugin 'machakann/vim-sandwich' Plugin 'SirVer/ultisnips' " WINDOW MANAGEMENT + " tmux navigator Plugin 'christoomey/vim-tmux-navigator' @@ -47,8 +46,11 @@ Plugin 'tpope/vim-fugitive' Plugin 'airblade/vim-gitgutter' " COLORS -" color schemes -Plugin 'flazz/vim-colorschemes' +" Plastic colorscheme +Plugin 'aonemd/kuroi.vim' + +" Color higlighting +Plugin 'norcalli/nvim-colorizer.lua' " powerline Plugin 'vim-airline/vim-airline' @@ -76,11 +78,14 @@ filetype plugin indent on " required " nvim setup " syntax -set termguicolors syntax on -colorscheme Benokai let mapleader=" " +" color settings +set termguicolors +colorscheme kuroi +set background=dark + " random settings set number set clipboard=unnamed @@ -123,16 +128,11 @@ set splitright " tabs nnoremap t :tabnew -nnoremap gT -nnoremap gt " Enable folding set foldmethod=indent set foldlevel=99 -" remap code folding -nnoremap g za - " auto reload .vimrc on write autocmd BufWritePost init.vim source % @@ -236,6 +236,7 @@ command! -bang -complete=buffer -nargs=? Bclose call Bclose(, bd :Bclose " PLUGIN SETTINGS + " polyglot setup let g:polyglot_disabled = ["latex"] " nerd tree setup @@ -248,7 +249,7 @@ let g:airline_section_y = "" let g:airline_section_z = "%l/%L:%c" let g:airline_section_b = "%{airline#util#wrap(airline#extensions#branch#get_head(),0)}" " other stuff -let g:airline_theme='solarized' +let g:airline_theme='luna' let g:airline_solarized_bg='dark' let g:airline_powerline_fonts = 1 let g:airline_inactive_collapse=1 From 53c7905d64c61d3aedf43bc782162e5b6a250555 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Thu, 24 Oct 2019 17:05:48 +0200 Subject: [PATCH 05/34] add own airline theme; cleanup init.vim --- nvim/init.vim | 19 +------------- nvim/luna.vim | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 18 deletions(-) create mode 100644 nvim/luna.vim diff --git a/nvim/init.vim b/nvim/init.vim index 929683b..4e3358e 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -14,6 +14,7 @@ Plugin 'VundleVim/Vundle.vim' " used Bundle instead of Plugin) " USEFUL + " comment plugin Plugin 'tpope/vim-commentary' @@ -54,7 +55,6 @@ Plugin 'norcalli/nvim-colorizer.lua' " powerline Plugin 'vim-airline/vim-airline' -Plugin 'vim-airline/vim-airline-themes' " LANGUAGE SUPPORT " vim-coc @@ -63,9 +63,6 @@ Plugin 'neoclide/coc.nvim', {'tag': '*', 'branch': 'release'} " nvim-remote Plugin 'mhinz/neovim-remote' -" editorconfig plugin -Plugin 'editorconfig/editorconfig-vim' - " language packs Plugin 'sheerun/vim-polyglot' @@ -250,7 +247,6 @@ let g:airline_section_z = "%l/%L:%c" let g:airline_section_b = "%{airline#util#wrap(airline#extensions#branch#get_head(),0)}" " other stuff let g:airline_theme='luna' -let g:airline_solarized_bg='dark' let g:airline_powerline_fonts = 1 let g:airline_inactive_collapse=1 let g:airline_skip_empty_sections = 1 @@ -274,19 +270,6 @@ nmap :Buffers nmap f :GFiles let g:fzf_buffers_jump = 1 -" vim-ale setup -let g:ale_completion_enabled = 1 -let g:ale_lint_on_text_changed = 'never' -let g:ale_fixers = { -\ '*': ['trim_whitespace'], -\ 'python': ['autopep8'] -\ } -nmap d :ALEGoToDefinition -nmap r :ALEFindReferences -nmap b :ALEFix -nnoremap l :lnext -nnoremap p :lprevious - " vimtex setup let g:vimtex_compile_progname = 'nvr' diff --git a/nvim/luna.vim b/nvim/luna.vim new file mode 100644 index 0000000..1c363d3 --- /dev/null +++ b/nvim/luna.vim @@ -0,0 +1,73 @@ + +let g:airline#themes#luna#palette = {} + +let g:airline#themes#luna#palette.accents = {'red': [ '#ffffff' , '' , 231 , '' , '' ], } + +let s:N1 = [ '#ffffff' , '#005252' , 231 , 36 ] +let s:N2 = [ '#ffffff' , '#3399aa' , 231 , 29 ] +let s:N3 = [ '#ffffff' , '#003636' , 231 , 23 ] +let g:airline#themes#luna#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) +let g:airline#themes#luna#palette.normal_modified = { + \ 'airline_c': [ '#ffffff' , '#450000' , 231 , 52 , '' ] , + \ } + +let s:I1 = [ '#ffffff' , '#789f00' , 231 , 106 ] +let s:I2 = [ '#ffffff' , '#3399aa' , 231 , 29 ] +let s:I3 = [ '#ffffff' , '#003636' , 231 , 23 ] +let g:airline#themes#luna#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) +let g:airline#themes#luna#palette.insert_modified = {'airline_c': ['#ffffff' ,'#005e5e' ,255, 52, '']} +let g:airline#themes#luna#palette.insert_paste = { + \ 'airline_a': [ s:I1[0] , '#789f00' , s:I1[2] , 106 , '' ] , + \ } + +let g:airline#themes#luna#palette.replace = copy(g:airline#themes#luna#palette.insert) +let g:airline#themes#luna#palette.replace.airline_a = [ s:I2[0] , '#920000' , s:I2[2] , 88 , '' ] +let g:airline#themes#luna#palette.replace_modified = g:airline#themes#luna#palette.insert_modified + +let s:V1 = [ '#ffff9a' , '#ff8036' , 222 , 208 ] +let s:V2 = [ '#ffffff' , '#3399aa' , 231 , 29 ] +let s:V3 = [ '#ffffff' , '#003636' , 231 , 23 ] +let g:airline#themes#luna#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) +let g:airline#themes#luna#palette.visual_modified = { + \ 'airline_c': [ '#ffffff' , '#450000' , 231 , 52 , '' ] , + \ } + +let s:IA = [ '#4e4e4e' , '#002b2b' , 59 , 23 , '' ] +let g:airline#themes#luna#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA) +let g:airline#themes#luna#palette.inactive_modified = { + \ 'airline_c': [ '#e20000' , '' , 166 , '' , '' ] , + \ } + +let g:airline#themes#luna#palette.tabline = { + \ 'airline_tab': ['#2aa198', '#3399aa', 231, 29, ''], + \ 'airline_tabsel': ['#ffffff', '#2e8b57', 231, 36, ''], + \ 'airline_tabtype': ['#ffffff', '#005252', 231, 36, ''], + \ 'airline_tabfill': ['#ffffff', '#003636', 231, 23, ''], + \ 'airline_tabmod': ['#ffffff', '#780000', 231, 88, ''], + \ } + +let s:WI = [ '#ffffff', '#5f0000', 231, 88 ] +let g:airline#themes#luna#palette.normal.airline_warning = [ + \ s:WI[0], s:WI[1], s:WI[2], s:WI[3] + \ ] + +let g:airline#themes#luna#palette.normal_modified.airline_warning = + \ g:airline#themes#luna#palette.normal.airline_warning + +let g:airline#themes#luna#palette.insert.airline_warning = + \ g:airline#themes#luna#palette.normal.airline_warning + +let g:airline#themes#luna#palette.insert_modified.airline_warning = + \ g:airline#themes#luna#palette.normal.airline_warning + +let g:airline#themes#luna#palette.visual.airline_warning = + \ g:airline#themes#luna#palette.normal.airline_warning + +let g:airline#themes#luna#palette.visual_modified.airline_warning = + \ g:airline#themes#luna#palette.normal.airline_warning + +let g:airline#themes#luna#palette.replace.airline_warning = + \ g:airline#themes#luna#palette.normal.airline_warning + +let g:airline#themes#luna#palette.replace_modified.airline_warning = + \ g:airline#themes#luna#palette.normal.airline_warning From b14b7ee73300c7436261b5b78227121112b14cc0 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sat, 26 Oct 2019 23:23:13 +0200 Subject: [PATCH 06/34] switch from coc to ale and deocomplete --- nvim/init.vim | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 4e3358e..8a6dbec 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -57,8 +57,15 @@ Plugin 'norcalli/nvim-colorizer.lua' Plugin 'vim-airline/vim-airline' " LANGUAGE SUPPORT -" vim-coc -Plugin 'neoclide/coc.nvim', {'tag': '*', 'branch': 'release'} +" autocompletion +Plugin 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +" autocompletion for python +Plugin 'deoplete-plugins/deoplete-jedi' +" completion from tmux panes +Bundle 'wellle/tmux-complete.vim' + +" Linting +Plugin 'dense-analysis/ale' " nvim-remote Plugin 'mhinz/neovim-remote' @@ -286,5 +293,22 @@ let g:UltiSnipsSnippetDirectories=[$HOME."/.vim/snipps"] " colors.lua setup lua require'colorizer'.setup() -" coc vim setup +" deoplete setup +let g:deoplete#enable_at_startup = 1 let g:python3_host_prog = '/usr/bin/python' + +" vim-ale setup +let g:ale_completion_enabled = 1 +let g:ale_lint_on_text_changed = 'never' +let g:ale_fixers = { +\ '*': ['trim_whitespace'], +\ 'python': ['autopep8'] +\ } +nmap d :ALEGoToDefinition +nmap r :ALEFindReferences +nmap b :ALEFix +nnoremap l :lnext +nnoremap p :lprevious + +" tmux setup +let g:tmuxcomplete#trigger = '' From acc7d47b10ad62fe5e778f916ce8a0143a587c5d Mon Sep 17 00:00:00 2001 From: Jidbo Date: Mon, 25 Nov 2019 01:14:58 +0100 Subject: [PATCH 07/34] switch to vim-plug and switch back to coc.nvim --- nvim/init.vim | 61 ++++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 42 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 8a6dbec..0b85578 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,84 +1,61 @@ -set nocompatible " required -filetype off " required - -" set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -let s:editor_root=expand("~/.config/nvim") -call vundle#rc(s:editor_root . '/bundle') -call vundle#begin() - -" let Vundle manage Vundle, required -Plugin 'VundleVim/Vundle.vim' - -" add all your plugins here (note older versions of Vundle -" used Bundle instead of Plugin) - +call plug#begin('~/.config/nvim/bundle') " USEFUL " comment plugin -Plugin 'tpope/vim-commentary' +Plug 'tpope/vim-commentary' " brackets management -Plugin 'machakann/vim-sandwich' +Plug 'machakann/vim-sandwich' " snippets -Plugin 'SirVer/ultisnips' +Plug 'SirVer/ultisnips' " WINDOW MANAGEMENT " tmux navigator -Plugin 'christoomey/vim-tmux-navigator' +Plug 'christoomey/vim-tmux-navigator' " winresizer -Plugin 'simeji/winresizer' +Plug 'simeji/winresizer' " FILE MANAGEMENT " nert-tree -Plugin 'scrooloose/nerdtree' +Plug 'scrooloose/nerdtree' " fzf plugin -Plugin 'junegunn/fzf.vim' +Plug 'junegunn/fzf.vim' " GIT STUFF " git -Plugin 'tpope/vim-fugitive' +Plug 'tpope/vim-fugitive' " vim gitgutter -Plugin 'airblade/vim-gitgutter' +Plug 'airblade/vim-gitgutter' " COLORS " Plastic colorscheme -Plugin 'aonemd/kuroi.vim' +Plug 'aonemd/kuroi.vim' " Color higlighting -Plugin 'norcalli/nvim-colorizer.lua' +Plug 'norcalli/nvim-colorizer.lua' " powerline -Plugin 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline' -" LANGUAGE SUPPORT -" autocompletion -Plugin 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } -" autocompletion for python -Plugin 'deoplete-plugins/deoplete-jedi' -" completion from tmux panes -Bundle 'wellle/tmux-complete.vim' - -" Linting -Plugin 'dense-analysis/ale' +" Coc Nvim +Plug 'neoclide/coc.nvim', {'branch': 'release'} " nvim-remote -Plugin 'mhinz/neovim-remote' +Plug 'mhinz/neovim-remote' " language packs -Plugin 'sheerun/vim-polyglot' +Plug 'sheerun/vim-polyglot' " latex -Plugin 'lervag/vimtex' +Plug 'lervag/vimtex' " All of your Plugins must be added before the following line -call vundle#end() " required -filetype plugin indent on " required +call plug#end() " nvim setup " syntax From 2fb5a8cc2a33e56c36b3baa3ebac7e65591ec692 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Tue, 26 Nov 2019 23:29:59 +0100 Subject: [PATCH 08/34] add coc.nvim config --- nvim/init.vim | 79 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 30 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 0b85578..df23392 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -7,9 +7,6 @@ Plug 'tpope/vim-commentary' " brackets management Plug 'machakann/vim-sandwich' -" snippets -Plug 'SirVer/ultisnips' - " WINDOW MANAGEMENT " tmux navigator @@ -257,35 +254,57 @@ let g:fzf_buffers_jump = 1 " vimtex setup let g:vimtex_compile_progname = 'nvr' -" UltiSnip setup -" Trigger configuration -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" - -" If you want :UltiSnipsEdit to split your window. -let g:UltiSnipsEditSplit="vertical" -let g:UltiSnipsSnippetDirectories=[$HOME."/.vim/snipps"] - " colors.lua setup lua require'colorizer'.setup() -" deoplete setup -let g:deoplete#enable_at_startup = 1 -let g:python3_host_prog = '/usr/bin/python' - -" vim-ale setup -let g:ale_completion_enabled = 1 -let g:ale_lint_on_text_changed = 'never' -let g:ale_fixers = { -\ '*': ['trim_whitespace'], -\ 'python': ['autopep8'] -\ } -nmap d :ALEGoToDefinition -nmap r :ALEFindReferences -nmap b :ALEFix -nnoremap l :lnext -nnoremap p :lprevious - " tmux setup let g:tmuxcomplete#trigger = '' + +" Coc vim setup +set hidden +set updatetime=300 +set shortmess+=c +" Use to trigger completion. +inoremap coc#refresh() +" navigate diagnostics +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) +" goto remaps +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() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + else + call CocAction('doHover') + endif +endfunction + +" Remap for rename current word +nmap rn (coc-rename) + +" Use `:Form` to format current buffer +command! -nargs=0 Form :call CocAction('format') + +" Using CocList +" Show all diagnostics +nnoremap a :CocList diagnostics +" Manage extensions +nnoremap x :CocList extensions +" Show commands +nnoremap c :CocList commands +" Find symbol of current document +nnoremap o :CocList outline +" Search workspace symbls +nnoremap s :CocList -I symbols +" Do default action fo next item. +nnoremap j :CocNext +" Do default action for previous item. +nnoremap k :CocPrev +" Resume latest coc list +nnoremap p :CocListResume From 80e5ff01e9acd262164561b7c02526ef4a7822ac Mon Sep 17 00:00:00 2001 From: Jidbo Date: Tue, 26 Nov 2019 23:42:54 +0100 Subject: [PATCH 09/34] change higlight color of parentheses --- nvim/init.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/init.vim b/nvim/init.vim index df23392..f2f19f3 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -63,6 +63,7 @@ let mapleader=" " set termguicolors colorscheme kuroi set background=dark +hi MatchParen guibg=NONE guifg=red gui=bold " random settings set number From 5bece691ec30641fd3087aa44fd584571f70dec8 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Tue, 26 Nov 2019 23:53:20 +0100 Subject: [PATCH 10/34] change vim colors --- .vimrc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.vimrc b/.vimrc index 591285c..66223b7 100644 --- a/.vimrc +++ b/.vimrc @@ -43,8 +43,8 @@ Plugin 'tpope/vim-fugitive' Plugin 'airblade/vim-gitgutter' " COLORS -" color schemes -Plugin 'flazz/vim-colorschemes' +" Plastic colorscheme +Plugin 'aonemd/kuroi.vim' " powerline Plugin 'vim-airline/vim-airline' @@ -69,8 +69,10 @@ filetype plugin indent on " required " syntax syntax on -colorscheme Benokai +colorscheme kuroi +set background=dark let mapleader=" " +hi MatchParen cterm=bold ctermbg=NONE ctermfg=red " random settings set number @@ -240,7 +242,7 @@ let g:airline_section_y = "" let g:airline_section_z = "%l/%L:%c" let g:airline_section_b = "%{airline#util#wrap(airline#extensions#branch#get_head(),0)}" " other stuff -let g:airline_theme='solarized' +let g:airline_theme='luna' let g:airline_solarized_bg='dark' let g:airline_powerline_fonts = 1 let g:airline_inactive_collapse=1 From a4829f2b183cdc4a1ee6da65ba17d286a6f63fe4 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 11 Dec 2019 21:21:54 +0100 Subject: [PATCH 11/34] add dotbot submodule --- .gitmodules | 4 ++++ dotbot | 1 + install | 15 +++++++++++++++ install.conf.yaml | 0 4 files changed, 20 insertions(+) create mode 100644 .gitmodules create mode 160000 dotbot create mode 100755 install create mode 100644 install.conf.yaml diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1af14d0 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "dotbot"] + path = dotbot + url = https://github.com/anishathalye/dotbot + ignore = dirty diff --git a/dotbot b/dotbot new file mode 160000 index 0000000..2c8a043 --- /dev/null +++ b/dotbot @@ -0,0 +1 @@ +Subproject commit 2c8a0431edfd826c8caa4afbfa22ca408e745db6 diff --git a/install b/install new file mode 100755 index 0000000..5a7e72c --- /dev/null +++ b/install @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +set -e + +CONFIG="install.conf.yaml" +DOTBOT_DIR="dotbot" + +DOTBOT_BIN="bin/dotbot" +BASEDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +cd "${BASEDIR}" +git -C "${DOTBOT_DIR}" submodule sync --quiet --recursive +git submodule update --init --recursive "${DOTBOT_DIR}" + +"${BASEDIR}/${DOTBOT_DIR}/${DOTBOT_BIN}" -d "${BASEDIR}" -c "${CONFIG}" "${@}" diff --git a/install.conf.yaml b/install.conf.yaml new file mode 100644 index 0000000..e69de29 From 8b566dba0826968f28d21bc0089ded4ab00c7460 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 11 Dec 2019 21:50:30 +0100 Subject: [PATCH 12/34] remove dot in file/folder names --- .gitignore | 5 +++-- {.vim => vim}/ftplugin/markdown.vim | 0 {.vim => vim}/ftplugin/python.vim | 0 {.vim => vim}/snipps/blade.snippets | 0 {.vim => vim}/snipps/css.snippets | 0 {.vim => vim}/snipps/html.snippets | 0 {.vim => vim}/snipps/liquid.snippets | 0 {.vim => vim}/snipps/markdown.snippets | 0 {.vim => vim}/snipps/markwdown.snippets | 0 {.vim => vim}/snipps/php.snippets | 0 {.vim => vim}/snipps/plaintex.snippets | 0 {.vim => vim}/snipps/tex.snippets | 0 {.vim => vim}/snipps/vim.snippets | 0 .vimrc => vimrc | 0 .zshrc => zshrc | 0 15 files changed, 3 insertions(+), 2 deletions(-) rename {.vim => vim}/ftplugin/markdown.vim (100%) rename {.vim => vim}/ftplugin/python.vim (100%) rename {.vim => vim}/snipps/blade.snippets (100%) rename {.vim => vim}/snipps/css.snippets (100%) rename {.vim => vim}/snipps/html.snippets (100%) rename {.vim => vim}/snipps/liquid.snippets (100%) rename {.vim => vim}/snipps/markdown.snippets (100%) rename {.vim => vim}/snipps/markwdown.snippets (100%) rename {.vim => vim}/snipps/php.snippets (100%) rename {.vim => vim}/snipps/plaintex.snippets (100%) rename {.vim => vim}/snipps/tex.snippets (100%) rename {.vim => vim}/snipps/vim.snippets (100%) rename .vimrc => vimrc (100%) rename .zshrc => zshrc (100%) diff --git a/.gitignore b/.gitignore index 3b832f9..3f0861e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -.localcommands -.vim/bundle/* +localcommands +vim/bundle/* +vim/autoload diff --git a/.vim/ftplugin/markdown.vim b/vim/ftplugin/markdown.vim similarity index 100% rename from .vim/ftplugin/markdown.vim rename to vim/ftplugin/markdown.vim diff --git a/.vim/ftplugin/python.vim b/vim/ftplugin/python.vim similarity index 100% rename from .vim/ftplugin/python.vim rename to vim/ftplugin/python.vim diff --git a/.vim/snipps/blade.snippets b/vim/snipps/blade.snippets similarity index 100% rename from .vim/snipps/blade.snippets rename to vim/snipps/blade.snippets diff --git a/.vim/snipps/css.snippets b/vim/snipps/css.snippets similarity index 100% rename from .vim/snipps/css.snippets rename to vim/snipps/css.snippets diff --git a/.vim/snipps/html.snippets b/vim/snipps/html.snippets similarity index 100% rename from .vim/snipps/html.snippets rename to vim/snipps/html.snippets diff --git a/.vim/snipps/liquid.snippets b/vim/snipps/liquid.snippets similarity index 100% rename from .vim/snipps/liquid.snippets rename to vim/snipps/liquid.snippets diff --git a/.vim/snipps/markdown.snippets b/vim/snipps/markdown.snippets similarity index 100% rename from .vim/snipps/markdown.snippets rename to vim/snipps/markdown.snippets diff --git a/.vim/snipps/markwdown.snippets b/vim/snipps/markwdown.snippets similarity index 100% rename from .vim/snipps/markwdown.snippets rename to vim/snipps/markwdown.snippets diff --git a/.vim/snipps/php.snippets b/vim/snipps/php.snippets similarity index 100% rename from .vim/snipps/php.snippets rename to vim/snipps/php.snippets diff --git a/.vim/snipps/plaintex.snippets b/vim/snipps/plaintex.snippets similarity index 100% rename from .vim/snipps/plaintex.snippets rename to vim/snipps/plaintex.snippets diff --git a/.vim/snipps/tex.snippets b/vim/snipps/tex.snippets similarity index 100% rename from .vim/snipps/tex.snippets rename to vim/snipps/tex.snippets diff --git a/.vim/snipps/vim.snippets b/vim/snipps/vim.snippets similarity index 100% rename from .vim/snipps/vim.snippets rename to vim/snipps/vim.snippets diff --git a/.vimrc b/vimrc similarity index 100% rename from .vimrc rename to vimrc diff --git a/.zshrc b/zshrc similarity index 100% rename from .zshrc rename to zshrc From 8206bd31a61c29a67d95f14ddc0c29e198ca0c5c Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 11 Dec 2019 22:05:30 +0100 Subject: [PATCH 13/34] swtich vim to use vim-plug as the plugin manager --- vimrc | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/vimrc b/vimrc index 66223b7..577a7f8 100644 --- a/vimrc +++ b/vimrc @@ -1,70 +1,61 @@ set nocompatible " required -filetype off " required " set the runtime path to include Vundle and initialize -set rtp+=~/.vim/bundle/Vundle.vim -call vundle#begin() - -" let Vundle manage Vundle, required -Plugin 'VundleVim/Vundle.vim' - -" add all your plugins here (note older versions of Vundle -" used Bundle instead of Plugin) +call plug#begin('~/.vim/bundle') " USEFUL " comment plugin -Plugin 'tpope/vim-commentary' +Plug 'tpope/vim-commentary' " brackets management -Plugin 'machakann/vim-sandwich' +Plug 'machakann/vim-sandwich' " snippets -Plugin 'SirVer/ultisnips' +Plug 'SirVer/ultisnips' " WINDOW MANAGEMENT " tmux navigator -Plugin 'christoomey/vim-tmux-navigator' +Plug 'christoomey/vim-tmux-navigator' " winresizer -Plugin 'simeji/winresizer' +Plug 'simeji/winresizer' " FILE MANAGEMENT " nert-tree -Plugin 'scrooloose/nerdtree' +Plug 'scrooloose/nerdtree' " fzf plugin -Plugin 'junegunn/fzf.vim' +Plug 'junegunn/fzf.vim' " GIT STUFF " git -Plugin 'tpope/vim-fugitive' +Plug 'tpope/vim-fugitive' " vim gitgutter -Plugin 'airblade/vim-gitgutter' +Plug 'airblade/vim-gitgutter' " COLORS " Plastic colorscheme -Plugin 'aonemd/kuroi.vim' +Plug 'aonemd/kuroi.vim' " powerline -Plugin 'vim-airline/vim-airline' -Plugin 'vim-airline/vim-airline-themes' +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' " LANGUAGE SUPPORT " vim ale for interaction with language servers -Plugin 'w0rp/ale' +Plug 'w0rp/ale' " editorconfig plugin -Plugin 'editorconfig/editorconfig-vim' +Plug 'editorconfig/editorconfig-vim' " language packs -Plugin 'sheerun/vim-polyglot' +Plug 'sheerun/vim-polyglot' " latex -Plugin 'lervag/vimtex' +Plug 'lervag/vimtex' -" All of your Plugins must be added before the following line -call vundle#end() " required +call plug#end() " required filetype plugin indent on " required " syntax From 3f08f78a4f5878fe0ffd92e72711e7ebba940854 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 11 Dec 2019 22:16:18 +0100 Subject: [PATCH 14/34] restructure dotfile directories --- setup.sh | 30 - tmux.conf => shell/tmux.conf | 0 zshrc => shell/zshrc | 4 +- vim/vim/autoload/plug.vim | 2591 +++++++++++++++++ .../.vundle/script-names.vim-scripts.org.json | 1 + vim/vim/bundle/ale | 1 + vim/vim/bundle/editorconfig-vim | 1 + vim/vim/bundle/fzf.vim | 1 + vim/vim/bundle/kuroi.vim | 1 + vim/vim/bundle/nerdtree | 1 + vim/vim/bundle/ultisnips | 1 + vim/vim/bundle/vim-airline | 1 + vim/vim/bundle/vim-airline-themes | 1 + vim/vim/bundle/vim-commentary | 1 + vim/vim/bundle/vim-fugitive | 1 + vim/vim/bundle/vim-gitgutter | 1 + vim/vim/bundle/vim-polyglot | 1 + vim/vim/bundle/vim-sandwich | 1 + vim/vim/bundle/vim-tmux-navigator | 1 + vim/vim/bundle/vimtex | 1 + vim/vim/bundle/winresizer | 1 + vim/{ => vim}/ftplugin/markdown.vim | 0 vim/{ => vim}/ftplugin/python.vim | 0 vim/{ => vim}/snipps/blade.snippets | 0 vim/{ => vim}/snipps/css.snippets | 0 vim/{ => vim}/snipps/html.snippets | 0 vim/{ => vim}/snipps/liquid.snippets | 0 vim/{ => vim}/snipps/markdown.snippets | 0 vim/{ => vim}/snipps/markwdown.snippets | 0 vim/{ => vim}/snipps/php.snippets | 0 vim/{ => vim}/snipps/plaintex.snippets | 0 vim/{ => vim}/snipps/tex.snippets | 0 vim/{ => vim}/snipps/vim.snippets | 0 vimrc => vim/vimrc | 0 34 files changed, 2610 insertions(+), 32 deletions(-) delete mode 100644 setup.sh rename tmux.conf => shell/tmux.conf (100%) rename zshrc => shell/zshrc (91%) create mode 100644 vim/vim/autoload/plug.vim create mode 100644 vim/vim/bundle/.vundle/script-names.vim-scripts.org.json create mode 160000 vim/vim/bundle/ale create mode 160000 vim/vim/bundle/editorconfig-vim create mode 160000 vim/vim/bundle/fzf.vim create mode 160000 vim/vim/bundle/kuroi.vim create mode 160000 vim/vim/bundle/nerdtree create mode 160000 vim/vim/bundle/ultisnips create mode 160000 vim/vim/bundle/vim-airline create mode 160000 vim/vim/bundle/vim-airline-themes create mode 160000 vim/vim/bundle/vim-commentary create mode 160000 vim/vim/bundle/vim-fugitive create mode 160000 vim/vim/bundle/vim-gitgutter create mode 160000 vim/vim/bundle/vim-polyglot create mode 160000 vim/vim/bundle/vim-sandwich create mode 160000 vim/vim/bundle/vim-tmux-navigator create mode 160000 vim/vim/bundle/vimtex create mode 160000 vim/vim/bundle/winresizer rename vim/{ => vim}/ftplugin/markdown.vim (100%) rename vim/{ => vim}/ftplugin/python.vim (100%) rename vim/{ => vim}/snipps/blade.snippets (100%) rename vim/{ => vim}/snipps/css.snippets (100%) rename vim/{ => vim}/snipps/html.snippets (100%) rename vim/{ => vim}/snipps/liquid.snippets (100%) rename vim/{ => vim}/snipps/markdown.snippets (100%) rename vim/{ => vim}/snipps/markwdown.snippets (100%) rename vim/{ => vim}/snipps/php.snippets (100%) rename vim/{ => vim}/snipps/plaintex.snippets (100%) rename vim/{ => vim}/snipps/tex.snippets (100%) rename vim/{ => vim}/snipps/vim.snippets (100%) rename vimrc => vim/vimrc (100%) diff --git a/setup.sh b/setup.sh deleted file mode 100644 index c6447a5..0000000 --- a/setup.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/sh - -# remove all current dotfiles -rm -f ~/.zshrc -rm -f ~/.vimrc -rm -rf ~/.vim -rm -f ~/.tmux.conf - -# create symbolic links to dotfiles -ln -s ~/.dotfiles/.vimrc ~/.vimrc -ln -s ~/.dotfiles/.zshrc ~/.zshrc -ln -s ~/.dotfiles/.vim ~/.vim -ln -s ~/.dotfiles/tmux.conf ~/.tmux.conf - - -# install vundle -if ! [ -d ~/.vim/bundle/Vundle.vim ]; then - echo '[INFO] Installing Vundle...' - git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim -else - echo '[INFO] Vundle is already installed.' -fi - -# Install vundle Plugins -if commandExists vim; then - echo '[INFO] Installing vim plugins via Vundle...' - vim +PluginInstall +qall -else - echo '[INFO] Vim is not installed, could not install the plugins.' -fi diff --git a/tmux.conf b/shell/tmux.conf similarity index 100% rename from tmux.conf rename to shell/tmux.conf diff --git a/zshrc b/shell/zshrc similarity index 91% rename from zshrc rename to shell/zshrc index dc60727..356619e 100644 --- a/zshrc +++ b/shell/zshrc @@ -32,9 +32,9 @@ alias la='ls -la' alias :q='exit' # localcommands -if [ -f ~/.dotfiles/.localcommands ] +if [ -f ~/.dotfiles/localcommands ] then - source ~/.dotfiles/.localcommands + source ~/.dotfiles/localcommands fi # Tmuxinator autocomplete diff --git a/vim/vim/autoload/plug.vim b/vim/vim/autoload/plug.vim new file mode 100644 index 0000000..92fea62 --- /dev/null +++ b/vim/vim/autoload/plug.vim @@ -0,0 +1,2591 @@ +" vim-plug: Vim plugin manager +" ============================ +" +" Download plug.vim and put it in ~/.vim/autoload +" +" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ +" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim +" +" Edit your .vimrc +" +" call plug#begin('~/.vim/plugged') +" +" " Make sure you use single quotes +" +" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align +" Plug 'junegunn/vim-easy-align' +" +" " Any valid git URL is allowed +" Plug 'https://github.com/junegunn/vim-github-dashboard.git' +" +" " Multiple Plug commands can be written in a single line using | separators +" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' +" +" " On-demand loading +" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } +" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } +" +" " Using a non-master branch +" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } +" +" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) +" Plug 'fatih/vim-go', { 'tag': '*' } +" +" " Plugin options +" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } +" +" " Plugin outside ~/.vim/plugged with post-update hook +" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +" +" " Unmanaged plugin (manually installed and updated) +" Plug '~/my-prototype-plugin' +" +" " Initialize plugin system +" call plug#end() +" +" Then reload .vimrc and :PlugInstall to install plugins. +" +" Plug options: +" +"| Option | Description | +"| ----------------------- | ------------------------------------------------ | +"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use | +"| `rtp` | Subdirectory that contains Vim plugin | +"| `dir` | Custom directory for the plugin | +"| `as` | Use different name for the plugin | +"| `do` | Post-update hook (string or funcref) | +"| `on` | On-demand loading: Commands or ``-mappings | +"| `for` | On-demand loading: File types | +"| `frozen` | Do not update unless explicitly specified | +" +" More information: https://github.com/junegunn/vim-plug +" +" +" Copyright (c) 2017 Junegunn Choi +" +" MIT License +" +" Permission is hereby granted, free of charge, to any person obtaining +" a copy of this software and associated documentation files (the +" "Software"), to deal in the Software without restriction, including +" without limitation the rights to use, copy, modify, merge, publish, +" distribute, sublicense, and/or sell copies of the Software, and to +" permit persons to whom the Software is furnished to do so, subject to +" the following conditions: +" +" The above copyright notice and this permission notice shall be +" included in all copies or substantial portions of the Software. +" +" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +if exists('g:loaded_plug') + finish +endif +let g:loaded_plug = 1 + +let s:cpo_save = &cpo +set cpo&vim + +let s:plug_src = 'https://github.com/junegunn/vim-plug.git' +let s:plug_tab = get(s:, 'plug_tab', -1) +let s:plug_buf = get(s:, 'plug_buf', -1) +let s:mac_gui = has('gui_macvim') && has('gui_running') +let s:is_win = has('win32') +let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) +let s:vim8 = has('patch-8.0.0039') && exists('*job_start') +if s:is_win && &shellslash + set noshellslash + let s:me = resolve(expand(':p')) + set shellslash +else + let s:me = resolve(expand(':p')) +endif +let s:base_spec = { 'branch': 'master', 'frozen': 0 } +let s:TYPE = { +\ 'string': type(''), +\ 'list': type([]), +\ 'dict': type({}), +\ 'funcref': type(function('call')) +\ } +let s:loaded = get(s:, 'loaded', {}) +let s:triggers = get(s:, 'triggers', {}) + +if s:is_win + function! s:plug_call(fn, ...) + let shellslash = &shellslash + try + set noshellslash + return call(a:fn, a:000) + finally + let &shellslash = shellslash + endtry + endfunction +else + function! s:plug_call(fn, ...) + return call(a:fn, a:000) + endfunction +endif + +function! s:plug_getcwd() + return s:plug_call('getcwd') +endfunction + +function! s:plug_fnamemodify(fname, mods) + return s:plug_call('fnamemodify', a:fname, a:mods) +endfunction + +function! s:plug_expand(fmt) + return s:plug_call('expand', a:fmt, 1) +endfunction + +function! s:plug_tempname() + return s:plug_call('tempname') +endfunction + +function! plug#begin(...) + if a:0 > 0 + let s:plug_home_org = a:1 + let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) + elseif exists('g:plug_home') + let home = s:path(g:plug_home) + elseif !empty(&rtp) + let home = s:path(split(&rtp, ',')[0]) . '/plugged' + else + return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') + endif + if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp + return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') + endif + + let g:plug_home = home + let g:plugs = {} + let g:plugs_order = [] + let s:triggers = {} + + call s:define_commands() + return 1 +endfunction + +function! s:define_commands() + command! -nargs=+ -bar Plug call plug#() + if !executable('git') + return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') + endif + if has('win32') + \ && &shellslash + \ && (&shell =~# 'cmd\.exe' || &shell =~# 'powershell\.exe') + return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') + endif + if !has('nvim') + \ && (has('win32') || has('win32unix')) + \ && (!has('multi_byte') || !has('iconv')) + return s:err('Vim needs +iconv, +multi_byte features on Windows to run shell commands.') + endif + command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(0, []) + command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(0, []) + command! -nargs=0 -bar -bang PlugClean call s:clean(0) + command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif + command! -nargs=0 -bar PlugStatus call s:status() + command! -nargs=0 -bar PlugDiff call s:diff() + command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(0, ) +endfunction + +function! s:to_a(v) + return type(a:v) == s:TYPE.list ? a:v : [a:v] +endfunction + +function! s:to_s(v) + return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n" +endfunction + +function! s:glob(from, pattern) + return s:lines(globpath(a:from, a:pattern)) +endfunction + +function! s:source(from, ...) + let found = 0 + for pattern in a:000 + for vim in s:glob(a:from, pattern) + execute 'source' s:esc(vim) + let found = 1 + endfor + endfor + return found +endfunction + +function! s:assoc(dict, key, val) + let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) +endfunction + +function! s:ask(message, ...) + call inputsave() + echohl WarningMsg + let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) ')) + echohl None + call inputrestore() + echo "\r" + return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0 +endfunction + +function! s:ask_no_interrupt(...) + try + return call('s:ask', a:000) + catch + return 0 + endtry +endfunction + +function! s:lazy(plug, opt) + return has_key(a:plug, a:opt) && + \ (empty(s:to_a(a:plug[a:opt])) || + \ !isdirectory(a:plug.dir) || + \ len(s:glob(s:rtp(a:plug), 'plugin')) || + \ len(s:glob(s:rtp(a:plug), 'after/plugin'))) +endfunction + +function! plug#end() + if !exists('g:plugs') + return s:err('Call plug#begin() first') + endif + + if exists('#PlugLOD') + augroup PlugLOD + autocmd! + augroup END + augroup! PlugLOD + endif + let lod = { 'ft': {}, 'map': {}, 'cmd': {} } + + if exists('g:did_load_filetypes') + filetype off + endif + for name in g:plugs_order + if !has_key(g:plugs, name) + continue + endif + let plug = g:plugs[name] + if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for') + let s:loaded[name] = 1 + continue + endif + + if has_key(plug, 'on') + let s:triggers[name] = { 'map': [], 'cmd': [] } + for cmd in s:to_a(plug.on) + if cmd =~? '^.\+' + if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i')) + call s:assoc(lod.map, cmd, name) + endif + call add(s:triggers[name].map, cmd) + elseif cmd =~# '^[A-Z]' + let cmd = substitute(cmd, '!*$', '', '') + if exists(':'.cmd) != 2 + call s:assoc(lod.cmd, cmd, name) + endif + call add(s:triggers[name].cmd, cmd) + else + call s:err('Invalid `on` option: '.cmd. + \ '. Should start with an uppercase letter or ``.') + endif + endfor + endif + + if has_key(plug, 'for') + let types = s:to_a(plug.for) + if !empty(types) + augroup filetypedetect + call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') + augroup END + endif + for type in types + call s:assoc(lod.ft, type, name) + endfor + endif + endfor + + for [cmd, names] in items(lod.cmd) + execute printf( + \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "", , , , %s)', + \ cmd, string(cmd), string(names)) + endfor + + for [map, names] in items(lod.map) + for [mode, map_prefix, key_prefix] in + \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] + execute printf( + \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', + \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) + endfor + endfor + + for [ft, names] in items(lod.ft) + augroup PlugLOD + execute printf('autocmd FileType %s call lod_ft(%s, %s)', + \ ft, string(ft), string(names)) + augroup END + endfor + + call s:reorg_rtp() + filetype plugin indent on + if has('vim_starting') + if has('syntax') && !exists('g:syntax_on') + syntax enable + end + else + call s:reload_plugins() + endif +endfunction + +function! s:loaded_names() + return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') +endfunction + +function! s:load_plugin(spec) + call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim') +endfunction + +function! s:reload_plugins() + for name in s:loaded_names() + call s:load_plugin(g:plugs[name]) + endfor +endfunction + +function! s:trim(str) + return substitute(a:str, '[\/]\+$', '', '') +endfunction + +function! s:version_requirement(val, min) + for idx in range(0, len(a:min) - 1) + let v = get(a:val, idx, 0) + if v < a:min[idx] | return 0 + elseif v > a:min[idx] | return 1 + endif + endfor + return 1 +endfunction + +function! s:git_version_requirement(...) + if !exists('s:git_version') + let s:git_version = map(split(split(s:system('git --version'))[2], '\.'), 'str2nr(v:val)') + endif + return s:version_requirement(s:git_version, a:000) +endfunction + +function! s:progress_opt(base) + return a:base && !s:is_win && + \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' +endfunction + +function! s:rtp(spec) + return s:path(a:spec.dir . get(a:spec, 'rtp', '')) +endfunction + +if s:is_win + function! s:path(path) + return s:trim(substitute(a:path, '/', '\', 'g')) + endfunction + + function! s:dirpath(path) + return s:path(a:path) . '\' + endfunction + + function! s:is_local_plug(repo) + return a:repo =~? '^[a-z]:\|^[%~]' + endfunction + + " Copied from fzf + let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) + function! s:wrap_cmds(cmds) + return map([ + \ '@echo off', + \ 'setlocal enabledelayedexpansion'] + \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) + \ + ['endlocal'], + \ printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) + endfunction + + function! s:batchfile(cmd) + let batchfile = s:plug_tempname().'.bat' + call writefile(s:wrap_cmds(a:cmd), batchfile) + let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) + if &shell =~# 'powershell\.exe' + let cmd = '& ' . cmd + endif + return [batchfile, cmd] + endfunction +else + function! s:path(path) + return s:trim(a:path) + endfunction + + function! s:dirpath(path) + return substitute(a:path, '[/\\]*$', '/', '') + endfunction + + function! s:is_local_plug(repo) + return a:repo[0] =~ '[/$~]' + endfunction +endif + +function! s:err(msg) + echohl ErrorMsg + echom '[vim-plug] '.a:msg + echohl None +endfunction + +function! s:warn(cmd, msg) + echohl WarningMsg + execute a:cmd 'a:msg' + echohl None +endfunction + +function! s:esc(path) + return escape(a:path, ' ') +endfunction + +function! s:escrtp(path) + return escape(a:path, ' ,') +endfunction + +function! s:remove_rtp() + for name in s:loaded_names() + let rtp = s:rtp(g:plugs[name]) + execute 'set rtp-='.s:escrtp(rtp) + let after = globpath(rtp, 'after') + if isdirectory(after) + execute 'set rtp-='.s:escrtp(after) + endif + endfor +endfunction + +function! s:reorg_rtp() + if !empty(s:first_rtp) + execute 'set rtp-='.s:first_rtp + execute 'set rtp-='.s:last_rtp + endif + + " &rtp is modified from outside + if exists('s:prtp') && s:prtp !=# &rtp + call s:remove_rtp() + unlet! s:middle + endif + + let s:middle = get(s:, 'middle', &rtp) + let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])') + let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)') + let rtp = join(map(rtps, 'escape(v:val, ",")'), ',') + \ . ','.s:middle.',' + \ . join(map(afters, 'escape(v:val, ",")'), ',') + let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g') + let s:prtp = &rtp + + if !empty(s:first_rtp) + execute 'set rtp^='.s:first_rtp + execute 'set rtp+='.s:last_rtp + endif +endfunction + +function! s:doautocmd(...) + if exists('#'.join(a:000, '#')) + execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '' : '') join(a:000) + endif +endfunction + +function! s:dobufread(names) + for name in a:names + let path = s:rtp(g:plugs[name]) + for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] + if len(finddir(dir, path)) + if exists('#BufRead') + doautocmd BufRead + endif + return + endif + endfor + endfor +endfunction + +function! plug#load(...) + if a:0 == 0 + return s:err('Argument missing: plugin name(s) required') + endif + if !exists('g:plugs') + return s:err('plug#begin was not called') + endif + let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 + let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') + if !empty(unknowns) + let s = len(unknowns) > 1 ? 's' : '' + return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) + end + let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') + if !empty(unloaded) + for name in unloaded + call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + endfor + call s:dobufread(unloaded) + return 1 + end + return 0 +endfunction + +function! s:remove_triggers(name) + if !has_key(s:triggers, a:name) + return + endif + for cmd in s:triggers[a:name].cmd + execute 'silent! delc' cmd + endfor + for map in s:triggers[a:name].map + execute 'silent! unmap' map + execute 'silent! iunmap' map + endfor + call remove(s:triggers, a:name) +endfunction + +function! s:lod(names, types, ...) + for name in a:names + call s:remove_triggers(name) + let s:loaded[name] = 1 + endfor + call s:reorg_rtp() + + for name in a:names + let rtp = s:rtp(g:plugs[name]) + for dir in a:types + call s:source(rtp, dir.'/**/*.vim') + endfor + if a:0 + if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) + execute 'runtime' a:1 + endif + call s:source(rtp, a:2) + endif + call s:doautocmd('User', name) + endfor +endfunction + +function! s:lod_ft(pat, names) + let syn = 'syntax/'.a:pat.'.vim' + call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) + execute 'autocmd! PlugLOD FileType' a:pat + call s:doautocmd('filetypeplugin', 'FileType') + call s:doautocmd('filetypeindent', 'FileType') +endfunction + +function! s:lod_cmd(cmd, bang, l1, l2, args, names) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + call s:dobufread(a:names) + execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) +endfunction + +function! s:lod_map(map, names, with_prefix, prefix) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + call s:dobufread(a:names) + let extra = '' + while 1 + let c = getchar(0) + if c == 0 + break + endif + let extra .= nr2char(c) + endwhile + + if a:with_prefix + let prefix = v:count ? v:count : '' + let prefix .= '"'.v:register.a:prefix + if mode(1) == 'no' + if v:operator == 'c' + let prefix = "\" . prefix + endif + let prefix .= v:operator + endif + call feedkeys(prefix, 'n') + endif + call feedkeys(substitute(a:map, '^', "\", '') . extra) +endfunction + +function! plug#(repo, ...) + if a:0 > 1 + return s:err('Invalid number of arguments (1..2)') + endif + + try + let repo = s:trim(a:repo) + let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec + let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??')) + let spec = extend(s:infer_properties(name, repo), opts) + if !has_key(g:plugs, name) + call add(g:plugs_order, name) + endif + let g:plugs[name] = spec + let s:loaded[name] = get(s:loaded, name, 0) + catch + return s:err(v:exception) + endtry +endfunction + +function! s:parse_options(arg) + let opts = copy(s:base_spec) + let type = type(a:arg) + if type == s:TYPE.string + let opts.tag = a:arg + elseif type == s:TYPE.dict + call extend(opts, a:arg) + if has_key(opts, 'dir') + let opts.dir = s:dirpath(s:plug_expand(opts.dir)) + endif + else + throw 'Invalid argument type (expected: string or dictionary)' + endif + return opts +endfunction + +function! s:infer_properties(name, repo) + let repo = a:repo + if s:is_local_plug(repo) + return { 'dir': s:dirpath(s:plug_expand(repo)) } + else + if repo =~ ':' + let uri = repo + else + if repo !~ '/' + throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo) + endif + let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') + let uri = printf(fmt, repo) + endif + return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri } + endif +endfunction + +function! s:install(force, names) + call s:update_impl(0, a:force, a:names) +endfunction + +function! s:update(force, names) + call s:update_impl(1, a:force, a:names) +endfunction + +function! plug#helptags() + if !exists('g:plugs') + return s:err('plug#begin was not called') + endif + for spec in values(g:plugs) + let docd = join([s:rtp(spec), 'doc'], '/') + if isdirectory(docd) + silent! execute 'helptags' s:esc(docd) + endif + endfor + return 1 +endfunction + +function! s:syntax() + syntax clear + syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber + syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX + syn match plugNumber /[0-9]\+[0-9.]*/ contained + syn match plugBracket /[[\]]/ contained + syn match plugX /x/ contained + syn match plugDash /^-/ + syn match plugPlus /^+/ + syn match plugStar /^*/ + syn match plugMessage /\(^- \)\@<=.*/ + syn match plugName /\(^- \)\@<=[^ ]*:/ + syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/ + syn match plugTag /(tag: [^)]\+)/ + syn match plugInstall /\(^+ \)\@<=[^:]*/ + syn match plugUpdate /\(^* \)\@<=[^:]*/ + syn match plugCommit /^ \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag + syn match plugEdge /^ \X\+$/ + syn match plugEdge /^ \X*/ contained nextgroup=plugSha + syn match plugSha /[0-9a-f]\{7,9}/ contained + syn match plugRelDate /([^)]*)$/ contained + syn match plugNotLoaded /(not loaded)$/ + syn match plugError /^x.*/ + syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ + syn match plugH2 /^.*:\n-\+$/ + syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean + hi def link plug1 Title + hi def link plug2 Repeat + hi def link plugH2 Type + hi def link plugX Exception + hi def link plugBracket Structure + hi def link plugNumber Number + + hi def link plugDash Special + hi def link plugPlus Constant + hi def link plugStar Boolean + + hi def link plugMessage Function + hi def link plugName Label + hi def link plugInstall Function + hi def link plugUpdate Type + + hi def link plugError Error + hi def link plugDeleted Ignore + hi def link plugRelDate Comment + hi def link plugEdge PreProc + hi def link plugSha Identifier + hi def link plugTag Constant + + hi def link plugNotLoaded Comment +endfunction + +function! s:lpad(str, len) + return a:str . repeat(' ', a:len - len(a:str)) +endfunction + +function! s:lines(msg) + return split(a:msg, "[\r\n]") +endfunction + +function! s:lastline(msg) + return get(s:lines(a:msg), -1, '') +endfunction + +function! s:new_window() + execute get(g:, 'plug_window', 'vertical topleft new') +endfunction + +function! s:plug_window_exists() + let buflist = tabpagebuflist(s:plug_tab) + return !empty(buflist) && index(buflist, s:plug_buf) >= 0 +endfunction + +function! s:switch_in() + if !s:plug_window_exists() + return 0 + endif + + if winbufnr(0) != s:plug_buf + let s:pos = [tabpagenr(), winnr(), winsaveview()] + execute 'normal!' s:plug_tab.'gt' + let winnr = bufwinnr(s:plug_buf) + execute winnr.'wincmd w' + call add(s:pos, winsaveview()) + else + let s:pos = [winsaveview()] + endif + + setlocal modifiable + return 1 +endfunction + +function! s:switch_out(...) + call winrestview(s:pos[-1]) + setlocal nomodifiable + if a:0 > 0 + execute a:1 + endif + + if len(s:pos) > 1 + execute 'normal!' s:pos[0].'gt' + execute s:pos[1] 'wincmd w' + call winrestview(s:pos[2]) + endif +endfunction + +function! s:finish_bindings() + nnoremap R :call retry() + nnoremap D :PlugDiff + nnoremap S :PlugStatus + nnoremap U :call status_update() + xnoremap U :call status_update() + nnoremap ]] :silent! call section('') + nnoremap [[ :silent! call section('b') +endfunction + +function! s:prepare(...) + if empty(s:plug_getcwd()) + throw 'Invalid current working directory. Cannot proceed.' + endif + + for evar in ['$GIT_DIR', '$GIT_WORK_TREE'] + if exists(evar) + throw evar.' detected. Cannot proceed.' + endif + endfor + + call s:job_abort() + if s:switch_in() + if b:plug_preview == 1 + pc + endif + enew + else + call s:new_window() + endif + + nnoremap q :if b:plug_preview==1pcendifbd + if a:0 == 0 + call s:finish_bindings() + endif + let b:plug_preview = -1 + let s:plug_tab = tabpagenr() + let s:plug_buf = winbufnr(0) + call s:assign_name() + + for k in ['', 'L', 'o', 'X', 'd', 'dd'] + execute 'silent! unmap ' k + endfor + setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell + if exists('+colorcolumn') + setlocal colorcolumn= + endif + setf vim-plug + if exists('g:syntax_on') + call s:syntax() + endif +endfunction + +function! s:assign_name() + " Assign buffer name + let prefix = '[Plugins]' + let name = prefix + let idx = 2 + while bufexists(name) + let name = printf('%s (%s)', prefix, idx) + let idx = idx + 1 + endwhile + silent! execute 'f' fnameescape(name) +endfunction + +function! s:chsh(swap) + let prev = [&shell, &shellcmdflag, &shellredir] + if !s:is_win && a:swap + set shell=sh shellredir=>%s\ 2>&1 + endif + return prev +endfunction + +function! s:bang(cmd, ...) + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(a:0) + " FIXME: Escaping is incomplete. We could use shellescape with eval, + " but it won't work on Windows. + let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd + if s:is_win + let [batchfile, cmd] = s:batchfile(cmd) + endif + let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') + execute "normal! :execute g:_plug_bang\\" + finally + unlet g:_plug_bang + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry + return v:shell_error ? 'Exit status: ' . v:shell_error : '' +endfunction + +function! s:regress_bar() + let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '') + call s:progress_bar(2, bar, len(bar)) +endfunction + +function! s:is_updated(dir) + return !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', a:dir)) +endfunction + +function! s:do(pull, force, todo) + for [name, spec] in items(a:todo) + if !isdirectory(spec.dir) + continue + endif + let installed = has_key(s:update.new, name) + let updated = installed ? 0 : + \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir)) + if a:force || installed || updated + execute 'cd' s:esc(spec.dir) + call append(3, '- Post-update hook for '. name .' ... ') + let error = '' + let type = type(spec.do) + if type == s:TYPE.string + if spec.do[0] == ':' + if !get(s:loaded, name, 0) + let s:loaded[name] = 1 + call s:reorg_rtp() + endif + call s:load_plugin(spec) + try + execute spec.do[1:] + catch + let error = v:exception + endtry + if !s:plug_window_exists() + cd - + throw 'Warning: vim-plug was terminated by the post-update hook of '.name + endif + else + let error = s:bang(spec.do) + endif + elseif type == s:TYPE.funcref + try + let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') + call spec.do({ 'name': name, 'status': status, 'force': a:force }) + catch + let error = v:exception + endtry + else + let error = 'Invalid hook type' + endif + call s:switch_in() + call setline(4, empty(error) ? (getline(4) . 'OK') + \ : ('x' . getline(4)[1:] . error)) + if !empty(error) + call add(s:update.errors, name) + call s:regress_bar() + endif + cd - + endif + endfor +endfunction + +function! s:hash_match(a, b) + return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 +endfunction + +function! s:checkout(spec) + let sha = a:spec.commit + let output = s:system('git rev-parse HEAD', a:spec.dir) + if !v:shell_error && !s:hash_match(sha, s:lines(output)[0]) + let output = s:system( + \ 'git fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) + endif + return output +endfunction + +function! s:finish(pull) + let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen')) + if new_frozen + let s = new_frozen > 1 ? 's' : '' + call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s)) + endif + call append(3, '- Finishing ... ') | 4 + redraw + call plug#helptags() + call plug#end() + call setline(4, getline(4) . 'Done!') + redraw + let msgs = [] + if !empty(s:update.errors) + call add(msgs, "Press 'R' to retry.") + endif + if a:pull && len(s:update.new) < len(filter(getline(5, '$'), + \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) + call add(msgs, "Press 'D' to see the updated changes.") + endif + echo join(msgs, ' ') + call s:finish_bindings() +endfunction + +function! s:retry() + if empty(s:update.errors) + return + endif + echo + call s:update_impl(s:update.pull, s:update.force, + \ extend(copy(s:update.errors), [s:update.threads])) +endfunction + +function! s:is_managed(name) + return has_key(g:plugs[a:name], 'uri') +endfunction + +function! s:names(...) + return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)')) +endfunction + +function! s:check_ruby() + silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'") + if !exists('g:plug_ruby') + redraw! + return s:warn('echom', 'Warning: Ruby interface is broken') + endif + let ruby_version = split(g:plug_ruby, '\.') + unlet g:plug_ruby + return s:version_requirement(ruby_version, [1, 8, 7]) +endfunction + +function! s:update_impl(pull, force, args) abort + let sync = index(a:args, '--sync') >= 0 || has('vim_starting') + let args = filter(copy(a:args), 'v:val != "--sync"') + let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? + \ remove(args, -1) : get(g:, 'plug_threads', 16) + + let managed = filter(copy(g:plugs), 's:is_managed(v:key)') + let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') : + \ filter(managed, 'index(args, v:key) >= 0') + + if empty(todo) + return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install')) + endif + + if !s:is_win && s:git_version_requirement(2, 3) + let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : '' + let $GIT_TERMINAL_PROMPT = 0 + for plug in values(todo) + let plug.uri = substitute(plug.uri, + \ '^https://git::@github\.com', 'https://github.com', '') + endfor + endif + + if !isdirectory(g:plug_home) + try + call mkdir(g:plug_home, 'p') + catch + return s:err(printf('Invalid plug directory: %s. '. + \ 'Try to call plug#begin with a valid directory', g:plug_home)) + endtry + endif + + if has('nvim') && !exists('*jobwait') && threads > 1 + call s:warn('echom', '[vim-plug] Update Neovim for parallel installer') + endif + + let use_job = s:nvim || s:vim8 + let python = (has('python') || has('python3')) && !use_job + let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby() + + let s:update = { + \ 'start': reltime(), + \ 'all': todo, + \ 'todo': copy(todo), + \ 'errors': [], + \ 'pull': a:pull, + \ 'force': a:force, + \ 'new': {}, + \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1, + \ 'bar': '', + \ 'fin': 0 + \ } + + call s:prepare(1) + call append(0, ['', '']) + normal! 2G + silent! redraw + + let s:clone_opt = get(g:, 'plug_shallow', 1) ? + \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : '' + + if has('win32unix') || has('wsl') + let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input' + endif + + let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' + + " Python version requirement (>= 2.7) + if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 + redir => pyv + silent python import platform; print platform.python_version() + redir END + let python = s:version_requirement( + \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6]) + endif + + if (python || ruby) && s:update.threads > 1 + try + let imd = &imd + if s:mac_gui + set noimd + endif + if ruby + call s:update_ruby() + else + call s:update_python() + endif + catch + let lines = getline(4, '$') + let printed = {} + silent! 4,$d _ + for line in lines + let name = s:extract_name(line, '.', '') + if empty(name) || !has_key(printed, name) + call append('$', line) + if !empty(name) + let printed[name] = 1 + if line[0] == 'x' && index(s:update.errors, name) < 0 + call add(s:update.errors, name) + end + endif + endif + endfor + finally + let &imd = imd + call s:update_finish() + endtry + else + call s:update_vim() + while use_job && sync + sleep 100m + if s:update.fin + break + endif + endwhile + endif +endfunction + +function! s:log4(name, msg) + call setline(4, printf('- %s (%s)', a:msg, a:name)) + redraw +endfunction + +function! s:update_finish() + if exists('s:git_terminal_prompt') + let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt + endif + if s:switch_in() + call append(3, '- Updating ...') | 4 + for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))')) + let [pos, _] = s:logpos(name) + if !pos + continue + endif + if has_key(spec, 'commit') + call s:log4(name, 'Checking out '.spec.commit) + let out = s:checkout(spec) + elseif has_key(spec, 'tag') + let tag = spec.tag + if tag =~ '\*' + let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir)) + if !v:shell_error && !empty(tags) + let tag = tags[0] + call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) + call append(3, '') + endif + endif + call s:log4(name, 'Checking out '.tag) + let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) + else + let branch = get(spec, 'branch', 'master') + call s:log4(name, 'Merging origin/'.s:esc(branch)) + let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' + \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) + endif + if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && + \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) + call s:log4(name, 'Updating submodules. This may take a while.') + let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) + endif + let msg = s:format_message(v:shell_error ? 'x': '-', name, out) + if v:shell_error + call add(s:update.errors, name) + call s:regress_bar() + silent execute pos 'd _' + call append(4, msg) | 4 + elseif !empty(out) + call setline(pos, msg[0]) + endif + redraw + endfor + silent 4 d _ + try + call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")')) + catch + call s:warn('echom', v:exception) + call s:warn('echo', '') + return + endtry + call s:finish(s:update.pull) + call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.') + call s:switch_out('normal! gg') + endif +endfunction + +function! s:job_abort() + if (!s:nvim && !s:vim8) || !exists('s:jobs') + return + endif + + for [name, j] in items(s:jobs) + if s:nvim + silent! call jobstop(j.jobid) + elseif s:vim8 + silent! call job_stop(j.jobid) + endif + if j.new + call s:rm_rf(g:plugs[name].dir) + endif + endfor + let s:jobs = {} +endfunction + +function! s:last_non_empty_line(lines) + let len = len(a:lines) + for idx in range(len) + let line = a:lines[len-idx-1] + if !empty(line) + return line + endif + endfor + return '' +endfunction + +function! s:job_out_cb(self, data) abort + let self = a:self + let data = remove(self.lines, -1) . a:data + let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]') + call extend(self.lines, lines) + " To reduce the number of buffer updates + let self.tick = get(self, 'tick', -1) + 1 + if !self.running || self.tick % len(s:jobs) == 0 + let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-') + let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines) + call s:log(bullet, self.name, result) + endif +endfunction + +function! s:job_exit_cb(self, data) abort + let a:self.running = 0 + let a:self.error = a:data != 0 + call s:reap(a:self.name) + call s:tick() +endfunction + +function! s:job_cb(fn, job, ch, data) + if !s:plug_window_exists() " plug window closed + return s:job_abort() + endif + call call(a:fn, [a:job, a:data]) +endfunction + +function! s:nvim_cb(job_id, data, event) dict abort + return a:event == 'stdout' ? + \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) : + \ s:job_cb('s:job_exit_cb', self, 0, a:data) +endfunction + +function! s:spawn(name, cmd, opts) + let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], + \ 'new': get(a:opts, 'new', 0) } + let s:jobs[a:name] = job + let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir, 0) : a:cmd + let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] + + if s:nvim + call extend(job, { + \ 'on_stdout': function('s:nvim_cb'), + \ 'on_exit': function('s:nvim_cb'), + \ }) + let jid = s:plug_call('jobstart', argv, job) + if jid > 0 + let job.jobid = jid + else + let job.running = 0 + let job.error = 1 + let job.lines = [jid < 0 ? argv[0].' is not executable' : + \ 'Invalid arguments (or job table is full)'] + endif + elseif s:vim8 + let jid = job_start(s:is_win ? join(argv, ' ') : argv, { + \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), + \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), + \ 'out_mode': 'raw' + \}) + if job_status(jid) == 'run' + let job.jobid = jid + else + let job.running = 0 + let job.error = 1 + let job.lines = ['Failed to start job'] + endif + else + let job.lines = s:lines(call('s:system', [cmd])) + let job.error = v:shell_error != 0 + let job.running = 0 + endif +endfunction + +function! s:reap(name) + let job = s:jobs[a:name] + if job.error + call add(s:update.errors, a:name) + elseif get(job, 'new', 0) + let s:update.new[a:name] = 1 + endif + let s:update.bar .= job.error ? 'x' : '=' + + let bullet = job.error ? 'x' : '-' + let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines) + call s:log(bullet, a:name, empty(result) ? 'OK' : result) + call s:bar() + + call remove(s:jobs, a:name) +endfunction + +function! s:bar() + if s:switch_in() + let total = len(s:update.all) + call setline(1, (s:update.pull ? 'Updating' : 'Installing'). + \ ' plugins ('.len(s:update.bar).'/'.total.')') + call s:progress_bar(2, s:update.bar, total) + call s:switch_out() + endif +endfunction + +function! s:logpos(name) + for i in range(4, line('$')) + if getline(i) =~# '^[-+x*] '.a:name.':' + for j in range(i + 1, line('$')) + if getline(j) !~ '^ ' + return [i, j - 1] + endif + endfor + return [i, i] + endif + endfor + return [0, 0] +endfunction + +function! s:log(bullet, name, lines) + if s:switch_in() + let [b, e] = s:logpos(a:name) + if b > 0 + silent execute printf('%d,%d d _', b, e) + if b > winheight('.') + let b = 4 + endif + else + let b = 4 + endif + " FIXME For some reason, nomodifiable is set after :d in vim8 + setlocal modifiable + call append(b - 1, s:format_message(a:bullet, a:name, a:lines)) + call s:switch_out() + endif +endfunction + +function! s:update_vim() + let s:jobs = {} + + call s:bar() + call s:tick() +endfunction + +function! s:tick() + let pull = s:update.pull + let prog = s:progress_opt(s:nvim || s:vim8) +while 1 " Without TCO, Vim stack is bound to explode + if empty(s:update.todo) + if empty(s:jobs) && !s:update.fin + call s:update_finish() + let s:update.fin = 1 + endif + return + endif + + let name = keys(s:update.todo)[0] + let spec = remove(s:update.todo, name) + let new = empty(globpath(spec.dir, '.git', 1)) + + call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') + redraw + + let has_tag = has_key(spec, 'tag') + if !new + let [error, _] = s:git_validate(spec, 0) + if empty(error) + if pull + let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : '' + call s:spawn(name, printf('git fetch %s %s 2>&1', fetch_opt, prog), { 'dir': spec.dir }) + else + let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 } + endif + else + let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 } + endif + else + call s:spawn(name, + \ printf('git clone %s %s %s %s 2>&1', + \ has_tag ? '' : s:clone_opt, + \ prog, + \ plug#shellescape(spec.uri, {'script': 0}), + \ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 }) + endif + + if !s:jobs[name].running + call s:reap(name) + endif + if len(s:jobs) >= s:update.threads + break + endif +endwhile +endfunction + +function! s:update_python() +let py_exe = has('python') ? 'python' : 'python3' +execute py_exe "<< EOF" +import datetime +import functools +import os +try: + import queue +except ImportError: + import Queue as queue +import random +import re +import shutil +import signal +import subprocess +import tempfile +import threading as thr +import time +import traceback +import vim + +G_NVIM = vim.eval("has('nvim')") == '1' +G_PULL = vim.eval('s:update.pull') == '1' +G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1 +G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)')) +G_CLONE_OPT = vim.eval('s:clone_opt') +G_PROGRESS = vim.eval('s:progress_opt(1)') +G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads')) +G_STOP = thr.Event() +G_IS_WIN = vim.eval('s:is_win') == '1' + +class PlugError(Exception): + def __init__(self, msg): + self.msg = msg +class CmdTimedOut(PlugError): + pass +class CmdFailed(PlugError): + pass +class InvalidURI(PlugError): + pass +class Action(object): + INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] + +class Buffer(object): + def __init__(self, lock, num_plugs, is_pull): + self.bar = '' + self.event = 'Updating' if is_pull else 'Installing' + self.lock = lock + self.maxy = int(vim.eval('winheight(".")')) + self.num_plugs = num_plugs + + def __where(self, name): + """ Find first line with name in current buffer. Return line num. """ + found, lnum = False, 0 + matcher = re.compile('^[-+x*] {0}:'.format(name)) + for line in vim.current.buffer: + if matcher.search(line) is not None: + found = True + break + lnum += 1 + + if not found: + lnum = -1 + return lnum + + def header(self): + curbuf = vim.current.buffer + curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs) + + num_spaces = self.num_plugs - len(self.bar) + curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ') + + with self.lock: + vim.command('normal! 2G') + vim.command('redraw') + + def write(self, action, name, lines): + first, rest = lines[0], lines[1:] + msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)] + msg.extend([' ' + line for line in rest]) + + try: + if action == Action.ERROR: + self.bar += 'x' + vim.command("call add(s:update.errors, '{0}')".format(name)) + elif action == Action.DONE: + self.bar += '=' + + curbuf = vim.current.buffer + lnum = self.__where(name) + if lnum != -1: # Found matching line num + del curbuf[lnum] + if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]): + lnum = 3 + else: + lnum = 3 + curbuf.append(msg, lnum) + + self.header() + except vim.error: + pass + +class Command(object): + CD = 'cd /d' if G_IS_WIN else 'cd' + + def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): + self.cmd = cmd + if cmd_dir: + self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd) + self.timeout = timeout + self.callback = cb if cb else (lambda msg: None) + self.clean = clean if clean else (lambda: None) + self.proc = None + + @property + def alive(self): + """ Returns true only if command still running. """ + return self.proc and self.proc.poll() is None + + def execute(self, ntries=3): + """ Execute the command with ntries if CmdTimedOut. + Returns the output of the command if no Exception. + """ + attempt, finished, limit = 0, False, self.timeout + + while not finished: + try: + attempt += 1 + result = self.try_command() + finished = True + return result + except CmdTimedOut: + if attempt != ntries: + self.notify_retry() + self.timeout += limit + else: + raise + + def notify_retry(self): + """ Retry required for command, notify user. """ + for count in range(3, 0, -1): + if G_STOP.is_set(): + raise KeyboardInterrupt + msg = 'Timeout. Will retry in {0} second{1} ...'.format( + count, 's' if count != 1 else '') + self.callback([msg]) + time.sleep(1) + self.callback(['Retrying ...']) + + def try_command(self): + """ Execute a cmd & poll for callback. Returns list of output. + Raises CmdFailed -> return code for Popen isn't 0 + Raises CmdTimedOut -> command exceeded timeout without new output + """ + first_line = True + + try: + tfile = tempfile.NamedTemporaryFile(mode='w+b') + preexec_fn = not G_IS_WIN and os.setsid or None + self.proc = subprocess.Popen(self.cmd, stdout=tfile, + stderr=subprocess.STDOUT, + stdin=subprocess.PIPE, shell=True, + preexec_fn=preexec_fn) + thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,)) + thrd.start() + + thread_not_started = True + while thread_not_started: + try: + thrd.join(0.1) + thread_not_started = False + except RuntimeError: + pass + + while self.alive: + if G_STOP.is_set(): + raise KeyboardInterrupt + + if first_line or random.random() < G_LOG_PROB: + first_line = False + line = '' if G_IS_WIN else nonblock_read(tfile.name) + if line: + self.callback([line]) + + time_diff = time.time() - os.path.getmtime(tfile.name) + if time_diff > self.timeout: + raise CmdTimedOut(['Timeout!']) + + thrd.join(0.5) + + tfile.seek(0) + result = [line.decode('utf-8', 'replace').rstrip() for line in tfile] + + if self.proc.returncode != 0: + raise CmdFailed([''] + result) + + return result + except: + self.terminate() + raise + + def terminate(self): + """ Terminate process and cleanup. """ + if self.alive: + if G_IS_WIN: + os.kill(self.proc.pid, signal.SIGINT) + else: + os.killpg(self.proc.pid, signal.SIGTERM) + self.clean() + +class Plugin(object): + def __init__(self, name, args, buf_q, lock): + self.name = name + self.args = args + self.buf_q = buf_q + self.lock = lock + self.tag = args.get('tag', 0) + + def manage(self): + try: + if os.path.exists(self.args['dir']): + self.update() + else: + self.install() + with self.lock: + thread_vim_command("let s:update.new['{0}'] = 1".format(self.name)) + except PlugError as exc: + self.write(Action.ERROR, self.name, exc.msg) + except KeyboardInterrupt: + G_STOP.set() + self.write(Action.ERROR, self.name, ['Interrupted!']) + except: + # Any exception except those above print stack trace + msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip()) + self.write(Action.ERROR, self.name, msg.split('\n')) + raise + + def install(self): + target = self.args['dir'] + if target[-1] == '\\': + target = target[0:-1] + + def clean(target): + def _clean(): + try: + shutil.rmtree(target) + except OSError: + pass + return _clean + + self.write(Action.INSTALL, self.name, ['Installing ...']) + callback = functools.partial(self.write, Action.INSTALL, self.name) + cmd = 'git clone {0} {1} {2} {3} 2>&1'.format( + '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], + esc(target)) + com = Command(cmd, None, G_TIMEOUT, callback, clean(target)) + result = com.execute(G_RETRIES) + self.write(Action.DONE, self.name, result[-1:]) + + def repo_uri(self): + cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url' + command = Command(cmd, self.args['dir'], G_TIMEOUT,) + result = command.execute(G_RETRIES) + return result[-1] + + def update(self): + actual_uri = self.repo_uri() + expect_uri = self.args['uri'] + regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$') + ma = regex.match(actual_uri) + mb = regex.match(expect_uri) + if ma is None or mb is None or ma.groups() != mb.groups(): + msg = ['', + 'Invalid URI: {0}'.format(actual_uri), + 'Expected {0}'.format(expect_uri), + 'PlugClean required.'] + raise InvalidURI(msg) + + if G_PULL: + self.write(Action.UPDATE, self.name, ['Updating ...']) + callback = functools.partial(self.write, Action.UPDATE, self.name) + fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else '' + cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS) + com = Command(cmd, self.args['dir'], G_TIMEOUT, callback) + result = com.execute(G_RETRIES) + self.write(Action.DONE, self.name, result[-1:]) + else: + self.write(Action.DONE, self.name, ['Already installed']) + + def write(self, action, name, msg): + self.buf_q.put((action, name, msg)) + +class PlugThread(thr.Thread): + def __init__(self, tname, args): + super(PlugThread, self).__init__() + self.tname = tname + self.args = args + + def run(self): + thr.current_thread().name = self.tname + buf_q, work_q, lock = self.args + + try: + while not G_STOP.is_set(): + name, args = work_q.get_nowait() + plug = Plugin(name, args, buf_q, lock) + plug.manage() + work_q.task_done() + except queue.Empty: + pass + +class RefreshThread(thr.Thread): + def __init__(self, lock): + super(RefreshThread, self).__init__() + self.lock = lock + self.running = True + + def run(self): + while self.running: + with self.lock: + thread_vim_command('noautocmd normal! a') + time.sleep(0.33) + + def stop(self): + self.running = False + +if G_NVIM: + def thread_vim_command(cmd): + vim.session.threadsafe_call(lambda: vim.command(cmd)) +else: + def thread_vim_command(cmd): + vim.command(cmd) + +def esc(name): + return '"' + name.replace('"', '\"') + '"' + +def nonblock_read(fname): + """ Read a file with nonblock flag. Return the last line. """ + fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK) + buf = os.read(fread, 100000).decode('utf-8', 'replace') + os.close(fread) + + line = buf.rstrip('\r\n') + left = max(line.rfind('\r'), line.rfind('\n')) + if left != -1: + left += 1 + line = line[left:] + + return line + +def main(): + thr.current_thread().name = 'main' + nthreads = int(vim.eval('s:update.threads')) + plugs = vim.eval('s:update.todo') + mac_gui = vim.eval('s:mac_gui') == '1' + + lock = thr.Lock() + buf = Buffer(lock, len(plugs), G_PULL) + buf_q, work_q = queue.Queue(), queue.Queue() + for work in plugs.items(): + work_q.put(work) + + start_cnt = thr.active_count() + for num in range(nthreads): + tname = 'PlugT-{0:02}'.format(num) + thread = PlugThread(tname, (buf_q, work_q, lock)) + thread.start() + if mac_gui: + rthread = RefreshThread(lock) + rthread.start() + + while not buf_q.empty() or thr.active_count() != start_cnt: + try: + action, name, msg = buf_q.get(True, 0.25) + buf.write(action, name, ['OK'] if not msg else msg) + buf_q.task_done() + except queue.Empty: + pass + except KeyboardInterrupt: + G_STOP.set() + + if mac_gui: + rthread.stop() + rthread.join() + +main() +EOF +endfunction + +function! s:update_ruby() + ruby << EOF + module PlugStream + SEP = ["\r", "\n", nil] + def get_line + buffer = '' + loop do + char = readchar rescue return + if SEP.include? char.chr + buffer << $/ + break + else + buffer << char + end + end + buffer + end + end unless defined?(PlugStream) + + def esc arg + %["#{arg.gsub('"', '\"')}"] + end + + def killall pid + pids = [pid] + if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM + pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil } + else + unless `which pgrep 2> /dev/null`.empty? + children = pids + until children.empty? + children = children.map { |pid| + `pgrep -P #{pid}`.lines.map { |l| l.chomp } + }.flatten + pids += children + end + end + pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil } + end + end + + def compare_git_uri a, b + regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$} + regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1) + end + + require 'thread' + require 'fileutils' + require 'timeout' + running = true + iswin = VIM::evaluate('s:is_win').to_i == 1 + pull = VIM::evaluate('s:update.pull').to_i == 1 + base = VIM::evaluate('g:plug_home') + all = VIM::evaluate('s:update.todo') + limit = VIM::evaluate('get(g:, "plug_timeout", 60)') + tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1 + nthr = VIM::evaluate('s:update.threads').to_i + maxy = VIM::evaluate('winheight(".")').to_i + vim7 = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/ + cd = iswin ? 'cd /d' : 'cd' + tot = VIM::evaluate('len(s:update.todo)') || 0 + bar = '' + skip = 'Already installed' + mtx = Mutex.new + take1 = proc { mtx.synchronize { running && all.shift } } + logh = proc { + cnt = bar.length + $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})" + $curbuf[2] = '[' + bar.ljust(tot) + ']' + VIM::command('normal! 2G') + VIM::command('redraw') + } + where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } } + log = proc { |name, result, type| + mtx.synchronize do + ing = ![true, false].include?(type) + bar += type ? '=' : 'x' unless ing + b = case type + when :install then '+' when :update then '*' + when true, nil then '-' else + VIM::command("call add(s:update.errors, '#{name}')") + 'x' + end + result = + if type || type.nil? + ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"] + elsif result =~ /^Interrupted|^Timeout/ + ["#{b} #{name}: #{result}"] + else + ["#{b} #{name}"] + result.lines.map { |l| " " << l } + end + if lnum = where.call(name) + $curbuf.delete lnum + lnum = 4 if ing && lnum > maxy + end + result.each_with_index do |line, offset| + $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp) + end + logh.call + end + } + bt = proc { |cmd, name, type, cleanup| + tried = timeout = 0 + begin + tried += 1 + timeout += limit + fd = nil + data = '' + if iswin + Timeout::timeout(timeout) do + tmp = VIM::evaluate('tempname()') + system("(#{cmd}) > #{tmp}") + data = File.read(tmp).chomp + File.unlink tmp rescue nil + end + else + fd = IO.popen(cmd).extend(PlugStream) + first_line = true + log_prob = 1.0 / nthr + while line = Timeout::timeout(timeout) { fd.get_line } + data << line + log.call name, line.chomp, type if name && (first_line || rand < log_prob) + first_line = false + end + fd.close + end + [$? == 0, data.chomp] + rescue Timeout::Error, Interrupt => e + if fd && !fd.closed? + killall fd.pid + fd.close + end + cleanup.call if cleanup + if e.is_a?(Timeout::Error) && tried < tries + 3.downto(1) do |countdown| + s = countdown > 1 ? 's' : '' + log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type + sleep 1 + end + log.call name, 'Retrying ...', type + retry + end + [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"] + end + } + main = Thread.current + threads = [] + watcher = Thread.new { + if vim7 + while VIM::evaluate('getchar(1)') + sleep 0.1 + end + else + require 'io/console' # >= Ruby 1.9 + nil until IO.console.getch == 3.chr + end + mtx.synchronize do + running = false + threads.each { |t| t.raise Interrupt } unless vim7 + end + threads.each { |t| t.join rescue nil } + main.kill + } + refresh = Thread.new { + while true + mtx.synchronize do + break unless running + VIM::command('noautocmd normal! a') + end + sleep 0.2 + end + } if VIM::evaluate('s:mac_gui') == 1 + + clone_opt = VIM::evaluate('s:clone_opt') + progress = VIM::evaluate('s:progress_opt(1)') + nthr.times do + mtx.synchronize do + threads << Thread.new { + while pair = take1.call + name = pair.first + dir, uri, tag = pair.last.values_at *%w[dir uri tag] + exists = File.directory? dir + ok, result = + if exists + chdir = "#{cd} #{iswin ? dir : esc(dir)}" + ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil + current_uri = data.lines.to_a.last + if !ret + if data =~ /^Interrupted|^Timeout/ + [false, data] + else + [false, [data.chomp, "PlugClean required."].join($/)] + end + elsif !compare_git_uri(current_uri, uri) + [false, ["Invalid URI: #{current_uri}", + "Expected: #{uri}", + "PlugClean required."].join($/)] + else + if pull + log.call name, 'Updating ...', :update + fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : '' + bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil + else + [true, skip] + end + end + else + d = esc dir.sub(%r{[\\/]+$}, '') + log.call name, 'Installing ...', :install + bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc { + FileUtils.rm_rf dir + } + end + mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok + log.call name, result, ok + end + } if running + end + end + threads.each { |t| t.join rescue nil } + logh.call + refresh.kill if refresh + watcher.kill +EOF +endfunction + +function! s:shellesc_cmd(arg, script) + let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') + return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') +endfunction + +function! s:shellesc_ps1(arg) + return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" +endfunction + +function! s:shellesc_sh(arg) + return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" +endfunction + +function! plug#shellescape(arg, ...) + let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} + let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') + let script = get(opts, 'script', 1) + if shell =~# 'cmd\.exe' + return s:shellesc_cmd(a:arg, script) + elseif shell =~# 'powershell\.exe' || shell =~# 'pwsh$' + return s:shellesc_ps1(a:arg) + endif + return s:shellesc_sh(a:arg) +endfunction + +function! s:glob_dir(path) + return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)') +endfunction + +function! s:progress_bar(line, bar, total) + call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']') +endfunction + +function! s:compare_git_uri(a, b) + " See `git help clone' + " https:// [user@] github.com[:port] / junegunn/vim-plug [.git] + " [git@] github.com[:port] : junegunn/vim-plug [.git] + " file:// / junegunn/vim-plug [/] + " / junegunn/vim-plug [/] + let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$' + let ma = matchlist(a:a, pat) + let mb = matchlist(a:b, pat) + return ma[1:2] ==# mb[1:2] +endfunction + +function! s:format_message(bullet, name, message) + if a:bullet != 'x' + return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] + else + let lines = map(s:lines(a:message), '" ".v:val') + return extend([printf('x %s:', a:name)], lines) + endif +endfunction + +function! s:with_cd(cmd, dir, ...) + let script = a:0 > 0 ? a:1 : 1 + return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) +endfunction + +function! s:system(cmd, ...) + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(1) + let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd + if s:is_win + let [batchfile, cmd] = s:batchfile(cmd) + endif + return system(cmd) + finally + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry +endfunction + +function! s:system_chomp(...) + let ret = call('s:system', a:000) + return v:shell_error ? '' : substitute(ret, '\n$', '', '') +endfunction + +function! s:git_validate(spec, check_branch) + let err = '' + if isdirectory(a:spec.dir) + let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir)) + let remote = result[-1] + if v:shell_error + let err = join([remote, 'PlugClean required.'], "\n") + elseif !s:compare_git_uri(remote, a:spec.uri) + let err = join(['Invalid URI: '.remote, + \ 'Expected: '.a:spec.uri, + \ 'PlugClean required.'], "\n") + elseif a:check_branch && has_key(a:spec, 'commit') + let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir)) + let sha = result[-1] + if v:shell_error + let err = join(add(result, 'PlugClean required.'), "\n") + elseif !s:hash_match(sha, a:spec.commit) + let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', + \ a:spec.commit[:6], sha[:6]), + \ 'PlugUpdate required.'], "\n") + endif + elseif a:check_branch + let branch = result[0] + " Check tag + if has_key(a:spec, 'tag') + let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) + if a:spec.tag !=# tag && a:spec.tag !~ '\*' + let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', + \ (empty(tag) ? 'N/A' : tag), a:spec.tag) + endif + " Check branch + elseif a:spec.branch !=# branch + let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', + \ branch, a:spec.branch) + endif + if empty(err) + let [ahead, behind] = split(s:lastline(s:system(printf( + \ 'git rev-list --count --left-right HEAD...origin/%s', + \ a:spec.branch), a:spec.dir)), '\t') + if !v:shell_error && ahead + if behind + " Only mention PlugClean if diverged, otherwise it's likely to be + " pushable (and probably not that messed up). + let err = printf( + \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" + \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', a:spec.branch, ahead, behind) + else + let err = printf("Ahead of origin/%s by %d commit(s).\n" + \ .'Cannot update until local changes are pushed.', + \ a:spec.branch, ahead) + endif + endif + endif + endif + else + let err = 'Not found' + endif + return [err, err =~# 'PlugClean'] +endfunction + +function! s:rm_rf(dir) + if isdirectory(a:dir) + call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . plug#shellescape(a:dir)) + endif +endfunction + +function! s:clean(force) + call s:prepare() + call append(0, 'Searching for invalid plugins in '.g:plug_home) + call append(1, '') + + " List of valid directories + let dirs = [] + let errs = {} + let [cnt, total] = [0, len(g:plugs)] + for [name, spec] in items(g:plugs) + if !s:is_managed(name) + call add(dirs, spec.dir) + else + let [err, clean] = s:git_validate(spec, 1) + if clean + let errs[spec.dir] = s:lines(err)[0] + else + call add(dirs, spec.dir) + endif + endif + let cnt += 1 + call s:progress_bar(2, repeat('=', cnt), total) + normal! 2G + redraw + endfor + + let allowed = {} + for dir in dirs + let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1 + let allowed[dir] = 1 + for child in s:glob_dir(dir) + let allowed[child] = 1 + endfor + endfor + + let todo = [] + let found = sort(s:glob_dir(g:plug_home)) + while !empty(found) + let f = remove(found, 0) + if !has_key(allowed, f) && isdirectory(f) + call add(todo, f) + call append(line('$'), '- ' . f) + if has_key(errs, f) + call append(line('$'), ' ' . errs[f]) + endif + let found = filter(found, 'stridx(v:val, f) != 0') + end + endwhile + + 4 + redraw + if empty(todo) + call append(line('$'), 'Already clean.') + else + let s:clean_count = 0 + call append(3, ['Directories to delete:', '']) + redraw! + if a:force || s:ask_no_interrupt('Delete all directories?') + call s:delete([6, line('$')], 1) + else + call setline(4, 'Cancelled.') + nnoremap d :set opfunc=delete_opg@ + nmap dd d_ + xnoremap d :call delete_op(visualmode(), 1) + echo 'Delete the lines (d{motion}) to delete the corresponding directories' + endif + endif + 4 + setlocal nomodifiable +endfunction + +function! s:delete_op(type, ...) + call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0) +endfunction + +function! s:delete(range, force) + let [l1, l2] = a:range + let force = a:force + while l1 <= l2 + let line = getline(l1) + if line =~ '^- ' && isdirectory(line[2:]) + execute l1 + redraw! + let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1) + let force = force || answer > 1 + if answer + call s:rm_rf(line[2:]) + setlocal modifiable + call setline(l1, '~'.line[1:]) + let s:clean_count += 1 + call setline(4, printf('Removed %d directories.', s:clean_count)) + setlocal nomodifiable + endif + endif + let l1 += 1 + endwhile +endfunction + +function! s:upgrade() + echo 'Downloading the latest version of vim-plug' + redraw + let tmp = s:plug_tempname() + let new = tmp . '/plug.vim' + + try + let out = s:system(printf('git clone --depth 1 %s %s', plug#shellescape(s:plug_src), plug#shellescape(tmp))) + if v:shell_error + return s:err('Error upgrading vim-plug: '. out) + endif + + if readfile(s:me) ==# readfile(new) + echo 'vim-plug is already up-to-date' + return 0 + else + call rename(s:me, s:me . '.old') + call rename(new, s:me) + unlet g:loaded_plug + echo 'vim-plug has been upgraded' + return 1 + endif + finally + silent! call s:rm_rf(tmp) + endtry +endfunction + +function! s:upgrade_specs() + for spec in values(g:plugs) + let spec.frozen = get(spec, 'frozen', 0) + endfor +endfunction + +function! s:status() + call s:prepare() + call append(0, 'Checking plugins') + call append(1, '') + + let ecnt = 0 + let unloaded = 0 + let [cnt, total] = [0, len(g:plugs)] + for [name, spec] in items(g:plugs) + let is_dir = isdirectory(spec.dir) + if has_key(spec, 'uri') + if is_dir + let [err, _] = s:git_validate(spec, 1) + let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] + else + let [valid, msg] = [0, 'Not found. Try PlugInstall.'] + endif + else + if is_dir + let [valid, msg] = [1, 'OK'] + else + let [valid, msg] = [0, 'Not found.'] + endif + endif + let cnt += 1 + let ecnt += !valid + " `s:loaded` entry can be missing if PlugUpgraded + if is_dir && get(s:loaded, name, -1) == 0 + let unloaded = 1 + let msg .= ' (not loaded)' + endif + call s:progress_bar(2, repeat('=', cnt), total) + call append(3, s:format_message(valid ? '-' : 'x', name, msg)) + normal! 2G + redraw + endfor + call setline(1, 'Finished. '.ecnt.' error(s).') + normal! gg + setlocal nomodifiable + if unloaded + echo "Press 'L' on each line to load plugin, or 'U' to update" + nnoremap L :call status_load(line('.')) + xnoremap L :call status_load(line('.')) + end +endfunction + +function! s:extract_name(str, prefix, suffix) + return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$') +endfunction + +function! s:status_load(lnum) + let line = getline(a:lnum) + let name = s:extract_name(line, '-', '(not loaded)') + if !empty(name) + call plug#load(name) + setlocal modifiable + call setline(a:lnum, substitute(line, ' (not loaded)$', '', '')) + setlocal nomodifiable + endif +endfunction + +function! s:status_update() range + let lines = getline(a:firstline, a:lastline) + let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)') + if !empty(names) + echo + execute 'PlugUpdate' join(names) + endif +endfunction + +function! s:is_preview_window_open() + silent! wincmd P + if &previewwindow + wincmd p + return 1 + endif +endfunction + +function! s:find_name(lnum) + for lnum in reverse(range(1, a:lnum)) + let line = getline(lnum) + if empty(line) + return '' + endif + let name = s:extract_name(line, '-', '') + if !empty(name) + return name + endif + endfor + return '' +endfunction + +function! s:preview_commit() + if b:plug_preview < 0 + let b:plug_preview = !s:is_preview_window_open() + endif + + let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') + if empty(sha) + return + endif + + let name = s:find_name(line('.')) + if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) + return + endif + + if exists('g:plug_pwindow') && !s:is_preview_window_open() + execute g:plug_pwindow + execute 'e' sha + else + execute 'pedit' sha + wincmd P + endif + setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable + let batchfile = '' + try + let [sh, shellcmdflag, shrd] = s:chsh(1) + let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha + if s:is_win + let [batchfile, cmd] = s:batchfile(cmd) + endif + execute 'silent %!' cmd + finally + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win && filereadable(batchfile) + call delete(batchfile) + endif + endtry + setlocal nomodifiable + nnoremap q :q + wincmd p +endfunction + +function! s:section(flags) + call search('\(^[x-] \)\@<=[^:]\+:', a:flags) +endfunction + +function! s:format_git_log(line) + let indent = ' ' + let tokens = split(a:line, nr2char(1)) + if len(tokens) != 5 + return indent.substitute(a:line, '\s*$', '', '') + endif + let [graph, sha, refs, subject, date] = tokens + let tag = matchstr(refs, 'tag: [^,)]\+') + let tag = empty(tag) ? ' ' : ' ('.tag.') ' + return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date) +endfunction + +function! s:append_ul(lnum, text) + call append(a:lnum, ['', a:text, repeat('-', len(a:text))]) +endfunction + +function! s:diff() + call s:prepare() + call append(0, ['Collecting changes ...', '']) + let cnts = [0, 0] + let bar = '' + let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)') + call s:progress_bar(2, bar, len(total)) + for origin in [1, 0] + let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))')))) + if empty(plugs) + continue + endif + call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') + for [k, v] in plugs + let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' + let cmd = 'git log --graph --color=never ' + \ . (s:git_version_requirement(2, 10, 0) ? '--no-show-signature ' : '') + \ . join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 'plug#shellescape(v:val)')) + if has_key(v, 'rtp') + let cmd .= ' -- '.plug#shellescape(v.rtp) + endif + let diff = s:system_chomp(cmd, v.dir) + if !empty(diff) + let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' + call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) + let cnts[origin] += 1 + endif + let bar .= '=' + call s:progress_bar(2, bar, len(total)) + normal! 2G + redraw + endfor + if !cnts[origin] + call append(5, ['', 'N/A']) + endif + endfor + call setline(1, printf('%d plugin(s) updated.', cnts[0]) + \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) + + if cnts[0] || cnts[1] + nnoremap (plug-preview) :silent! call preview_commit() + if empty(maparg("\", 'n')) + nmap (plug-preview) + endif + if empty(maparg('o', 'n')) + nmap o (plug-preview) + endif + endif + if cnts[0] + nnoremap X :call revert() + echo "Press 'X' on each block to revert the update" + endif + normal! gg + setlocal nomodifiable +endfunction + +function! s:revert() + if search('^Pending updates', 'bnW') + return + endif + + let name = s:find_name(line('.')) + if empty(name) || !has_key(g:plugs, name) || + \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y' + return + endif + + call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir) + setlocal modifiable + normal! "_dap + setlocal nomodifiable + echo 'Reverted' +endfunction + +function! s:snapshot(force, ...) abort + call s:prepare() + setf vim + call append(0, ['" Generated by vim-plug', + \ '" '.strftime("%c"), + \ '" :source this file in vim to restore the snapshot', + \ '" or execute: vim -S snapshot.vim', + \ '', '', 'PlugUpdate!']) + 1 + let anchor = line('$') - 3 + let names = sort(keys(filter(copy(g:plugs), + \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) + for name in reverse(names) + let sha = s:system_chomp('git rev-parse --short HEAD', g:plugs[name].dir) + if !empty(sha) + call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) + redraw + endif + endfor + + if a:0 > 0 + let fn = s:plug_expand(a:1) + if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) + return + endif + call writefile(getline(1, '$'), fn) + echo 'Saved as '.a:1 + silent execute 'e' s:esc(fn) + setf vim + endif +endfunction + +function! s:split_rtp() + return split(&rtp, '\\\@ Date: Wed, 11 Dec 2019 22:17:37 +0100 Subject: [PATCH 15/34] add dotbot config file --- install.conf.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/install.conf.yaml b/install.conf.yaml index e69de29..39852eb 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -0,0 +1,30 @@ +- defaults: + link: + relink: true + create: true + +# clean config and home directory from bad symbolic links +- clean: ['~', '.config/'] + +- link: + ~/.zshrc: + force: true + path: shell/zshrc + ~/.tmux.conf: + path: shell/tmux.conf + ~/.vimrc: + path: vim/vimrc + ~/.vim: + path: vim/vim + ~/.config/nvim: + path: nvim + +- shell: + # install ohmyzsh + - sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + # install vim plug for vim + - curl -fLo vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + # install vim plug for nvim + - curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + # install vim plugins + - vim +PlugInstall +qall From 7c7d4c506ea79d8121f7d2ed4f159eb31def4d87 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 11 Dec 2019 22:38:05 +0100 Subject: [PATCH 16/34] cleanup zshrc and add custom plugins option --- .gitignore | 1 - shell/.gitignore | 2 ++ shell/localcommands.example | 1 + shell/plugins.example | 8 ++++++++ shell/zshrc | 26 ++++++++++++++++---------- 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 shell/.gitignore create mode 100644 shell/localcommands.example create mode 100644 shell/plugins.example diff --git a/.gitignore b/.gitignore index 3f0861e..347b774 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -localcommands vim/bundle/* vim/autoload diff --git a/shell/.gitignore b/shell/.gitignore new file mode 100644 index 0000000..23b1fbf --- /dev/null +++ b/shell/.gitignore @@ -0,0 +1,2 @@ +localcommands +plugins diff --git a/shell/localcommands.example b/shell/localcommands.example new file mode 100644 index 0000000..dca1e02 --- /dev/null +++ b/shell/localcommands.example @@ -0,0 +1 @@ +alias vi="vim" diff --git a/shell/plugins.example b/shell/plugins.example new file mode 100644 index 0000000..60a14d1 --- /dev/null +++ b/shell/plugins.example @@ -0,0 +1,8 @@ +# plugins +plugins=( + git + pip + screen + artisan + fzf +) diff --git a/shell/zshrc b/shell/zshrc index 356619e..3bb9042 100644 --- a/shell/zshrc +++ b/shell/zshrc @@ -4,16 +4,22 @@ export ZSH="$HOME/.oh-my-zsh" ZSH_THEME="robbyrussell" # plugins -plugins=( - git - pip - screen - fzf - artisan -) +if [ -f ~/.dotfiles/shell/plugins ] +then + source ~/.dotfiles/shell/plugins +else + # plugins + plugins=( + git + pip + screen + z + ) +fi source $ZSH/oh-my-zsh.sh + # User configuration # Helper Functions @@ -27,14 +33,14 @@ export EDITOR='vim' # aliases alias ll='ls -l' -alias vi='vim' alias la='ls -la' alias :q='exit' +alias fresh="source ~/.zshrc" # localcommands -if [ -f ~/.dotfiles/localcommands ] +if [ -f ~/.dotfiles/shell/localcommands ] then - source ~/.dotfiles/localcommands + source ~/.dotfiles/shell/localcommands fi # Tmuxinator autocomplete From fa87f6f46dc38ed1faac5479be1de3fbf875954a Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 11 Dec 2019 23:13:24 +0100 Subject: [PATCH 17/34] small fixes to dotbot config --- install.conf.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/install.conf.yaml b/install.conf.yaml index 39852eb..96f6e3b 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -6,10 +6,10 @@ # clean config and home directory from bad symbolic links - clean: ['~', '.config/'] +- create: + - ~/.z + - link: - ~/.zshrc: - force: true - path: shell/zshrc ~/.tmux.conf: path: shell/tmux.conf ~/.vimrc: @@ -18,7 +18,7 @@ path: vim/vim ~/.config/nvim: path: nvim - + - shell: # install ohmyzsh - sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" @@ -28,3 +28,9 @@ - curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim # install vim plugins - vim +PlugInstall +qall + +# do this last to override generated .zshrc +- link: + ~/.zshrc: + force: true + path: shell/zshrc From ebaec2c7d44a894da6307c09ae5abc653dd951b5 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 11 Dec 2019 23:23:02 +0100 Subject: [PATCH 18/34] fix gitignore and small mistakes --- install.conf.yaml | 5 +- shell/plugins.example | 1 + shell/zshrc | 7 +- .gitignore => vim/.gitignore | 0 vim/vim/autoload/plug.vim | 2591 ----------------- .../.vundle/script-names.vim-scripts.org.json | 1 - vim/vim/bundle/ale | 1 - vim/vim/bundle/editorconfig-vim | 1 - vim/vim/bundle/fzf.vim | 1 - vim/vim/bundle/kuroi.vim | 1 - vim/vim/bundle/nerdtree | 1 - vim/vim/bundle/ultisnips | 1 - vim/vim/bundle/vim-airline | 1 - vim/vim/bundle/vim-airline-themes | 1 - vim/vim/bundle/vim-commentary | 1 - vim/vim/bundle/vim-fugitive | 1 - vim/vim/bundle/vim-gitgutter | 1 - vim/vim/bundle/vim-polyglot | 1 - vim/vim/bundle/vim-sandwich | 1 - vim/vim/bundle/vim-tmux-navigator | 1 - vim/vim/bundle/vimtex | 1 - vim/vim/bundle/winresizer | 1 - 22 files changed, 7 insertions(+), 2614 deletions(-) rename .gitignore => vim/.gitignore (100%) delete mode 100644 vim/vim/autoload/plug.vim delete mode 100644 vim/vim/bundle/.vundle/script-names.vim-scripts.org.json delete mode 160000 vim/vim/bundle/ale delete mode 160000 vim/vim/bundle/editorconfig-vim delete mode 160000 vim/vim/bundle/fzf.vim delete mode 160000 vim/vim/bundle/kuroi.vim delete mode 160000 vim/vim/bundle/nerdtree delete mode 160000 vim/vim/bundle/ultisnips delete mode 160000 vim/vim/bundle/vim-airline delete mode 160000 vim/vim/bundle/vim-airline-themes delete mode 160000 vim/vim/bundle/vim-commentary delete mode 160000 vim/vim/bundle/vim-fugitive delete mode 160000 vim/vim/bundle/vim-gitgutter delete mode 160000 vim/vim/bundle/vim-polyglot delete mode 160000 vim/vim/bundle/vim-sandwich delete mode 160000 vim/vim/bundle/vim-tmux-navigator delete mode 160000 vim/vim/bundle/vimtex delete mode 160000 vim/vim/bundle/winresizer diff --git a/install.conf.yaml b/install.conf.yaml index 96f6e3b..4f75000 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -6,9 +6,6 @@ # clean config and home directory from bad symbolic links - clean: ['~', '.config/'] -- create: - - ~/.z - - link: ~/.tmux.conf: path: shell/tmux.conf @@ -23,7 +20,7 @@ # install ohmyzsh - sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" # install vim plug for vim - - curl -fLo vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + - curl -fLo vim/vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim # install vim plug for nvim - curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim # install vim plugins diff --git a/shell/plugins.example b/shell/plugins.example index 60a14d1..bd169c1 100644 --- a/shell/plugins.example +++ b/shell/plugins.example @@ -5,4 +5,5 @@ plugins=( screen artisan fzf + z ) diff --git a/shell/zshrc b/shell/zshrc index 3bb9042..21db026 100644 --- a/shell/zshrc +++ b/shell/zshrc @@ -8,7 +8,6 @@ if [ -f ~/.dotfiles/shell/plugins ] then source ~/.dotfiles/shell/plugins else - # plugins plugins=( git pip @@ -55,4 +54,8 @@ fi export FZF_ALT_C_COMMAND='find . -type d' -export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin" +if _has ruby; +then + export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin" +fi + diff --git a/.gitignore b/vim/.gitignore similarity index 100% rename from .gitignore rename to vim/.gitignore diff --git a/vim/vim/autoload/plug.vim b/vim/vim/autoload/plug.vim deleted file mode 100644 index 92fea62..0000000 --- a/vim/vim/autoload/plug.vim +++ /dev/null @@ -1,2591 +0,0 @@ -" vim-plug: Vim plugin manager -" ============================ -" -" Download plug.vim and put it in ~/.vim/autoload -" -" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ -" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -" -" Edit your .vimrc -" -" call plug#begin('~/.vim/plugged') -" -" " Make sure you use single quotes -" -" " Shorthand notation; fetches https://github.com/junegunn/vim-easy-align -" Plug 'junegunn/vim-easy-align' -" -" " Any valid git URL is allowed -" Plug 'https://github.com/junegunn/vim-github-dashboard.git' -" -" " Multiple Plug commands can be written in a single line using | separators -" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' -" -" " On-demand loading -" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } -" -" " Using a non-master branch -" Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } -" -" " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) -" Plug 'fatih/vim-go', { 'tag': '*' } -" -" " Plugin options -" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } -" -" " Plugin outside ~/.vim/plugged with post-update hook -" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -" -" " Unmanaged plugin (manually installed and updated) -" Plug '~/my-prototype-plugin' -" -" " Initialize plugin system -" call plug#end() -" -" Then reload .vimrc and :PlugInstall to install plugins. -" -" Plug options: -" -"| Option | Description | -"| ----------------------- | ------------------------------------------------ | -"| `branch`/`tag`/`commit` | Branch/tag/commit of the repository to use | -"| `rtp` | Subdirectory that contains Vim plugin | -"| `dir` | Custom directory for the plugin | -"| `as` | Use different name for the plugin | -"| `do` | Post-update hook (string or funcref) | -"| `on` | On-demand loading: Commands or ``-mappings | -"| `for` | On-demand loading: File types | -"| `frozen` | Do not update unless explicitly specified | -" -" More information: https://github.com/junegunn/vim-plug -" -" -" Copyright (c) 2017 Junegunn Choi -" -" MIT License -" -" Permission is hereby granted, free of charge, to any person obtaining -" a copy of this software and associated documentation files (the -" "Software"), to deal in the Software without restriction, including -" without limitation the rights to use, copy, modify, merge, publish, -" distribute, sublicense, and/or sell copies of the Software, and to -" permit persons to whom the Software is furnished to do so, subject to -" the following conditions: -" -" The above copyright notice and this permission notice shall be -" included in all copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -if exists('g:loaded_plug') - finish -endif -let g:loaded_plug = 1 - -let s:cpo_save = &cpo -set cpo&vim - -let s:plug_src = 'https://github.com/junegunn/vim-plug.git' -let s:plug_tab = get(s:, 'plug_tab', -1) -let s:plug_buf = get(s:, 'plug_buf', -1) -let s:mac_gui = has('gui_macvim') && has('gui_running') -let s:is_win = has('win32') -let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) -let s:vim8 = has('patch-8.0.0039') && exists('*job_start') -if s:is_win && &shellslash - set noshellslash - let s:me = resolve(expand(':p')) - set shellslash -else - let s:me = resolve(expand(':p')) -endif -let s:base_spec = { 'branch': 'master', 'frozen': 0 } -let s:TYPE = { -\ 'string': type(''), -\ 'list': type([]), -\ 'dict': type({}), -\ 'funcref': type(function('call')) -\ } -let s:loaded = get(s:, 'loaded', {}) -let s:triggers = get(s:, 'triggers', {}) - -if s:is_win - function! s:plug_call(fn, ...) - let shellslash = &shellslash - try - set noshellslash - return call(a:fn, a:000) - finally - let &shellslash = shellslash - endtry - endfunction -else - function! s:plug_call(fn, ...) - return call(a:fn, a:000) - endfunction -endif - -function! s:plug_getcwd() - return s:plug_call('getcwd') -endfunction - -function! s:plug_fnamemodify(fname, mods) - return s:plug_call('fnamemodify', a:fname, a:mods) -endfunction - -function! s:plug_expand(fmt) - return s:plug_call('expand', a:fmt, 1) -endfunction - -function! s:plug_tempname() - return s:plug_call('tempname') -endfunction - -function! plug#begin(...) - if a:0 > 0 - let s:plug_home_org = a:1 - let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) - elseif exists('g:plug_home') - let home = s:path(g:plug_home) - elseif !empty(&rtp) - let home = s:path(split(&rtp, ',')[0]) . '/plugged' - else - return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') - endif - if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp - return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') - endif - - let g:plug_home = home - let g:plugs = {} - let g:plugs_order = [] - let s:triggers = {} - - call s:define_commands() - return 1 -endfunction - -function! s:define_commands() - command! -nargs=+ -bar Plug call plug#() - if !executable('git') - return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') - endif - if has('win32') - \ && &shellslash - \ && (&shell =~# 'cmd\.exe' || &shell =~# 'powershell\.exe') - return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') - endif - if !has('nvim') - \ && (has('win32') || has('win32unix')) - \ && (!has('multi_byte') || !has('iconv')) - return s:err('Vim needs +iconv, +multi_byte features on Windows to run shell commands.') - endif - command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(0, []) - command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(0, []) - command! -nargs=0 -bar -bang PlugClean call s:clean(0) - command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif - command! -nargs=0 -bar PlugStatus call s:status() - command! -nargs=0 -bar PlugDiff call s:diff() - command! -nargs=? -bar -bang -complete=file PlugSnapshot call s:snapshot(0, ) -endfunction - -function! s:to_a(v) - return type(a:v) == s:TYPE.list ? a:v : [a:v] -endfunction - -function! s:to_s(v) - return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n" -endfunction - -function! s:glob(from, pattern) - return s:lines(globpath(a:from, a:pattern)) -endfunction - -function! s:source(from, ...) - let found = 0 - for pattern in a:000 - for vim in s:glob(a:from, pattern) - execute 'source' s:esc(vim) - let found = 1 - endfor - endfor - return found -endfunction - -function! s:assoc(dict, key, val) - let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) -endfunction - -function! s:ask(message, ...) - call inputsave() - echohl WarningMsg - let answer = input(a:message.(a:0 ? ' (y/N/a) ' : ' (y/N) ')) - echohl None - call inputrestore() - echo "\r" - return (a:0 && answer =~? '^a') ? 2 : (answer =~? '^y') ? 1 : 0 -endfunction - -function! s:ask_no_interrupt(...) - try - return call('s:ask', a:000) - catch - return 0 - endtry -endfunction - -function! s:lazy(plug, opt) - return has_key(a:plug, a:opt) && - \ (empty(s:to_a(a:plug[a:opt])) || - \ !isdirectory(a:plug.dir) || - \ len(s:glob(s:rtp(a:plug), 'plugin')) || - \ len(s:glob(s:rtp(a:plug), 'after/plugin'))) -endfunction - -function! plug#end() - if !exists('g:plugs') - return s:err('Call plug#begin() first') - endif - - if exists('#PlugLOD') - augroup PlugLOD - autocmd! - augroup END - augroup! PlugLOD - endif - let lod = { 'ft': {}, 'map': {}, 'cmd': {} } - - if exists('g:did_load_filetypes') - filetype off - endif - for name in g:plugs_order - if !has_key(g:plugs, name) - continue - endif - let plug = g:plugs[name] - if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for') - let s:loaded[name] = 1 - continue - endif - - if has_key(plug, 'on') - let s:triggers[name] = { 'map': [], 'cmd': [] } - for cmd in s:to_a(plug.on) - if cmd =~? '^.\+' - if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i')) - call s:assoc(lod.map, cmd, name) - endif - call add(s:triggers[name].map, cmd) - elseif cmd =~# '^[A-Z]' - let cmd = substitute(cmd, '!*$', '', '') - if exists(':'.cmd) != 2 - call s:assoc(lod.cmd, cmd, name) - endif - call add(s:triggers[name].cmd, cmd) - else - call s:err('Invalid `on` option: '.cmd. - \ '. Should start with an uppercase letter or ``.') - endif - endfor - endif - - if has_key(plug, 'for') - let types = s:to_a(plug.for) - if !empty(types) - augroup filetypedetect - call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') - augroup END - endif - for type in types - call s:assoc(lod.ft, type, name) - endfor - endif - endfor - - for [cmd, names] in items(lod.cmd) - execute printf( - \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "", , , , %s)', - \ cmd, string(cmd), string(names)) - endfor - - for [map, names] in items(lod.map) - for [mode, map_prefix, key_prefix] in - \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] - execute printf( - \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', - \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) - endfor - endfor - - for [ft, names] in items(lod.ft) - augroup PlugLOD - execute printf('autocmd FileType %s call lod_ft(%s, %s)', - \ ft, string(ft), string(names)) - augroup END - endfor - - call s:reorg_rtp() - filetype plugin indent on - if has('vim_starting') - if has('syntax') && !exists('g:syntax_on') - syntax enable - end - else - call s:reload_plugins() - endif -endfunction - -function! s:loaded_names() - return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') -endfunction - -function! s:load_plugin(spec) - call s:source(s:rtp(a:spec), 'plugin/**/*.vim', 'after/plugin/**/*.vim') -endfunction - -function! s:reload_plugins() - for name in s:loaded_names() - call s:load_plugin(g:plugs[name]) - endfor -endfunction - -function! s:trim(str) - return substitute(a:str, '[\/]\+$', '', '') -endfunction - -function! s:version_requirement(val, min) - for idx in range(0, len(a:min) - 1) - let v = get(a:val, idx, 0) - if v < a:min[idx] | return 0 - elseif v > a:min[idx] | return 1 - endif - endfor - return 1 -endfunction - -function! s:git_version_requirement(...) - if !exists('s:git_version') - let s:git_version = map(split(split(s:system('git --version'))[2], '\.'), 'str2nr(v:val)') - endif - return s:version_requirement(s:git_version, a:000) -endfunction - -function! s:progress_opt(base) - return a:base && !s:is_win && - \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' -endfunction - -function! s:rtp(spec) - return s:path(a:spec.dir . get(a:spec, 'rtp', '')) -endfunction - -if s:is_win - function! s:path(path) - return s:trim(substitute(a:path, '/', '\', 'g')) - endfunction - - function! s:dirpath(path) - return s:path(a:path) . '\' - endfunction - - function! s:is_local_plug(repo) - return a:repo =~? '^[a-z]:\|^[%~]' - endfunction - - " Copied from fzf - let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) - function! s:wrap_cmds(cmds) - return map([ - \ '@echo off', - \ 'setlocal enabledelayedexpansion'] - \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) - \ + ['endlocal'], - \ printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) - endfunction - - function! s:batchfile(cmd) - let batchfile = s:plug_tempname().'.bat' - call writefile(s:wrap_cmds(a:cmd), batchfile) - let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) - if &shell =~# 'powershell\.exe' - let cmd = '& ' . cmd - endif - return [batchfile, cmd] - endfunction -else - function! s:path(path) - return s:trim(a:path) - endfunction - - function! s:dirpath(path) - return substitute(a:path, '[/\\]*$', '/', '') - endfunction - - function! s:is_local_plug(repo) - return a:repo[0] =~ '[/$~]' - endfunction -endif - -function! s:err(msg) - echohl ErrorMsg - echom '[vim-plug] '.a:msg - echohl None -endfunction - -function! s:warn(cmd, msg) - echohl WarningMsg - execute a:cmd 'a:msg' - echohl None -endfunction - -function! s:esc(path) - return escape(a:path, ' ') -endfunction - -function! s:escrtp(path) - return escape(a:path, ' ,') -endfunction - -function! s:remove_rtp() - for name in s:loaded_names() - let rtp = s:rtp(g:plugs[name]) - execute 'set rtp-='.s:escrtp(rtp) - let after = globpath(rtp, 'after') - if isdirectory(after) - execute 'set rtp-='.s:escrtp(after) - endif - endfor -endfunction - -function! s:reorg_rtp() - if !empty(s:first_rtp) - execute 'set rtp-='.s:first_rtp - execute 'set rtp-='.s:last_rtp - endif - - " &rtp is modified from outside - if exists('s:prtp') && s:prtp !=# &rtp - call s:remove_rtp() - unlet! s:middle - endif - - let s:middle = get(s:, 'middle', &rtp) - let rtps = map(s:loaded_names(), 's:rtp(g:plugs[v:val])') - let afters = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)') - let rtp = join(map(rtps, 'escape(v:val, ",")'), ',') - \ . ','.s:middle.',' - \ . join(map(afters, 'escape(v:val, ",")'), ',') - let &rtp = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g') - let s:prtp = &rtp - - if !empty(s:first_rtp) - execute 'set rtp^='.s:first_rtp - execute 'set rtp+='.s:last_rtp - endif -endfunction - -function! s:doautocmd(...) - if exists('#'.join(a:000, '#')) - execute 'doautocmd' ((v:version > 703 || has('patch442')) ? '' : '') join(a:000) - endif -endfunction - -function! s:dobufread(names) - for name in a:names - let path = s:rtp(g:plugs[name]) - for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] - if len(finddir(dir, path)) - if exists('#BufRead') - doautocmd BufRead - endif - return - endif - endfor - endfor -endfunction - -function! plug#load(...) - if a:0 == 0 - return s:err('Argument missing: plugin name(s) required') - endif - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 - let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') - if !empty(unknowns) - let s = len(unknowns) > 1 ? 's' : '' - return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) - end - let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') - if !empty(unloaded) - for name in unloaded - call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - endfor - call s:dobufread(unloaded) - return 1 - end - return 0 -endfunction - -function! s:remove_triggers(name) - if !has_key(s:triggers, a:name) - return - endif - for cmd in s:triggers[a:name].cmd - execute 'silent! delc' cmd - endfor - for map in s:triggers[a:name].map - execute 'silent! unmap' map - execute 'silent! iunmap' map - endfor - call remove(s:triggers, a:name) -endfunction - -function! s:lod(names, types, ...) - for name in a:names - call s:remove_triggers(name) - let s:loaded[name] = 1 - endfor - call s:reorg_rtp() - - for name in a:names - let rtp = s:rtp(g:plugs[name]) - for dir in a:types - call s:source(rtp, dir.'/**/*.vim') - endfor - if a:0 - if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) - execute 'runtime' a:1 - endif - call s:source(rtp, a:2) - endif - call s:doautocmd('User', name) - endfor -endfunction - -function! s:lod_ft(pat, names) - let syn = 'syntax/'.a:pat.'.vim' - call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) - execute 'autocmd! PlugLOD FileType' a:pat - call s:doautocmd('filetypeplugin', 'FileType') - call s:doautocmd('filetypeindent', 'FileType') -endfunction - -function! s:lod_cmd(cmd, bang, l1, l2, args, names) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) -endfunction - -function! s:lod_map(map, names, with_prefix, prefix) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - call s:dobufread(a:names) - let extra = '' - while 1 - let c = getchar(0) - if c == 0 - break - endif - let extra .= nr2char(c) - endwhile - - if a:with_prefix - let prefix = v:count ? v:count : '' - let prefix .= '"'.v:register.a:prefix - if mode(1) == 'no' - if v:operator == 'c' - let prefix = "\" . prefix - endif - let prefix .= v:operator - endif - call feedkeys(prefix, 'n') - endif - call feedkeys(substitute(a:map, '^', "\", '') . extra) -endfunction - -function! plug#(repo, ...) - if a:0 > 1 - return s:err('Invalid number of arguments (1..2)') - endif - - try - let repo = s:trim(a:repo) - let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec - let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??')) - let spec = extend(s:infer_properties(name, repo), opts) - if !has_key(g:plugs, name) - call add(g:plugs_order, name) - endif - let g:plugs[name] = spec - let s:loaded[name] = get(s:loaded, name, 0) - catch - return s:err(v:exception) - endtry -endfunction - -function! s:parse_options(arg) - let opts = copy(s:base_spec) - let type = type(a:arg) - if type == s:TYPE.string - let opts.tag = a:arg - elseif type == s:TYPE.dict - call extend(opts, a:arg) - if has_key(opts, 'dir') - let opts.dir = s:dirpath(s:plug_expand(opts.dir)) - endif - else - throw 'Invalid argument type (expected: string or dictionary)' - endif - return opts -endfunction - -function! s:infer_properties(name, repo) - let repo = a:repo - if s:is_local_plug(repo) - return { 'dir': s:dirpath(s:plug_expand(repo)) } - else - if repo =~ ':' - let uri = repo - else - if repo !~ '/' - throw printf('Invalid argument: %s (implicit `vim-scripts'' expansion is deprecated)', repo) - endif - let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') - let uri = printf(fmt, repo) - endif - return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri } - endif -endfunction - -function! s:install(force, names) - call s:update_impl(0, a:force, a:names) -endfunction - -function! s:update(force, names) - call s:update_impl(1, a:force, a:names) -endfunction - -function! plug#helptags() - if !exists('g:plugs') - return s:err('plug#begin was not called') - endif - for spec in values(g:plugs) - let docd = join([s:rtp(spec), 'doc'], '/') - if isdirectory(docd) - silent! execute 'helptags' s:esc(docd) - endif - endfor - return 1 -endfunction - -function! s:syntax() - syntax clear - syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber - syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX - syn match plugNumber /[0-9]\+[0-9.]*/ contained - syn match plugBracket /[[\]]/ contained - syn match plugX /x/ contained - syn match plugDash /^-/ - syn match plugPlus /^+/ - syn match plugStar /^*/ - syn match plugMessage /\(^- \)\@<=.*/ - syn match plugName /\(^- \)\@<=[^ ]*:/ - syn match plugSha /\%(: \)\@<=[0-9a-f]\{4,}$/ - syn match plugTag /(tag: [^)]\+)/ - syn match plugInstall /\(^+ \)\@<=[^:]*/ - syn match plugUpdate /\(^* \)\@<=[^:]*/ - syn match plugCommit /^ \X*[0-9a-f]\{7,9} .*/ contains=plugRelDate,plugEdge,plugTag - syn match plugEdge /^ \X\+$/ - syn match plugEdge /^ \X*/ contained nextgroup=plugSha - syn match plugSha /[0-9a-f]\{7,9}/ contained - syn match plugRelDate /([^)]*)$/ contained - syn match plugNotLoaded /(not loaded)$/ - syn match plugError /^x.*/ - syn region plugDeleted start=/^\~ .*/ end=/^\ze\S/ - syn match plugH2 /^.*:\n-\+$/ - syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean - hi def link plug1 Title - hi def link plug2 Repeat - hi def link plugH2 Type - hi def link plugX Exception - hi def link plugBracket Structure - hi def link plugNumber Number - - hi def link plugDash Special - hi def link plugPlus Constant - hi def link plugStar Boolean - - hi def link plugMessage Function - hi def link plugName Label - hi def link plugInstall Function - hi def link plugUpdate Type - - hi def link plugError Error - hi def link plugDeleted Ignore - hi def link plugRelDate Comment - hi def link plugEdge PreProc - hi def link plugSha Identifier - hi def link plugTag Constant - - hi def link plugNotLoaded Comment -endfunction - -function! s:lpad(str, len) - return a:str . repeat(' ', a:len - len(a:str)) -endfunction - -function! s:lines(msg) - return split(a:msg, "[\r\n]") -endfunction - -function! s:lastline(msg) - return get(s:lines(a:msg), -1, '') -endfunction - -function! s:new_window() - execute get(g:, 'plug_window', 'vertical topleft new') -endfunction - -function! s:plug_window_exists() - let buflist = tabpagebuflist(s:plug_tab) - return !empty(buflist) && index(buflist, s:plug_buf) >= 0 -endfunction - -function! s:switch_in() - if !s:plug_window_exists() - return 0 - endif - - if winbufnr(0) != s:plug_buf - let s:pos = [tabpagenr(), winnr(), winsaveview()] - execute 'normal!' s:plug_tab.'gt' - let winnr = bufwinnr(s:plug_buf) - execute winnr.'wincmd w' - call add(s:pos, winsaveview()) - else - let s:pos = [winsaveview()] - endif - - setlocal modifiable - return 1 -endfunction - -function! s:switch_out(...) - call winrestview(s:pos[-1]) - setlocal nomodifiable - if a:0 > 0 - execute a:1 - endif - - if len(s:pos) > 1 - execute 'normal!' s:pos[0].'gt' - execute s:pos[1] 'wincmd w' - call winrestview(s:pos[2]) - endif -endfunction - -function! s:finish_bindings() - nnoremap R :call retry() - nnoremap D :PlugDiff - nnoremap S :PlugStatus - nnoremap U :call status_update() - xnoremap U :call status_update() - nnoremap ]] :silent! call section('') - nnoremap [[ :silent! call section('b') -endfunction - -function! s:prepare(...) - if empty(s:plug_getcwd()) - throw 'Invalid current working directory. Cannot proceed.' - endif - - for evar in ['$GIT_DIR', '$GIT_WORK_TREE'] - if exists(evar) - throw evar.' detected. Cannot proceed.' - endif - endfor - - call s:job_abort() - if s:switch_in() - if b:plug_preview == 1 - pc - endif - enew - else - call s:new_window() - endif - - nnoremap q :if b:plug_preview==1pcendifbd - if a:0 == 0 - call s:finish_bindings() - endif - let b:plug_preview = -1 - let s:plug_tab = tabpagenr() - let s:plug_buf = winbufnr(0) - call s:assign_name() - - for k in ['', 'L', 'o', 'X', 'd', 'dd'] - execute 'silent! unmap ' k - endfor - setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell - if exists('+colorcolumn') - setlocal colorcolumn= - endif - setf vim-plug - if exists('g:syntax_on') - call s:syntax() - endif -endfunction - -function! s:assign_name() - " Assign buffer name - let prefix = '[Plugins]' - let name = prefix - let idx = 2 - while bufexists(name) - let name = printf('%s (%s)', prefix, idx) - let idx = idx + 1 - endwhile - silent! execute 'f' fnameescape(name) -endfunction - -function! s:chsh(swap) - let prev = [&shell, &shellcmdflag, &shellredir] - if !s:is_win && a:swap - set shell=sh shellredir=>%s\ 2>&1 - endif - return prev -endfunction - -function! s:bang(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(a:0) - " FIXME: Escaping is incomplete. We could use shellescape with eval, - " but it won't work on Windows. - let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') - execute "normal! :execute g:_plug_bang\\" - finally - unlet g:_plug_bang - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry - return v:shell_error ? 'Exit status: ' . v:shell_error : '' -endfunction - -function! s:regress_bar() - let bar = substitute(getline(2)[1:-2], '.*\zs=', 'x', '') - call s:progress_bar(2, bar, len(bar)) -endfunction - -function! s:is_updated(dir) - return !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', a:dir)) -endfunction - -function! s:do(pull, force, todo) - for [name, spec] in items(a:todo) - if !isdirectory(spec.dir) - continue - endif - let installed = has_key(s:update.new, name) - let updated = installed ? 0 : - \ (a:pull && index(s:update.errors, name) < 0 && s:is_updated(spec.dir)) - if a:force || installed || updated - execute 'cd' s:esc(spec.dir) - call append(3, '- Post-update hook for '. name .' ... ') - let error = '' - let type = type(spec.do) - if type == s:TYPE.string - if spec.do[0] == ':' - if !get(s:loaded, name, 0) - let s:loaded[name] = 1 - call s:reorg_rtp() - endif - call s:load_plugin(spec) - try - execute spec.do[1:] - catch - let error = v:exception - endtry - if !s:plug_window_exists() - cd - - throw 'Warning: vim-plug was terminated by the post-update hook of '.name - endif - else - let error = s:bang(spec.do) - endif - elseif type == s:TYPE.funcref - try - let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') - call spec.do({ 'name': name, 'status': status, 'force': a:force }) - catch - let error = v:exception - endtry - else - let error = 'Invalid hook type' - endif - call s:switch_in() - call setline(4, empty(error) ? (getline(4) . 'OK') - \ : ('x' . getline(4)[1:] . error)) - if !empty(error) - call add(s:update.errors, name) - call s:regress_bar() - endif - cd - - endif - endfor -endfunction - -function! s:hash_match(a, b) - return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 -endfunction - -function! s:checkout(spec) - let sha = a:spec.commit - let output = s:system('git rev-parse HEAD', a:spec.dir) - if !v:shell_error && !s:hash_match(sha, s:lines(output)[0]) - let output = s:system( - \ 'git fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) - endif - return output -endfunction - -function! s:finish(pull) - let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen')) - if new_frozen - let s = new_frozen > 1 ? 's' : '' - call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s)) - endif - call append(3, '- Finishing ... ') | 4 - redraw - call plug#helptags() - call plug#end() - call setline(4, getline(4) . 'Done!') - redraw - let msgs = [] - if !empty(s:update.errors) - call add(msgs, "Press 'R' to retry.") - endif - if a:pull && len(s:update.new) < len(filter(getline(5, '$'), - \ "v:val =~ '^- ' && v:val !~# 'Already up.to.date'")) - call add(msgs, "Press 'D' to see the updated changes.") - endif - echo join(msgs, ' ') - call s:finish_bindings() -endfunction - -function! s:retry() - if empty(s:update.errors) - return - endif - echo - call s:update_impl(s:update.pull, s:update.force, - \ extend(copy(s:update.errors), [s:update.threads])) -endfunction - -function! s:is_managed(name) - return has_key(g:plugs[a:name], 'uri') -endfunction - -function! s:names(...) - return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)')) -endfunction - -function! s:check_ruby() - silent! ruby require 'thread'; VIM::command("let g:plug_ruby = '#{RUBY_VERSION}'") - if !exists('g:plug_ruby') - redraw! - return s:warn('echom', 'Warning: Ruby interface is broken') - endif - let ruby_version = split(g:plug_ruby, '\.') - unlet g:plug_ruby - return s:version_requirement(ruby_version, [1, 8, 7]) -endfunction - -function! s:update_impl(pull, force, args) abort - let sync = index(a:args, '--sync') >= 0 || has('vim_starting') - let args = filter(copy(a:args), 'v:val != "--sync"') - let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? - \ remove(args, -1) : get(g:, 'plug_threads', 16) - - let managed = filter(copy(g:plugs), 's:is_managed(v:key)') - let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') : - \ filter(managed, 'index(args, v:key) >= 0') - - if empty(todo) - return s:warn('echo', 'No plugin to '. (a:pull ? 'update' : 'install')) - endif - - if !s:is_win && s:git_version_requirement(2, 3) - let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : '' - let $GIT_TERMINAL_PROMPT = 0 - for plug in values(todo) - let plug.uri = substitute(plug.uri, - \ '^https://git::@github\.com', 'https://github.com', '') - endfor - endif - - if !isdirectory(g:plug_home) - try - call mkdir(g:plug_home, 'p') - catch - return s:err(printf('Invalid plug directory: %s. '. - \ 'Try to call plug#begin with a valid directory', g:plug_home)) - endtry - endif - - if has('nvim') && !exists('*jobwait') && threads > 1 - call s:warn('echom', '[vim-plug] Update Neovim for parallel installer') - endif - - let use_job = s:nvim || s:vim8 - let python = (has('python') || has('python3')) && !use_job - let ruby = has('ruby') && !use_job && (v:version >= 703 || v:version == 702 && has('patch374')) && !(s:is_win && has('gui_running')) && threads > 1 && s:check_ruby() - - let s:update = { - \ 'start': reltime(), - \ 'all': todo, - \ 'todo': copy(todo), - \ 'errors': [], - \ 'pull': a:pull, - \ 'force': a:force, - \ 'new': {}, - \ 'threads': (python || ruby || use_job) ? min([len(todo), threads]) : 1, - \ 'bar': '', - \ 'fin': 0 - \ } - - call s:prepare(1) - call append(0, ['', '']) - normal! 2G - silent! redraw - - let s:clone_opt = get(g:, 'plug_shallow', 1) ? - \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : '' - - if has('win32unix') || has('wsl') - let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input' - endif - - let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : '' - - " Python version requirement (>= 2.7) - if python && !has('python3') && !ruby && !use_job && s:update.threads > 1 - redir => pyv - silent python import platform; print platform.python_version() - redir END - let python = s:version_requirement( - \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6]) - endif - - if (python || ruby) && s:update.threads > 1 - try - let imd = &imd - if s:mac_gui - set noimd - endif - if ruby - call s:update_ruby() - else - call s:update_python() - endif - catch - let lines = getline(4, '$') - let printed = {} - silent! 4,$d _ - for line in lines - let name = s:extract_name(line, '.', '') - if empty(name) || !has_key(printed, name) - call append('$', line) - if !empty(name) - let printed[name] = 1 - if line[0] == 'x' && index(s:update.errors, name) < 0 - call add(s:update.errors, name) - end - endif - endif - endfor - finally - let &imd = imd - call s:update_finish() - endtry - else - call s:update_vim() - while use_job && sync - sleep 100m - if s:update.fin - break - endif - endwhile - endif -endfunction - -function! s:log4(name, msg) - call setline(4, printf('- %s (%s)', a:msg, a:name)) - redraw -endfunction - -function! s:update_finish() - if exists('s:git_terminal_prompt') - let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt - endif - if s:switch_in() - call append(3, '- Updating ...') | 4 - for [name, spec] in items(filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && (s:update.force || s:update.pull || has_key(s:update.new, v:key))')) - let [pos, _] = s:logpos(name) - if !pos - continue - endif - if has_key(spec, 'commit') - call s:log4(name, 'Checking out '.spec.commit) - let out = s:checkout(spec) - elseif has_key(spec, 'tag') - let tag = spec.tag - if tag =~ '\*' - let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir)) - if !v:shell_error && !empty(tags) - let tag = tags[0] - call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) - call append(3, '') - endif - endif - call s:log4(name, 'Checking out '.tag) - let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) - else - let branch = get(spec, 'branch', 'master') - call s:log4(name, 'Merging origin/'.s:esc(branch)) - let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' - \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) - endif - if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && - \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) - call s:log4(name, 'Updating submodules. This may take a while.') - let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir) - endif - let msg = s:format_message(v:shell_error ? 'x': '-', name, out) - if v:shell_error - call add(s:update.errors, name) - call s:regress_bar() - silent execute pos 'd _' - call append(4, msg) | 4 - elseif !empty(out) - call setline(pos, msg[0]) - endif - redraw - endfor - silent 4 d _ - try - call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'index(s:update.errors, v:key) < 0 && has_key(v:val, "do")')) - catch - call s:warn('echom', v:exception) - call s:warn('echo', '') - return - endtry - call s:finish(s:update.pull) - call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.') - call s:switch_out('normal! gg') - endif -endfunction - -function! s:job_abort() - if (!s:nvim && !s:vim8) || !exists('s:jobs') - return - endif - - for [name, j] in items(s:jobs) - if s:nvim - silent! call jobstop(j.jobid) - elseif s:vim8 - silent! call job_stop(j.jobid) - endif - if j.new - call s:rm_rf(g:plugs[name].dir) - endif - endfor - let s:jobs = {} -endfunction - -function! s:last_non_empty_line(lines) - let len = len(a:lines) - for idx in range(len) - let line = a:lines[len-idx-1] - if !empty(line) - return line - endif - endfor - return '' -endfunction - -function! s:job_out_cb(self, data) abort - let self = a:self - let data = remove(self.lines, -1) . a:data - let lines = map(split(data, "\n", 1), 'split(v:val, "\r", 1)[-1]') - call extend(self.lines, lines) - " To reduce the number of buffer updates - let self.tick = get(self, 'tick', -1) + 1 - if !self.running || self.tick % len(s:jobs) == 0 - let bullet = self.running ? (self.new ? '+' : '*') : (self.error ? 'x' : '-') - let result = self.error ? join(self.lines, "\n") : s:last_non_empty_line(self.lines) - call s:log(bullet, self.name, result) - endif -endfunction - -function! s:job_exit_cb(self, data) abort - let a:self.running = 0 - let a:self.error = a:data != 0 - call s:reap(a:self.name) - call s:tick() -endfunction - -function! s:job_cb(fn, job, ch, data) - if !s:plug_window_exists() " plug window closed - return s:job_abort() - endif - call call(a:fn, [a:job, a:data]) -endfunction - -function! s:nvim_cb(job_id, data, event) dict abort - return a:event == 'stdout' ? - \ s:job_cb('s:job_out_cb', self, 0, join(a:data, "\n")) : - \ s:job_cb('s:job_exit_cb', self, 0, a:data) -endfunction - -function! s:spawn(name, cmd, opts) - let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], - \ 'new': get(a:opts, 'new', 0) } - let s:jobs[a:name] = job - let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir, 0) : a:cmd - let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] - - if s:nvim - call extend(job, { - \ 'on_stdout': function('s:nvim_cb'), - \ 'on_exit': function('s:nvim_cb'), - \ }) - let jid = s:plug_call('jobstart', argv, job) - if jid > 0 - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = [jid < 0 ? argv[0].' is not executable' : - \ 'Invalid arguments (or job table is full)'] - endif - elseif s:vim8 - let jid = job_start(s:is_win ? join(argv, ' ') : argv, { - \ 'out_cb': function('s:job_cb', ['s:job_out_cb', job]), - \ 'exit_cb': function('s:job_cb', ['s:job_exit_cb', job]), - \ 'out_mode': 'raw' - \}) - if job_status(jid) == 'run' - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.lines = ['Failed to start job'] - endif - else - let job.lines = s:lines(call('s:system', [cmd])) - let job.error = v:shell_error != 0 - let job.running = 0 - endif -endfunction - -function! s:reap(name) - let job = s:jobs[a:name] - if job.error - call add(s:update.errors, a:name) - elseif get(job, 'new', 0) - let s:update.new[a:name] = 1 - endif - let s:update.bar .= job.error ? 'x' : '=' - - let bullet = job.error ? 'x' : '-' - let result = job.error ? join(job.lines, "\n") : s:last_non_empty_line(job.lines) - call s:log(bullet, a:name, empty(result) ? 'OK' : result) - call s:bar() - - call remove(s:jobs, a:name) -endfunction - -function! s:bar() - if s:switch_in() - let total = len(s:update.all) - call setline(1, (s:update.pull ? 'Updating' : 'Installing'). - \ ' plugins ('.len(s:update.bar).'/'.total.')') - call s:progress_bar(2, s:update.bar, total) - call s:switch_out() - endif -endfunction - -function! s:logpos(name) - for i in range(4, line('$')) - if getline(i) =~# '^[-+x*] '.a:name.':' - for j in range(i + 1, line('$')) - if getline(j) !~ '^ ' - return [i, j - 1] - endif - endfor - return [i, i] - endif - endfor - return [0, 0] -endfunction - -function! s:log(bullet, name, lines) - if s:switch_in() - let [b, e] = s:logpos(a:name) - if b > 0 - silent execute printf('%d,%d d _', b, e) - if b > winheight('.') - let b = 4 - endif - else - let b = 4 - endif - " FIXME For some reason, nomodifiable is set after :d in vim8 - setlocal modifiable - call append(b - 1, s:format_message(a:bullet, a:name, a:lines)) - call s:switch_out() - endif -endfunction - -function! s:update_vim() - let s:jobs = {} - - call s:bar() - call s:tick() -endfunction - -function! s:tick() - let pull = s:update.pull - let prog = s:progress_opt(s:nvim || s:vim8) -while 1 " Without TCO, Vim stack is bound to explode - if empty(s:update.todo) - if empty(s:jobs) && !s:update.fin - call s:update_finish() - let s:update.fin = 1 - endif - return - endif - - let name = keys(s:update.todo)[0] - let spec = remove(s:update.todo, name) - let new = empty(globpath(spec.dir, '.git', 1)) - - call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') - redraw - - let has_tag = has_key(spec, 'tag') - if !new - let [error, _] = s:git_validate(spec, 0) - if empty(error) - if pull - let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : '' - call s:spawn(name, printf('git fetch %s %s 2>&1', fetch_opt, prog), { 'dir': spec.dir }) - else - let s:jobs[name] = { 'running': 0, 'lines': ['Already installed'], 'error': 0 } - endif - else - let s:jobs[name] = { 'running': 0, 'lines': s:lines(error), 'error': 1 } - endif - else - call s:spawn(name, - \ printf('git clone %s %s %s %s 2>&1', - \ has_tag ? '' : s:clone_opt, - \ prog, - \ plug#shellescape(spec.uri, {'script': 0}), - \ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 }) - endif - - if !s:jobs[name].running - call s:reap(name) - endif - if len(s:jobs) >= s:update.threads - break - endif -endwhile -endfunction - -function! s:update_python() -let py_exe = has('python') ? 'python' : 'python3' -execute py_exe "<< EOF" -import datetime -import functools -import os -try: - import queue -except ImportError: - import Queue as queue -import random -import re -import shutil -import signal -import subprocess -import tempfile -import threading as thr -import time -import traceback -import vim - -G_NVIM = vim.eval("has('nvim')") == '1' -G_PULL = vim.eval('s:update.pull') == '1' -G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1 -G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)')) -G_CLONE_OPT = vim.eval('s:clone_opt') -G_PROGRESS = vim.eval('s:progress_opt(1)') -G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads')) -G_STOP = thr.Event() -G_IS_WIN = vim.eval('s:is_win') == '1' - -class PlugError(Exception): - def __init__(self, msg): - self.msg = msg -class CmdTimedOut(PlugError): - pass -class CmdFailed(PlugError): - pass -class InvalidURI(PlugError): - pass -class Action(object): - INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-'] - -class Buffer(object): - def __init__(self, lock, num_plugs, is_pull): - self.bar = '' - self.event = 'Updating' if is_pull else 'Installing' - self.lock = lock - self.maxy = int(vim.eval('winheight(".")')) - self.num_plugs = num_plugs - - def __where(self, name): - """ Find first line with name in current buffer. Return line num. """ - found, lnum = False, 0 - matcher = re.compile('^[-+x*] {0}:'.format(name)) - for line in vim.current.buffer: - if matcher.search(line) is not None: - found = True - break - lnum += 1 - - if not found: - lnum = -1 - return lnum - - def header(self): - curbuf = vim.current.buffer - curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs) - - num_spaces = self.num_plugs - len(self.bar) - curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ') - - with self.lock: - vim.command('normal! 2G') - vim.command('redraw') - - def write(self, action, name, lines): - first, rest = lines[0], lines[1:] - msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)] - msg.extend([' ' + line for line in rest]) - - try: - if action == Action.ERROR: - self.bar += 'x' - vim.command("call add(s:update.errors, '{0}')".format(name)) - elif action == Action.DONE: - self.bar += '=' - - curbuf = vim.current.buffer - lnum = self.__where(name) - if lnum != -1: # Found matching line num - del curbuf[lnum] - if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]): - lnum = 3 - else: - lnum = 3 - curbuf.append(msg, lnum) - - self.header() - except vim.error: - pass - -class Command(object): - CD = 'cd /d' if G_IS_WIN else 'cd' - - def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): - self.cmd = cmd - if cmd_dir: - self.cmd = '{0} {1} && {2}'.format(Command.CD, cmd_dir, self.cmd) - self.timeout = timeout - self.callback = cb if cb else (lambda msg: None) - self.clean = clean if clean else (lambda: None) - self.proc = None - - @property - def alive(self): - """ Returns true only if command still running. """ - return self.proc and self.proc.poll() is None - - def execute(self, ntries=3): - """ Execute the command with ntries if CmdTimedOut. - Returns the output of the command if no Exception. - """ - attempt, finished, limit = 0, False, self.timeout - - while not finished: - try: - attempt += 1 - result = self.try_command() - finished = True - return result - except CmdTimedOut: - if attempt != ntries: - self.notify_retry() - self.timeout += limit - else: - raise - - def notify_retry(self): - """ Retry required for command, notify user. """ - for count in range(3, 0, -1): - if G_STOP.is_set(): - raise KeyboardInterrupt - msg = 'Timeout. Will retry in {0} second{1} ...'.format( - count, 's' if count != 1 else '') - self.callback([msg]) - time.sleep(1) - self.callback(['Retrying ...']) - - def try_command(self): - """ Execute a cmd & poll for callback. Returns list of output. - Raises CmdFailed -> return code for Popen isn't 0 - Raises CmdTimedOut -> command exceeded timeout without new output - """ - first_line = True - - try: - tfile = tempfile.NamedTemporaryFile(mode='w+b') - preexec_fn = not G_IS_WIN and os.setsid or None - self.proc = subprocess.Popen(self.cmd, stdout=tfile, - stderr=subprocess.STDOUT, - stdin=subprocess.PIPE, shell=True, - preexec_fn=preexec_fn) - thrd = thr.Thread(target=(lambda proc: proc.wait()), args=(self.proc,)) - thrd.start() - - thread_not_started = True - while thread_not_started: - try: - thrd.join(0.1) - thread_not_started = False - except RuntimeError: - pass - - while self.alive: - if G_STOP.is_set(): - raise KeyboardInterrupt - - if first_line or random.random() < G_LOG_PROB: - first_line = False - line = '' if G_IS_WIN else nonblock_read(tfile.name) - if line: - self.callback([line]) - - time_diff = time.time() - os.path.getmtime(tfile.name) - if time_diff > self.timeout: - raise CmdTimedOut(['Timeout!']) - - thrd.join(0.5) - - tfile.seek(0) - result = [line.decode('utf-8', 'replace').rstrip() for line in tfile] - - if self.proc.returncode != 0: - raise CmdFailed([''] + result) - - return result - except: - self.terminate() - raise - - def terminate(self): - """ Terminate process and cleanup. """ - if self.alive: - if G_IS_WIN: - os.kill(self.proc.pid, signal.SIGINT) - else: - os.killpg(self.proc.pid, signal.SIGTERM) - self.clean() - -class Plugin(object): - def __init__(self, name, args, buf_q, lock): - self.name = name - self.args = args - self.buf_q = buf_q - self.lock = lock - self.tag = args.get('tag', 0) - - def manage(self): - try: - if os.path.exists(self.args['dir']): - self.update() - else: - self.install() - with self.lock: - thread_vim_command("let s:update.new['{0}'] = 1".format(self.name)) - except PlugError as exc: - self.write(Action.ERROR, self.name, exc.msg) - except KeyboardInterrupt: - G_STOP.set() - self.write(Action.ERROR, self.name, ['Interrupted!']) - except: - # Any exception except those above print stack trace - msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip()) - self.write(Action.ERROR, self.name, msg.split('\n')) - raise - - def install(self): - target = self.args['dir'] - if target[-1] == '\\': - target = target[0:-1] - - def clean(target): - def _clean(): - try: - shutil.rmtree(target) - except OSError: - pass - return _clean - - self.write(Action.INSTALL, self.name, ['Installing ...']) - callback = functools.partial(self.write, Action.INSTALL, self.name) - cmd = 'git clone {0} {1} {2} {3} 2>&1'.format( - '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], - esc(target)) - com = Command(cmd, None, G_TIMEOUT, callback, clean(target)) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - - def repo_uri(self): - cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url' - command = Command(cmd, self.args['dir'], G_TIMEOUT,) - result = command.execute(G_RETRIES) - return result[-1] - - def update(self): - actual_uri = self.repo_uri() - expect_uri = self.args['uri'] - regex = re.compile(r'^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$') - ma = regex.match(actual_uri) - mb = regex.match(expect_uri) - if ma is None or mb is None or ma.groups() != mb.groups(): - msg = ['', - 'Invalid URI: {0}'.format(actual_uri), - 'Expected {0}'.format(expect_uri), - 'PlugClean required.'] - raise InvalidURI(msg) - - if G_PULL: - self.write(Action.UPDATE, self.name, ['Updating ...']) - callback = functools.partial(self.write, Action.UPDATE, self.name) - fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else '' - cmd = 'git fetch {0} {1} 2>&1'.format(fetch_opt, G_PROGRESS) - com = Command(cmd, self.args['dir'], G_TIMEOUT, callback) - result = com.execute(G_RETRIES) - self.write(Action.DONE, self.name, result[-1:]) - else: - self.write(Action.DONE, self.name, ['Already installed']) - - def write(self, action, name, msg): - self.buf_q.put((action, name, msg)) - -class PlugThread(thr.Thread): - def __init__(self, tname, args): - super(PlugThread, self).__init__() - self.tname = tname - self.args = args - - def run(self): - thr.current_thread().name = self.tname - buf_q, work_q, lock = self.args - - try: - while not G_STOP.is_set(): - name, args = work_q.get_nowait() - plug = Plugin(name, args, buf_q, lock) - plug.manage() - work_q.task_done() - except queue.Empty: - pass - -class RefreshThread(thr.Thread): - def __init__(self, lock): - super(RefreshThread, self).__init__() - self.lock = lock - self.running = True - - def run(self): - while self.running: - with self.lock: - thread_vim_command('noautocmd normal! a') - time.sleep(0.33) - - def stop(self): - self.running = False - -if G_NVIM: - def thread_vim_command(cmd): - vim.session.threadsafe_call(lambda: vim.command(cmd)) -else: - def thread_vim_command(cmd): - vim.command(cmd) - -def esc(name): - return '"' + name.replace('"', '\"') + '"' - -def nonblock_read(fname): - """ Read a file with nonblock flag. Return the last line. """ - fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK) - buf = os.read(fread, 100000).decode('utf-8', 'replace') - os.close(fread) - - line = buf.rstrip('\r\n') - left = max(line.rfind('\r'), line.rfind('\n')) - if left != -1: - left += 1 - line = line[left:] - - return line - -def main(): - thr.current_thread().name = 'main' - nthreads = int(vim.eval('s:update.threads')) - plugs = vim.eval('s:update.todo') - mac_gui = vim.eval('s:mac_gui') == '1' - - lock = thr.Lock() - buf = Buffer(lock, len(plugs), G_PULL) - buf_q, work_q = queue.Queue(), queue.Queue() - for work in plugs.items(): - work_q.put(work) - - start_cnt = thr.active_count() - for num in range(nthreads): - tname = 'PlugT-{0:02}'.format(num) - thread = PlugThread(tname, (buf_q, work_q, lock)) - thread.start() - if mac_gui: - rthread = RefreshThread(lock) - rthread.start() - - while not buf_q.empty() or thr.active_count() != start_cnt: - try: - action, name, msg = buf_q.get(True, 0.25) - buf.write(action, name, ['OK'] if not msg else msg) - buf_q.task_done() - except queue.Empty: - pass - except KeyboardInterrupt: - G_STOP.set() - - if mac_gui: - rthread.stop() - rthread.join() - -main() -EOF -endfunction - -function! s:update_ruby() - ruby << EOF - module PlugStream - SEP = ["\r", "\n", nil] - def get_line - buffer = '' - loop do - char = readchar rescue return - if SEP.include? char.chr - buffer << $/ - break - else - buffer << char - end - end - buffer - end - end unless defined?(PlugStream) - - def esc arg - %["#{arg.gsub('"', '\"')}"] - end - - def killall pid - pids = [pid] - if /mswin|mingw|bccwin/ =~ RUBY_PLATFORM - pids.each { |pid| Process.kill 'INT', pid.to_i rescue nil } - else - unless `which pgrep 2> /dev/null`.empty? - children = pids - until children.empty? - children = children.map { |pid| - `pgrep -P #{pid}`.lines.map { |l| l.chomp } - }.flatten - pids += children - end - end - pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil } - end - end - - def compare_git_uri a, b - regex = %r{^(?:\w+://)?(?:[^@/]*@)?([^:/]*(?::[0-9]*)?)[:/](.*?)(?:\.git)?/?$} - regex.match(a).to_a.drop(1) == regex.match(b).to_a.drop(1) - end - - require 'thread' - require 'fileutils' - require 'timeout' - running = true - iswin = VIM::evaluate('s:is_win').to_i == 1 - pull = VIM::evaluate('s:update.pull').to_i == 1 - base = VIM::evaluate('g:plug_home') - all = VIM::evaluate('s:update.todo') - limit = VIM::evaluate('get(g:, "plug_timeout", 60)') - tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1 - nthr = VIM::evaluate('s:update.threads').to_i - maxy = VIM::evaluate('winheight(".")').to_i - vim7 = VIM::evaluate('v:version').to_i <= 703 && RUBY_PLATFORM =~ /darwin/ - cd = iswin ? 'cd /d' : 'cd' - tot = VIM::evaluate('len(s:update.todo)') || 0 - bar = '' - skip = 'Already installed' - mtx = Mutex.new - take1 = proc { mtx.synchronize { running && all.shift } } - logh = proc { - cnt = bar.length - $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})" - $curbuf[2] = '[' + bar.ljust(tot) + ']' - VIM::command('normal! 2G') - VIM::command('redraw') - } - where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } } - log = proc { |name, result, type| - mtx.synchronize do - ing = ![true, false].include?(type) - bar += type ? '=' : 'x' unless ing - b = case type - when :install then '+' when :update then '*' - when true, nil then '-' else - VIM::command("call add(s:update.errors, '#{name}')") - 'x' - end - result = - if type || type.nil? - ["#{b} #{name}: #{result.lines.to_a.last || 'OK'}"] - elsif result =~ /^Interrupted|^Timeout/ - ["#{b} #{name}: #{result}"] - else - ["#{b} #{name}"] + result.lines.map { |l| " " << l } - end - if lnum = where.call(name) - $curbuf.delete lnum - lnum = 4 if ing && lnum > maxy - end - result.each_with_index do |line, offset| - $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp) - end - logh.call - end - } - bt = proc { |cmd, name, type, cleanup| - tried = timeout = 0 - begin - tried += 1 - timeout += limit - fd = nil - data = '' - if iswin - Timeout::timeout(timeout) do - tmp = VIM::evaluate('tempname()') - system("(#{cmd}) > #{tmp}") - data = File.read(tmp).chomp - File.unlink tmp rescue nil - end - else - fd = IO.popen(cmd).extend(PlugStream) - first_line = true - log_prob = 1.0 / nthr - while line = Timeout::timeout(timeout) { fd.get_line } - data << line - log.call name, line.chomp, type if name && (first_line || rand < log_prob) - first_line = false - end - fd.close - end - [$? == 0, data.chomp] - rescue Timeout::Error, Interrupt => e - if fd && !fd.closed? - killall fd.pid - fd.close - end - cleanup.call if cleanup - if e.is_a?(Timeout::Error) && tried < tries - 3.downto(1) do |countdown| - s = countdown > 1 ? 's' : '' - log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type - sleep 1 - end - log.call name, 'Retrying ...', type - retry - end - [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"] - end - } - main = Thread.current - threads = [] - watcher = Thread.new { - if vim7 - while VIM::evaluate('getchar(1)') - sleep 0.1 - end - else - require 'io/console' # >= Ruby 1.9 - nil until IO.console.getch == 3.chr - end - mtx.synchronize do - running = false - threads.each { |t| t.raise Interrupt } unless vim7 - end - threads.each { |t| t.join rescue nil } - main.kill - } - refresh = Thread.new { - while true - mtx.synchronize do - break unless running - VIM::command('noautocmd normal! a') - end - sleep 0.2 - end - } if VIM::evaluate('s:mac_gui') == 1 - - clone_opt = VIM::evaluate('s:clone_opt') - progress = VIM::evaluate('s:progress_opt(1)') - nthr.times do - mtx.synchronize do - threads << Thread.new { - while pair = take1.call - name = pair.first - dir, uri, tag = pair.last.values_at *%w[dir uri tag] - exists = File.directory? dir - ok, result = - if exists - chdir = "#{cd} #{iswin ? dir : esc(dir)}" - ret, data = bt.call "#{chdir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url", nil, nil, nil - current_uri = data.lines.to_a.last - if !ret - if data =~ /^Interrupted|^Timeout/ - [false, data] - else - [false, [data.chomp, "PlugClean required."].join($/)] - end - elsif !compare_git_uri(current_uri, uri) - [false, ["Invalid URI: #{current_uri}", - "Expected: #{uri}", - "PlugClean required."].join($/)] - else - if pull - log.call name, 'Updating ...', :update - fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : '' - bt.call "#{chdir} && git fetch #{fetch_opt} #{progress} 2>&1", name, :update, nil - else - [true, skip] - end - end - else - d = esc dir.sub(%r{[\\/]+$}, '') - log.call name, 'Installing ...', :install - bt.call "git clone #{clone_opt unless tag} #{progress} #{uri} #{d} 2>&1", name, :install, proc { - FileUtils.rm_rf dir - } - end - mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok - log.call name, result, ok - end - } if running - end - end - threads.each { |t| t.join rescue nil } - logh.call - refresh.kill if refresh - watcher.kill -EOF -endfunction - -function! s:shellesc_cmd(arg, script) - let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') - return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') -endfunction - -function! s:shellesc_ps1(arg) - return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" -endfunction - -function! s:shellesc_sh(arg) - return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" -endfunction - -function! plug#shellescape(arg, ...) - let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} - let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') - let script = get(opts, 'script', 1) - if shell =~# 'cmd\.exe' - return s:shellesc_cmd(a:arg, script) - elseif shell =~# 'powershell\.exe' || shell =~# 'pwsh$' - return s:shellesc_ps1(a:arg) - endif - return s:shellesc_sh(a:arg) -endfunction - -function! s:glob_dir(path) - return map(filter(s:glob(a:path, '**'), 'isdirectory(v:val)'), 's:dirpath(v:val)') -endfunction - -function! s:progress_bar(line, bar, total) - call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']') -endfunction - -function! s:compare_git_uri(a, b) - " See `git help clone' - " https:// [user@] github.com[:port] / junegunn/vim-plug [.git] - " [git@] github.com[:port] : junegunn/vim-plug [.git] - " file:// / junegunn/vim-plug [/] - " / junegunn/vim-plug [/] - let pat = '^\%(\w\+://\)\='.'\%([^@/]*@\)\='.'\([^:/]*\%(:[0-9]*\)\=\)'.'[:/]'.'\(.\{-}\)'.'\%(\.git\)\=/\?$' - let ma = matchlist(a:a, pat) - let mb = matchlist(a:b, pat) - return ma[1:2] ==# mb[1:2] -endfunction - -function! s:format_message(bullet, name, message) - if a:bullet != 'x' - return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))] - else - let lines = map(s:lines(a:message), '" ".v:val') - return extend([printf('x %s:', a:name)], lines) - endif -endfunction - -function! s:with_cd(cmd, dir, ...) - let script = a:0 > 0 ? a:1 : 1 - return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) -endfunction - -function! s:system(cmd, ...) - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - return system(cmd) - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry -endfunction - -function! s:system_chomp(...) - let ret = call('s:system', a:000) - return v:shell_error ? '' : substitute(ret, '\n$', '', '') -endfunction - -function! s:git_validate(spec, check_branch) - let err = '' - if isdirectory(a:spec.dir) - let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir)) - let remote = result[-1] - if v:shell_error - let err = join([remote, 'PlugClean required.'], "\n") - elseif !s:compare_git_uri(remote, a:spec.uri) - let err = join(['Invalid URI: '.remote, - \ 'Expected: '.a:spec.uri, - \ 'PlugClean required.'], "\n") - elseif a:check_branch && has_key(a:spec, 'commit') - let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir)) - let sha = result[-1] - if v:shell_error - let err = join(add(result, 'PlugClean required.'), "\n") - elseif !s:hash_match(sha, a:spec.commit) - let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', - \ a:spec.commit[:6], sha[:6]), - \ 'PlugUpdate required.'], "\n") - endif - elseif a:check_branch - let branch = result[0] - " Check tag - if has_key(a:spec, 'tag') - let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) - if a:spec.tag !=# tag && a:spec.tag !~ '\*' - let err = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', - \ (empty(tag) ? 'N/A' : tag), a:spec.tag) - endif - " Check branch - elseif a:spec.branch !=# branch - let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ branch, a:spec.branch) - endif - if empty(err) - let [ahead, behind] = split(s:lastline(s:system(printf( - \ 'git rev-list --count --left-right HEAD...origin/%s', - \ a:spec.branch), a:spec.dir)), '\t') - if !v:shell_error && ahead - if behind - " Only mention PlugClean if diverged, otherwise it's likely to be - " pushable (and probably not that messed up). - let err = printf( - \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" - \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', a:spec.branch, ahead, behind) - else - let err = printf("Ahead of origin/%s by %d commit(s).\n" - \ .'Cannot update until local changes are pushed.', - \ a:spec.branch, ahead) - endif - endif - endif - endif - else - let err = 'Not found' - endif - return [err, err =~# 'PlugClean'] -endfunction - -function! s:rm_rf(dir) - if isdirectory(a:dir) - call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . plug#shellescape(a:dir)) - endif -endfunction - -function! s:clean(force) - call s:prepare() - call append(0, 'Searching for invalid plugins in '.g:plug_home) - call append(1, '') - - " List of valid directories - let dirs = [] - let errs = {} - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - if !s:is_managed(name) - call add(dirs, spec.dir) - else - let [err, clean] = s:git_validate(spec, 1) - if clean - let errs[spec.dir] = s:lines(err)[0] - else - call add(dirs, spec.dir) - endif - endif - let cnt += 1 - call s:progress_bar(2, repeat('=', cnt), total) - normal! 2G - redraw - endfor - - let allowed = {} - for dir in dirs - let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1 - let allowed[dir] = 1 - for child in s:glob_dir(dir) - let allowed[child] = 1 - endfor - endfor - - let todo = [] - let found = sort(s:glob_dir(g:plug_home)) - while !empty(found) - let f = remove(found, 0) - if !has_key(allowed, f) && isdirectory(f) - call add(todo, f) - call append(line('$'), '- ' . f) - if has_key(errs, f) - call append(line('$'), ' ' . errs[f]) - endif - let found = filter(found, 'stridx(v:val, f) != 0') - end - endwhile - - 4 - redraw - if empty(todo) - call append(line('$'), 'Already clean.') - else - let s:clean_count = 0 - call append(3, ['Directories to delete:', '']) - redraw! - if a:force || s:ask_no_interrupt('Delete all directories?') - call s:delete([6, line('$')], 1) - else - call setline(4, 'Cancelled.') - nnoremap d :set opfunc=delete_opg@ - nmap dd d_ - xnoremap d :call delete_op(visualmode(), 1) - echo 'Delete the lines (d{motion}) to delete the corresponding directories' - endif - endif - 4 - setlocal nomodifiable -endfunction - -function! s:delete_op(type, ...) - call s:delete(a:0 ? [line("'<"), line("'>")] : [line("'["), line("']")], 0) -endfunction - -function! s:delete(range, force) - let [l1, l2] = a:range - let force = a:force - while l1 <= l2 - let line = getline(l1) - if line =~ '^- ' && isdirectory(line[2:]) - execute l1 - redraw! - let answer = force ? 1 : s:ask('Delete '.line[2:].'?', 1) - let force = force || answer > 1 - if answer - call s:rm_rf(line[2:]) - setlocal modifiable - call setline(l1, '~'.line[1:]) - let s:clean_count += 1 - call setline(4, printf('Removed %d directories.', s:clean_count)) - setlocal nomodifiable - endif - endif - let l1 += 1 - endwhile -endfunction - -function! s:upgrade() - echo 'Downloading the latest version of vim-plug' - redraw - let tmp = s:plug_tempname() - let new = tmp . '/plug.vim' - - try - let out = s:system(printf('git clone --depth 1 %s %s', plug#shellescape(s:plug_src), plug#shellescape(tmp))) - if v:shell_error - return s:err('Error upgrading vim-plug: '. out) - endif - - if readfile(s:me) ==# readfile(new) - echo 'vim-plug is already up-to-date' - return 0 - else - call rename(s:me, s:me . '.old') - call rename(new, s:me) - unlet g:loaded_plug - echo 'vim-plug has been upgraded' - return 1 - endif - finally - silent! call s:rm_rf(tmp) - endtry -endfunction - -function! s:upgrade_specs() - for spec in values(g:plugs) - let spec.frozen = get(spec, 'frozen', 0) - endfor -endfunction - -function! s:status() - call s:prepare() - call append(0, 'Checking plugins') - call append(1, '') - - let ecnt = 0 - let unloaded = 0 - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - let is_dir = isdirectory(spec.dir) - if has_key(spec, 'uri') - if is_dir - let [err, _] = s:git_validate(spec, 1) - let [valid, msg] = [empty(err), empty(err) ? 'OK' : err] - else - let [valid, msg] = [0, 'Not found. Try PlugInstall.'] - endif - else - if is_dir - let [valid, msg] = [1, 'OK'] - else - let [valid, msg] = [0, 'Not found.'] - endif - endif - let cnt += 1 - let ecnt += !valid - " `s:loaded` entry can be missing if PlugUpgraded - if is_dir && get(s:loaded, name, -1) == 0 - let unloaded = 1 - let msg .= ' (not loaded)' - endif - call s:progress_bar(2, repeat('=', cnt), total) - call append(3, s:format_message(valid ? '-' : 'x', name, msg)) - normal! 2G - redraw - endfor - call setline(1, 'Finished. '.ecnt.' error(s).') - normal! gg - setlocal nomodifiable - if unloaded - echo "Press 'L' on each line to load plugin, or 'U' to update" - nnoremap L :call status_load(line('.')) - xnoremap L :call status_load(line('.')) - end -endfunction - -function! s:extract_name(str, prefix, suffix) - return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$') -endfunction - -function! s:status_load(lnum) - let line = getline(a:lnum) - let name = s:extract_name(line, '-', '(not loaded)') - if !empty(name) - call plug#load(name) - setlocal modifiable - call setline(a:lnum, substitute(line, ' (not loaded)$', '', '')) - setlocal nomodifiable - endif -endfunction - -function! s:status_update() range - let lines = getline(a:firstline, a:lastline) - let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)') - if !empty(names) - echo - execute 'PlugUpdate' join(names) - endif -endfunction - -function! s:is_preview_window_open() - silent! wincmd P - if &previewwindow - wincmd p - return 1 - endif -endfunction - -function! s:find_name(lnum) - for lnum in reverse(range(1, a:lnum)) - let line = getline(lnum) - if empty(line) - return '' - endif - let name = s:extract_name(line, '-', '') - if !empty(name) - return name - endif - endfor - return '' -endfunction - -function! s:preview_commit() - if b:plug_preview < 0 - let b:plug_preview = !s:is_preview_window_open() - endif - - let sha = matchstr(getline('.'), '^ \X*\zs[0-9a-f]\{7,9}') - if empty(sha) - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir) - return - endif - - if exists('g:plug_pwindow') && !s:is_preview_window_open() - execute g:plug_pwindow - execute 'e' sha - else - execute 'pedit' sha - wincmd P - endif - setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable - let batchfile = '' - try - let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha - if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) - endif - execute 'silent %!' cmd - finally - let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) - call delete(batchfile) - endif - endtry - setlocal nomodifiable - nnoremap q :q - wincmd p -endfunction - -function! s:section(flags) - call search('\(^[x-] \)\@<=[^:]\+:', a:flags) -endfunction - -function! s:format_git_log(line) - let indent = ' ' - let tokens = split(a:line, nr2char(1)) - if len(tokens) != 5 - return indent.substitute(a:line, '\s*$', '', '') - endif - let [graph, sha, refs, subject, date] = tokens - let tag = matchstr(refs, 'tag: [^,)]\+') - let tag = empty(tag) ? ' ' : ' ('.tag.') ' - return printf('%s%s%s%s%s (%s)', indent, graph, sha, tag, subject, date) -endfunction - -function! s:append_ul(lnum, text) - call append(a:lnum, ['', a:text, repeat('-', len(a:text))]) -endfunction - -function! s:diff() - call s:prepare() - call append(0, ['Collecting changes ...', '']) - let cnts = [0, 0] - let bar = '' - let total = filter(copy(g:plugs), 's:is_managed(v:key) && isdirectory(v:val.dir)') - call s:progress_bar(2, bar, len(total)) - for origin in [1, 0] - let plugs = reverse(sort(items(filter(copy(total), (origin ? '' : '!').'(has_key(v:val, "commit") || has_key(v:val, "tag"))')))) - if empty(plugs) - continue - endif - call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') - for [k, v] in plugs - let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' - let cmd = 'git log --graph --color=never ' - \ . (s:git_version_requirement(2, 10, 0) ? '--no-show-signature ' : '') - \ . join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 'plug#shellescape(v:val)')) - if has_key(v, 'rtp') - let cmd .= ' -- '.plug#shellescape(v.rtp) - endif - let diff = s:system_chomp(cmd, v.dir) - if !empty(diff) - let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' - call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) - let cnts[origin] += 1 - endif - let bar .= '=' - call s:progress_bar(2, bar, len(total)) - normal! 2G - redraw - endfor - if !cnts[origin] - call append(5, ['', 'N/A']) - endif - endfor - call setline(1, printf('%d plugin(s) updated.', cnts[0]) - \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : '')) - - if cnts[0] || cnts[1] - nnoremap (plug-preview) :silent! call preview_commit() - if empty(maparg("\", 'n')) - nmap (plug-preview) - endif - if empty(maparg('o', 'n')) - nmap o (plug-preview) - endif - endif - if cnts[0] - nnoremap X :call revert() - echo "Press 'X' on each block to revert the update" - endif - normal! gg - setlocal nomodifiable -endfunction - -function! s:revert() - if search('^Pending updates', 'bnW') - return - endif - - let name = s:find_name(line('.')) - if empty(name) || !has_key(g:plugs, name) || - \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y' - return - endif - - call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir) - setlocal modifiable - normal! "_dap - setlocal nomodifiable - echo 'Reverted' -endfunction - -function! s:snapshot(force, ...) abort - call s:prepare() - setf vim - call append(0, ['" Generated by vim-plug', - \ '" '.strftime("%c"), - \ '" :source this file in vim to restore the snapshot', - \ '" or execute: vim -S snapshot.vim', - \ '', '', 'PlugUpdate!']) - 1 - let anchor = line('$') - 3 - let names = sort(keys(filter(copy(g:plugs), - \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) - for name in reverse(names) - let sha = s:system_chomp('git rev-parse --short HEAD', g:plugs[name].dir) - if !empty(sha) - call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) - redraw - endif - endfor - - if a:0 > 0 - let fn = s:plug_expand(a:1) - if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) - return - endif - call writefile(getline(1, '$'), fn) - echo 'Saved as '.a:1 - silent execute 'e' s:esc(fn) - setf vim - endif -endfunction - -function! s:split_rtp() - return split(&rtp, '\\\@ Date: Wed, 11 Dec 2019 23:55:18 +0100 Subject: [PATCH 19/34] fix shell scripts --- install.conf.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/install.conf.yaml b/install.conf.yaml index 4f75000..85f09fb 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -18,13 +18,23 @@ - shell: # install ohmyzsh - - sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + - + command: 'if [ ! -d ~/.oh-my-zsh ]; then sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"; fi' + stdin: false + stdout: true + description: "Install ohmyzsh:" + quiet: false # install vim plug for vim - - curl -fLo vim/vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + - [curl -fLo vim/vim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim, "Install vim-plug for vim:"] # install vim plug for nvim - - curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + - [curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim, "Install vim-plug for nvim:"] # install vim plugins - - vim +PlugInstall +qall + - + command: vim +PlugInstall +qall + stdin: true + stdout: true + description: "Install vim plugins! Hit enter once if stuck:" + quiet: false # do this last to override generated .zshrc - link: From 26fdd1ea67e8c03347b5ae183a5abd0ff1c5f787 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Thu, 12 Dec 2019 00:16:26 +0100 Subject: [PATCH 20/34] update readme --- README.md | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 6f55090..edc059f 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,12 @@ # My Dotfiles -The collection of my dotfiles +The collection of my precious dotfiles. -## Dependencies -Everything should work without any of these depencies but it's not as fun. -- zsh -- vim -- git -- oh-my-zsh -- fzf -- silver_searcher -- powerline-fonts -- tmuxinator +## Installation +To install run this command: +``` +git clone https://github.com/jidbo/.dotfiles ~/; cd ~/.dotfiles; ./install +``` +This should install all dependecies and create symlinks to all needed files. The only thing that you have to setup on your own is `nvim`. -## Usage -If you have extra setup tasks, you can put them in `.localcommands`. +## Customization +It is possible to load your own zsh-plugins and other commands you want to execute in the `.zshrc`. To add zsh-plugins add a `plugins` file to `~/.dotfiles/shell/`. An example is provided in `~/.dotfiles/shell/plugins.example`. The same thing applies to commands you want to execute in on shell startup, just add a `localcommands` file with your commands in `~/.dotfiles/shell/`. From 45f77b3f8a5c4425b20f0a5a9253999a84b9d545 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Fri, 10 Apr 2020 13:47:40 +0200 Subject: [PATCH 21/34] add additional keybindings for tmux add new keybindings for switching winows and sessions using the meta key --- shell/tmux.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shell/tmux.conf b/shell/tmux.conf index 1cab6ac..4569a0d 100644 --- a/shell/tmux.conf +++ b/shell/tmux.conf @@ -22,6 +22,10 @@ bind r \ source-file ~/.tmux.conf \;\ display 'Reloaded tmux config' +bind -n M-h previous-window +bind -n M-l next-window +bind -n M-j switch-client -n +bind -n M-k switch-client -p # pane number display set-option -g display-panes-active-colour blue #blue set-option -g display-panes-colour brightred #orange From 927db2961b071015be741ecb2473cd32f6746ae8 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Fri, 10 Apr 2020 13:49:27 +0200 Subject: [PATCH 22/34] adjust color scheme also start using true color for tmux instead of 256 colors --- shell/tmux.conf | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/shell/tmux.conf b/shell/tmux.conf index 4569a0d..4228a85 100644 --- a/shell/tmux.conf +++ b/shell/tmux.conf @@ -13,9 +13,6 @@ bind-key -T copy-mode-vi C-j select-pane -D bind-key -T copy-mode-vi C-k select-pane -U bind-key -T copy-mode-vi C-l select-pane -R -# default statusbar colors -set-option -g status-bg black - # reload tmux.conf with -r unbind r bind r \ @@ -26,6 +23,7 @@ bind -n M-h previous-window bind -n M-l next-window bind -n M-j switch-client -n bind -n M-k switch-client -p + # pane number display set-option -g display-panes-active-colour blue #blue set-option -g display-panes-colour brightred #orange @@ -43,17 +41,21 @@ set-window-option -g clock-mode-colour green #green # bell set-window-option -g window-status-bell-style fg=black,bg=red #base02, red +# default statusbar colors +set-option -g status-bg black + # term color set -g default-terminal "screen-256color" +set-option -ga terminal-overrides ",xterm-256color:Tc" # right status -set -g status-right '#[fg=colour3]#[fg=colour1]#[bg=colour1]#[fg=colour7] %H:%M %d-%b ' +set -g status-right '#[fg=colour3]#[fg=#51000f]#[bg=#51000f]#[fg=#ffffff] %H:%M %d-%b ' # left status -set -g status-left '#[bg=colour1]#[fg=colour0]#{?client_prefix,#[bg=colour2],} ❐ #[bg=colour8]#[fg=colour1]#{?client_prefix,#[fg=colour2],}#{?window_zoomed_flag, 🔍 ,}#[fg=colour1] ' +set -g status-left '#[bg=#1A202C]#[fg=#ffffff]#{?client_prefix,#[bg=#51000f],} ❐ #[bg=colour8]#[fg=#1A202C]#{?client_prefix,#[fg=#51000f],}#{?window_zoomed_flag, 🔍 ,} ' # current window status -set -g window-status-current-format "#[fg=colour8]#[bg=colour1]#[fg=colour7]#[bg=colour1] #I #[fg=colour7] #W #[fg=colour1]#[bg=colour8]" +set -g window-status-current-format "#[fg=colour8]#[bg=#51000f]#[fg=colour7]#[bg=#51000f] #I #[fg=colour7] #W #[fg=#51000f]#[bg=colour8]" # normal window status set -g window-status-format "#[fg=colour244]#[bg=colour8]#I #[fg=colour240] #W" @@ -61,6 +63,8 @@ set -g window-status-format "#[fg=colour244]#[bg=colour8]#I #[fg=colour240] # # escape time set-option -sg escape-time 10 +set -g status-justify "left" + # COLOURS #colour0 (black) #colour1 (red) From 14a83d9377e66cb7a6635e8d2827b33975496889 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Thu, 16 Apr 2020 15:13:26 +0200 Subject: [PATCH 23/34] switch to vim surround --- nvim/init.vim | 2 +- vim/vimrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index f2f19f3..8b05a73 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -5,7 +5,7 @@ call plug#begin('~/.config/nvim/bundle') Plug 'tpope/vim-commentary' " brackets management -Plug 'machakann/vim-sandwich' +Plug 'tpope/vim-surround' " WINDOW MANAGEMENT diff --git a/vim/vimrc b/vim/vimrc index 577a7f8..fd1211a 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -8,7 +8,7 @@ call plug#begin('~/.vim/bundle') Plug 'tpope/vim-commentary' " brackets management -Plug 'machakann/vim-sandwich' +Plug 'tpope/vim-surround' " snippets Plug 'SirVer/ultisnips' From 8a8deac8544f44d829bc3027be41937ed039a97a Mon Sep 17 00:00:00 2001 From: Jidbo Date: Thu, 16 Apr 2020 20:29:05 +0200 Subject: [PATCH 24/34] add vimwiki also make other small improvements --- nvim/init.vim | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 8b05a73..ed7616a 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -16,12 +16,15 @@ Plug 'christoomey/vim-tmux-navigator' Plug 'simeji/winresizer' " FILE MANAGEMENT -" nert-tree +" nerd-tree Plug 'scrooloose/nerdtree' " fzf plugin Plug 'junegunn/fzf.vim' +" vimwiki +Plug 'vimwiki/vimwiki' + " GIT STUFF " git Plug 'tpope/vim-fugitive' @@ -69,7 +72,9 @@ hi MatchParen guibg=NONE guifg=red gui=bold set number set clipboard=unnamed set mouse=nvi -set smarttab +" set smarttab +set expandtab +set tabstop=4 set visualbell set virtualedit=block set scrolloff=1 @@ -119,6 +124,8 @@ autocmd BufWritePost init.vim source % cnoremap cnoremap +nnoremap H ^ + " toggle hybrid number mode nnoremap h :set rnu! :augroup numbertoggle @@ -151,6 +158,9 @@ if !exists('bclose_multiple') let bclose_multiple = 1 endif +" make all tabs to spaces +nnoremap i :set expandtab:retab + " Display an error message. function! s:Warn(msg) echohl ErrorMsg @@ -252,6 +262,9 @@ nmap :Buffers nmap f :GFiles let g:fzf_buffers_jump = 1 +" Vimwiki setup +let g:vimwiki_list = [{'path': '~/.wiki/'}] + " vimtex setup let g:vimtex_compile_progname = 'nvr' From 863b68b62aed5585ac1edf1478a44922f39f898a Mon Sep 17 00:00:00 2001 From: Jidbo Date: Thu, 16 Apr 2020 20:29:36 +0200 Subject: [PATCH 25/34] fix some colors --- shell/tmux.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shell/tmux.conf b/shell/tmux.conf index 4228a85..65b70b5 100644 --- a/shell/tmux.conf +++ b/shell/tmux.conf @@ -25,8 +25,8 @@ bind -n M-j switch-client -n bind -n M-k switch-client -p # pane number display -set-option -g display-panes-active-colour blue #blue -set-option -g display-panes-colour brightred #orange +set-option -g display-panes-active-colour #51000f #blue +set-option -g display-panes-colour #ffffff #orange # start numbering at 1 set -g base-index 1 @@ -49,10 +49,10 @@ set -g default-terminal "screen-256color" set-option -ga terminal-overrides ",xterm-256color:Tc" # right status -set -g status-right '#[fg=colour3]#[fg=#51000f]#[bg=#51000f]#[fg=#ffffff] %H:%M %d-%b ' +set -g status-right '#[fg=#51000f]#[bg=#51000f]#[fg=#ffffff] %H:%M %d-%b ' # left status -set -g status-left '#[bg=#1A202C]#[fg=#ffffff]#{?client_prefix,#[bg=#51000f],} ❐ #[bg=colour8]#[fg=#1A202C]#{?client_prefix,#[fg=#51000f],}#{?window_zoomed_flag, 🔍 ,} ' +set -g status-left '#[bg=#1A202C]#[fg=#ffffff]#{?client_prefix,#[bg=#51000f],} ❐ #[bg=colour8]#[fg=#1A202C]#{?client_prefix,#[fg=#51000f],}#{?window_zoomed_flag, #[fg=colour7]🔍 ,} ' # current window status set -g window-status-current-format "#[fg=colour8]#[bg=#51000f]#[fg=colour7]#[bg=#51000f] #I #[fg=colour7] #W #[fg=#51000f]#[bg=colour8]" From 748e0a4242a140163de135bd53f2683c266b1836 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Tue, 21 Apr 2020 00:02:30 +0200 Subject: [PATCH 26/34] add goyo to nvim --- nvim/init.vim | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index ed7616a..f1002f2 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -15,6 +15,9 @@ Plug 'christoomey/vim-tmux-navigator' " winresizer Plug 'simeji/winresizer' +" goyo +Plug 'junegunn/goyo.vim' + " FILE MANAGEMENT " nerd-tree Plug 'scrooloose/nerdtree' @@ -82,6 +85,7 @@ set wildmenu set autoread set lazyredraw set history=250 +set noshowmode " tabs and line wrap set tabstop=4 @@ -134,12 +138,6 @@ nnoremap h :set rnu! : autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber :augroup END -" disable arrow keys -noremap -noremap -noremap -noremap - " auto expand brackets inoremap (; ()O inoremap (, (),O @@ -274,6 +272,20 @@ lua require'colorizer'.setup() " tmux setup let g:tmuxcomplete#trigger = '' +" GOYO +function! s:goyo_enter() + set noshowcmd + set scrolloff=999 +endfunction + +function! s:goyo_leave() + set showcmd + set scrolloff=1 +endfunction + +autocmd! User GoyoEnter nested call goyo_enter() +autocmd! User GoyoLeave nested call goyo_leave() + " Coc vim setup set hidden set updatetime=300 From 09991e10f2a04c3117cf81b4f66e0b42c6de4c19 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Tue, 21 Apr 2020 00:02:46 +0200 Subject: [PATCH 27/34] cleanup --- shell/tmux.conf | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/shell/tmux.conf b/shell/tmux.conf index 65b70b5..9bf71bc 100644 --- a/shell/tmux.conf +++ b/shell/tmux.conf @@ -23,10 +23,9 @@ bind -n M-h previous-window bind -n M-l next-window bind -n M-j switch-client -n bind -n M-k switch-client -p +bind -n M-k switch-client -p -# pane number display -set-option -g display-panes-active-colour #51000f #blue -set-option -g display-panes-colour #ffffff #orange +bind-key -n M-s set-option status # start numbering at 1 set -g base-index 1 @@ -36,10 +35,10 @@ set -g pane-base-index 1 set -g status-interval 10 # clock -set-window-option -g clock-mode-colour green #green +set-window-option -g clock-mode-colour green # bell -set-window-option -g window-status-bell-style fg=black,bg=red #base02, red +set-window-option -g window-status-bell-style fg=black,bg=red # default statusbar colors set-option -g status-bg black @@ -64,11 +63,3 @@ set -g window-status-format "#[fg=colour244]#[bg=colour8]#I #[fg=colour240] # set-option -sg escape-time 10 set -g status-justify "left" - -# COLOURS -#colour0 (black) -#colour1 (red) -#colour2 (green) -#colour3 (yellow) -#colour4 (blue) -#colour7 (white) From b2f42d90235b1c560cf972145f45f72d9761b680 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sat, 23 May 2020 17:24:20 +0200 Subject: [PATCH 28/34] remove nvim and cleanup file --- nvim/init.vim | 114 +++++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 72 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index f1002f2..6ff9127 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,5 +1,7 @@ call plug#begin('~/.config/nvim/bundle') " USEFUL +" Editor config +Plug 'editorconfig/editorconfig-vim' " comment plugin Plug 'tpope/vim-commentary' @@ -45,12 +47,6 @@ Plug 'norcalli/nvim-colorizer.lua' " powerline Plug 'vim-airline/vim-airline' -" Coc Nvim -Plug 'neoclide/coc.nvim', {'branch': 'release'} - -" nvim-remote -Plug 'mhinz/neovim-remote' - " language packs Plug 'sheerun/vim-polyglot' @@ -102,8 +98,26 @@ set incsearch set hlsearch set smartcase +" REMAPS + " search for visual selection vnoremap // y/" +nnoremap H ^ + +" ex command +cnoremap +cnoremap + +" auto expand brackets +inoremap (; ()O +inoremap (, (),O +inoremap {; {}O +inoremap {, {},O +inoremap [; []O +inoremap [, [],O + +" toggle hybrid mode +nnoremap h :set rnu! " Disable Backup and Swap files set noswapfile @@ -114,9 +128,6 @@ set nowritebackup set splitbelow set splitright -" tabs -nnoremap t :tabnew - " Enable folding set foldmethod=indent set foldlevel=99 @@ -124,28 +135,13 @@ set foldlevel=99 " auto reload .vimrc on write autocmd BufWritePost init.vim source % -" ex command -cnoremap -cnoremap - -nnoremap H ^ - " toggle hybrid number mode -nnoremap h :set rnu! :augroup numbertoggle : autocmd! : autocmd BufEnter,FocusGained,InsertLeave * set relativenumber : autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber :augroup END -" auto expand brackets -inoremap (; ()O -inoremap (, (),O -inoremap {; {}O -inoremap {, {},O -inoremap [; []O -inoremap [, [],O - " Delete buffer while keeping window layout (don't close buffer's windows). " Version 2008-11-18 from http://vim.wikia.com/wiki/VimTip165 if v:version < 700 || exists('loaded_bclose') || &cp @@ -156,9 +152,6 @@ if !exists('bclose_multiple') let bclose_multiple = 1 endif -" make all tabs to spaces -nnoremap i :set expandtab:retab - " Display an error message. function! s:Warn(msg) echohl ErrorMsg @@ -228,6 +221,7 @@ nnoremap bd :Bclose let g:polyglot_disabled = ["latex"] " nerd tree setup let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree + map e :NERDTreeToggle " AIRLINE SETUP @@ -286,51 +280,27 @@ endfunction autocmd! User GoyoEnter nested call goyo_enter() autocmd! User GoyoLeave nested call goyo_leave() -" Coc vim setup -set hidden -set updatetime=300 -set shortmess+=c -" Use to trigger completion. -inoremap coc#refresh() -" navigate diagnostics -nmap [g (coc-diagnostic-prev) -nmap ]g (coc-diagnostic-next) -" goto remaps -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() +let g:goyo_linenr = 0 -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - else - call CocAction('doHover') - endif +" Autocompletion +if executable('pyls') + au User lsp_setup call lsp#register_server({ + \ 'name': 'pyls', + \ 'cmd': {server_info->['pyls']}, + \ 'whitelist': ['python'], + \ }) +endif + +function! s:on_lsp_buffer_enabled() abort + setlocal omnifunc=lsp#complete + setlocal signcolumn=yes + nmap gd (lsp-definition) + nmap (lsp-rename) + " refer to doc to add more commands endfunction -" Remap for rename current word -nmap rn (coc-rename) - -" Use `:Form` to format current buffer -command! -nargs=0 Form :call CocAction('format') - -" Using CocList -" Show all diagnostics -nnoremap a :CocList diagnostics -" Manage extensions -nnoremap x :CocList extensions -" Show commands -nnoremap c :CocList commands -" Find symbol of current document -nnoremap o :CocList outline -" Search workspace symbls -nnoremap s :CocList -I symbols -" Do default action fo next item. -nnoremap j :CocNext -" Do default action for previous item. -nnoremap k :CocPrev -" Resume latest coc list -nnoremap p :CocListResume +augroup lsp_install + au! + " call s:on_lsp_buffer_enabled only for languages that has the server registered. + autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() +augroup END From 643e43e30f01cd9c7ded92f8574867c6dd90defc Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sat, 23 May 2020 20:12:36 +0200 Subject: [PATCH 29/34] readd ultisnipps --- nvim/init.vim | 14 ++++++++++++++ vim/vim/snipps/tex.snippets | 12 ++++-------- vim/vim/snipps/vim.snippets | 5 +++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 6ff9127..0fddcf5 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -9,6 +9,9 @@ Plug 'tpope/vim-commentary' " brackets management Plug 'tpope/vim-surround' +" Snippets +Plug 'SirVer/ultisnips' + " WINDOW MANAGEMENT " tmux navigator @@ -304,3 +307,14 @@ augroup lsp_install " call s:on_lsp_buffer_enabled only for languages that has the server registered. autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() augroup END + +" UltiSnips setup + +" Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" +let g:UltiSnipsSnippetDirectories=[$HOME."/.vim/snipps"] + +" If you want :UltiSnipsEdit to split your window. +let g:UltiSnipsEditSplit="vertical" diff --git a/vim/vim/snipps/tex.snippets b/vim/vim/snipps/tex.snippets index a9b8af7..21f5884 100644 --- a/vim/vim/snipps/tex.snippets +++ b/vim/vim/snipps/tex.snippets @@ -1,11 +1,3 @@ -snippet s "symbol" -\\$0 -endsnippet - -snippet mb "Math Braces" -\\{ $1 \\}$0 -endsnippet - snippet mal "Math inline" $ $1 $$0 endsnippet @@ -30,6 +22,10 @@ snippet abs "Absolute" i \\lvert $1 \\rvert$0 endsnippet +snippet mb "Math Braces" +\\{ $1 \\}$0 +endsnippet + snippet fra "Fraction" i \frac\{${1:numerator}\}\{${2:demoninator}\}$0 endsnippet diff --git a/vim/vim/snipps/vim.snippets b/vim/vim/snipps/vim.snippets index ad2afcc..82dfd1e 100644 --- a/vim/vim/snipps/vim.snippets +++ b/vim/vim/snipps/vim.snippets @@ -1,4 +1,5 @@ snippet plug "Plugin Snippet" -" $1 -Plugin '$0' +" $2 +Plug '$1' +$0 endsnippet From deb27d52c9592020f02ff5b498c23e6b1bcafd6c Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 25 Oct 2020 17:06:31 +0100 Subject: [PATCH 30/34] add vue snippets --- vim/vim/snipps/html.snippets | 4 ++++ vim/vim/snipps/vue.snippets | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 vim/vim/snipps/vue.snippets diff --git a/vim/vim/snipps/html.snippets b/vim/vim/snipps/html.snippets index d45e01e..5106cf4 100644 --- a/vim/vim/snipps/html.snippets +++ b/vim/vim/snipps/html.snippets @@ -11,6 +11,10 @@ snippet tag "generic Element" endsnippet +snippet tags "generic Element self closing" +<${1:tag}${2: class="$3"} />$0 +endsnippet + snippet tagi "generic inline Element" <${1:tag}${2: class="$3"}>$4$0 endsnippet diff --git a/vim/vim/snipps/vue.snippets b/vim/vim/snipps/vue.snippets new file mode 100644 index 0000000..7447bf0 --- /dev/null +++ b/vim/vim/snipps/vue.snippets @@ -0,0 +1,2 @@ +extends html + From ee465a644b2c6519a8455bbedfa647d648ba4f60 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 25 Oct 2020 17:11:41 +0100 Subject: [PATCH 31/34] add fzf manually i had to switch to the git version, since the packet was outdated, might switch back --- shell/zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/zshrc b/shell/zshrc index 21db026..1efbe1f 100644 --- a/shell/zshrc +++ b/shell/zshrc @@ -59,3 +59,5 @@ then export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin" fi + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh From 2537d4bacdb0980c10c7963fed8b360b023ce540 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 25 Oct 2020 17:16:52 +0100 Subject: [PATCH 32/34] add base fzf plugin to keep fzf up to date regardless of the system version --- nvim/init.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/nvim/init.vim b/nvim/init.vim index 0fddcf5..afbd492 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -28,6 +28,7 @@ Plug 'junegunn/goyo.vim' Plug 'scrooloose/nerdtree' " fzf plugin +Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' " vimwiki From ad9936f45e35af061ba25d6c61b458c449d8b936 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 25 Oct 2020 17:51:05 +0100 Subject: [PATCH 33/34] split init vim into multiple files --- nvim/functions.vim | 82 ++++++++++ nvim/init.vim | 331 ++--------------------------------------- nvim/mappings.vim | 19 +++ nvim/options.vim | 55 +++++++ nvim/pluginoptions.vim | 102 +++++++++++++ nvim/plugins.vim | 70 +++++++++ 6 files changed, 339 insertions(+), 320 deletions(-) create mode 100644 nvim/functions.vim create mode 100644 nvim/mappings.vim create mode 100644 nvim/options.vim create mode 100644 nvim/pluginoptions.vim create mode 100644 nvim/plugins.vim diff --git a/nvim/functions.vim b/nvim/functions.vim new file mode 100644 index 0000000..4e51acc --- /dev/null +++ b/nvim/functions.vim @@ -0,0 +1,82 @@ +" auto reload .vimrc on write +autocmd BufWritePost init.vim source % + +" toggle hybrid number mode +:augroup numbertoggle +: autocmd! +: autocmd BufEnter,FocusGained,InsertLeave * set relativenumber +: autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber +:augroup END + +" Delete buffer while keeping window layout (don't close buffer's windows). +" Version 2008-11-18 from http://vim.wikia.com/wiki/VimTip165 +if v:version < 700 || exists('loaded_bclose') || &cp + finish +endif +let loaded_bclose = 1 +if !exists('bclose_multiple') + let bclose_multiple = 1 +endif + +" Display an error message. +function! s:Warn(msg) + echohl ErrorMsg + echomsg a:msg + echohl NONE +endfunction + +" Command ':Bclose' executes ':bd' to delete buffer in current window. +" The window will show the alternate buffer (Ctrl-^) if it exists, +" or the previous buffer (:bp), or a blank buffer if no previous. +" Command ':Bclose!' is the same, but executes ':bd!' (discard changes). +" An optional argument can specify which buffer to close (name or number). +function! s:Bclose(bang, buffer) + if empty(a:buffer) + let btarget = bufnr('%') + elseif a:buffer =~ '^\d\+$' + let btarget = bufnr(str2nr(a:buffer)) + else + let btarget = bufnr(a:buffer) + endif + if btarget < 0 + call s:Warn('No matching buffer for '.a:buffer) + return + endif + if empty(a:bang) && getbufvar(btarget, '&modified') + call s:Warn('No write since last change for buffer '.btarget.' (use :Bclose!)') + return + endif + " Numbers of windows that view target buffer which we will delete. + let wnums = filter(range(1, winnr('$')), 'winbufnr(v:val) == btarget') + if !g:bclose_multiple && len(wnums) > 1 + call s:Warn('Buffer is in multiple windows (use ":let bclose_multiple=1")') + return + endif + let wcurrent = winnr() + for w in wnums + execute w.'wincmd w' + let prevbuf = bufnr('#') + if prevbuf > 0 && buflisted(prevbuf) && prevbuf != btarget + buffer # + else + bprevious + endif + if btarget == bufnr('%') + " Numbers of listed buffers which are not the target to be deleted. + let blisted = filter(range(1, bufnr('$')), 'buflisted(v:val) && v:val != btarget') + " Listed, not target, and not displayed. + let bhidden = filter(copy(blisted), 'bufwinnr(v:val) < 0') + " Take the first buffer, if any (could be more intelligent). + let bjump = (bhidden + blisted + [-1])[0] + if bjump > 0 + execute 'buffer '.bjump + else + execute 'enew'.a:bang + endif + endif + endfor + execute 'bdelete'.a:bang.' '.btarget + execute wcurrent.'wincmd w' +endfunction +command! -bang -complete=buffer -nargs=? Bclose call Bclose(, ) +nnoremap bd :Bclose diff --git a/nvim/init.vim b/nvim/init.vim index afbd492..ca0db41 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,321 +1,12 @@ -call plug#begin('~/.config/nvim/bundle') -" USEFUL -" Editor config -Plug 'editorconfig/editorconfig-vim' +let g:nvim_config_root = stdpath('config') +let g:config_file_list = [ +\ 'plugins.vim', +\ 'options.vim', +\ 'mappings.vim', +\ 'functions.vim', +\ 'pluginoptions.vim', +\ ] -" comment plugin -Plug 'tpope/vim-commentary' - -" brackets management -Plug 'tpope/vim-surround' - -" Snippets -Plug 'SirVer/ultisnips' - -" WINDOW MANAGEMENT - -" tmux navigator -Plug 'christoomey/vim-tmux-navigator' - -" winresizer -Plug 'simeji/winresizer' - -" goyo -Plug 'junegunn/goyo.vim' - -" FILE MANAGEMENT -" nerd-tree -Plug 'scrooloose/nerdtree' - -" fzf plugin -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } -Plug 'junegunn/fzf.vim' - -" vimwiki -Plug 'vimwiki/vimwiki' - -" GIT STUFF -" git -Plug 'tpope/vim-fugitive' - -" vim gitgutter -Plug 'airblade/vim-gitgutter' - -" COLORS -" Plastic colorscheme -Plug 'aonemd/kuroi.vim' - -" Color higlighting -Plug 'norcalli/nvim-colorizer.lua' - -" powerline -Plug 'vim-airline/vim-airline' - -" language packs -Plug 'sheerun/vim-polyglot' - -" latex -Plug 'lervag/vimtex' - -" All of your Plugins must be added before the following line -call plug#end() - -" nvim setup -" syntax -syntax on -let mapleader=" " - -" color settings -set termguicolors -colorscheme kuroi -set background=dark -hi MatchParen guibg=NONE guifg=red gui=bold - -" random settings -set number -set clipboard=unnamed -set mouse=nvi -" set smarttab -set expandtab -set tabstop=4 -set visualbell -set virtualedit=block -set scrolloff=1 -set wildmenu -set autoread -set lazyredraw -set history=250 -set noshowmode - -" tabs and line wrap -set tabstop=4 -set wrapmargin=8 -set softtabstop=0 noexpandtab -set shiftwidth=4 -set backspace=2 -set backspace=indent,eol,start -set encoding=utf-8 -set autoindent - -" search -set incsearch -set hlsearch -set smartcase - -" REMAPS - -" search for visual selection -vnoremap // y/" -nnoremap H ^ - -" ex command -cnoremap -cnoremap - -" auto expand brackets -inoremap (; ()O -inoremap (, (),O -inoremap {; {}O -inoremap {, {},O -inoremap [; []O -inoremap [, [],O - -" toggle hybrid mode -nnoremap h :set rnu! - -" Disable Backup and Swap files -set noswapfile -set nobackup -set nowritebackup - -" setup split -set splitbelow -set splitright - -" Enable folding -set foldmethod=indent -set foldlevel=99 - -" auto reload .vimrc on write -autocmd BufWritePost init.vim source % - -" toggle hybrid number mode -:augroup numbertoggle -: autocmd! -: autocmd BufEnter,FocusGained,InsertLeave * set relativenumber -: autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber -:augroup END - -" Delete buffer while keeping window layout (don't close buffer's windows). -" Version 2008-11-18 from http://vim.wikia.com/wiki/VimTip165 -if v:version < 700 || exists('loaded_bclose') || &cp - finish -endif -let loaded_bclose = 1 -if !exists('bclose_multiple') - let bclose_multiple = 1 -endif - -" Display an error message. -function! s:Warn(msg) - echohl ErrorMsg - echomsg a:msg - echohl NONE -endfunction - -" Command ':Bclose' executes ':bd' to delete buffer in current window. -" The window will show the alternate buffer (Ctrl-^) if it exists, -" or the previous buffer (:bp), or a blank buffer if no previous. -" Command ':Bclose!' is the same, but executes ':bd!' (discard changes). -" An optional argument can specify which buffer to close (name or number). -function! s:Bclose(bang, buffer) - if empty(a:buffer) - let btarget = bufnr('%') - elseif a:buffer =~ '^\d\+$' - let btarget = bufnr(str2nr(a:buffer)) - else - let btarget = bufnr(a:buffer) - endif - if btarget < 0 - call s:Warn('No matching buffer for '.a:buffer) - return - endif - if empty(a:bang) && getbufvar(btarget, '&modified') - call s:Warn('No write since last change for buffer '.btarget.' (use :Bclose!)') - return - endif - " Numbers of windows that view target buffer which we will delete. - let wnums = filter(range(1, winnr('$')), 'winbufnr(v:val) == btarget') - if !g:bclose_multiple && len(wnums) > 1 - call s:Warn('Buffer is in multiple windows (use ":let bclose_multiple=1")') - return - endif - let wcurrent = winnr() - for w in wnums - execute w.'wincmd w' - let prevbuf = bufnr('#') - if prevbuf > 0 && buflisted(prevbuf) && prevbuf != btarget - buffer # - else - bprevious - endif - if btarget == bufnr('%') - " Numbers of listed buffers which are not the target to be deleted. - let blisted = filter(range(1, bufnr('$')), 'buflisted(v:val) && v:val != btarget') - " Listed, not target, and not displayed. - let bhidden = filter(copy(blisted), 'bufwinnr(v:val) < 0') - " Take the first buffer, if any (could be more intelligent). - let bjump = (bhidden + blisted + [-1])[0] - if bjump > 0 - execute 'buffer '.bjump - else - execute 'enew'.a:bang - endif - endif - endfor - execute 'bdelete'.a:bang.' '.btarget - execute wcurrent.'wincmd w' -endfunction -command! -bang -complete=buffer -nargs=? Bclose call Bclose(, ) -nnoremap bd :Bclose - -" PLUGIN SETTINGS - -" polyglot setup -let g:polyglot_disabled = ["latex"] -" nerd tree setup -let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree - -map e :NERDTreeToggle - -" AIRLINE SETUP -" sections -let g:airline_section_y = "" -let g:airline_section_z = "%l/%L:%c" -let g:airline_section_b = "%{airline#util#wrap(airline#extensions#branch#get_head(),0)}" -" other stuff -let g:airline_theme='luna' -let g:airline_powerline_fonts = 1 -let g:airline_inactive_collapse=1 -let g:airline_skip_empty_sections = 1 -let g:airline#extensions#whitespace#enabled = 0 -let g:airline#extensions#wordcount#enabled = 0 -let g:airline#extensions#keymap#enabled = 0 -set ttimeoutlen=50 - -" gitgutter setup -let g:gitgutter_sign_added = '∙' -let g:gitgutter_sign_modified = '∙' -let g:gitgutter_sign_removed = '∙' -let g:gitgutter_sign_modified_removed = '∙' -augroup VimDiff - autocmd! - autocmd VimEnter,FilterWritePre * if &diff | GitGutterDisable | endif -augroup END - -" fzf setup -nmap :Buffers -nmap f :GFiles -let g:fzf_buffers_jump = 1 - -" Vimwiki setup -let g:vimwiki_list = [{'path': '~/.wiki/'}] - -" vimtex setup -let g:vimtex_compile_progname = 'nvr' - -" colors.lua setup -lua require'colorizer'.setup() - -" tmux setup -let g:tmuxcomplete#trigger = '' - -" GOYO -function! s:goyo_enter() - set noshowcmd - set scrolloff=999 -endfunction - -function! s:goyo_leave() - set showcmd - set scrolloff=1 -endfunction - -autocmd! User GoyoEnter nested call goyo_enter() -autocmd! User GoyoLeave nested call goyo_leave() - -let g:goyo_linenr = 0 - -" Autocompletion -if executable('pyls') - au User lsp_setup call lsp#register_server({ - \ 'name': 'pyls', - \ 'cmd': {server_info->['pyls']}, - \ 'whitelist': ['python'], - \ }) -endif - -function! s:on_lsp_buffer_enabled() abort - setlocal omnifunc=lsp#complete - setlocal signcolumn=yes - nmap gd (lsp-definition) - nmap (lsp-rename) - " refer to doc to add more commands -endfunction - -augroup lsp_install - au! - " call s:on_lsp_buffer_enabled only for languages that has the server registered. - autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() -augroup END - -" UltiSnips setup - -" Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. -let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" -let g:UltiSnipsSnippetDirectories=[$HOME."/.vim/snipps"] - -" If you want :UltiSnipsEdit to split your window. -let g:UltiSnipsEditSplit="vertical" +for f in g:config_file_list + execute 'source ' . g:nvim_config_root . '/' . f +endfor diff --git a/nvim/mappings.vim b/nvim/mappings.vim new file mode 100644 index 0000000..7aa9cbe --- /dev/null +++ b/nvim/mappings.vim @@ -0,0 +1,19 @@ +" REMAPS +" search for visual selection +vnoremap // y/" +nnoremap H ^ + +" ex command +cnoremap +cnoremap + +" auto expand brackets +inoremap (; ()O +inoremap (, (),O +inoremap {; {}O +inoremap {, {},O +inoremap [; []O +inoremap [, [],O + +" toggle hybrid mode +nnoremap h :set rnu! diff --git a/nvim/options.vim b/nvim/options.vim new file mode 100644 index 0000000..6f6b16e --- /dev/null +++ b/nvim/options.vim @@ -0,0 +1,55 @@ +" OPTIONS + +" syntax +syntax on +let mapleader=" " + +" color settings +set termguicolors +colorscheme kuroi +set background=dark +hi MatchParen guibg=NONE guifg=red gui=bold + +" random settings +set number +set clipboard=unnamed +set mouse=nvi +" set smarttab +set expandtab +set tabstop=4 +set visualbell +set virtualedit=block +set scrolloff=1 +set wildmenu +set autoread +set lazyredraw +set history=250 +set noshowmode + +" tabs and line wrap +set tabstop=4 +set wrapmargin=8 +set softtabstop=0 noexpandtab +set shiftwidth=4 +set backspace=2 +set backspace=indent,eol,start +set encoding=utf-8 +set autoindent + +" search +set incsearch +set hlsearch +set smartcase + +" Disable Backup and Swap files +set noswapfile +set nobackup +set nowritebackup + +" setup split +set splitbelow +set splitright + +" Enable folding +set foldmethod=indent +set foldlevel=99 diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim new file mode 100644 index 0000000..bbe9017 --- /dev/null +++ b/nvim/pluginoptions.vim @@ -0,0 +1,102 @@ +" PLUGIN OPTIONS + +" nerd tree setup +let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree + +map e :NERDTreeToggle + +" AIRLINE SETUP +" sections +let g:airline_section_y = "" +let g:airline_section_z = "%l/%L:%c" +let g:airline_section_b = "%{airline#util#wrap(airline#extensions#branch#get_head(),0)}" +" other stuff +let g:airline_theme='luna' +let g:airline_powerline_fonts = 1 +let g:airline_inactive_collapse=1 +let g:airline_skip_empty_sections = 1 +let g:airline#extensions#whitespace#enabled = 0 +let g:airline#extensions#wordcount#enabled = 0 +let g:airline#extensions#keymap#enabled = 0 +set ttimeoutlen=50 + +" gitgutter setup +let g:gitgutter_sign_added = '∙' +let g:gitgutter_sign_modified = '∙' +let g:gitgutter_sign_removed = '∙' +let g:gitgutter_sign_modified_removed = '∙' +augroup VimDiff + autocmd! + autocmd VimEnter,FilterWritePre * if &diff | GitGutterDisable | endif +augroup END + +" fzf setup +nmap :Buffers +nmap f :GFiles +let g:fzf_buffers_jump = 1 + +" Vimwiki setup +let g:vimwiki_list = [{'path': '~/.wiki/'}] + +" vimtex setup +let g:vimtex_compile_progname = 'nvr' +let g:tex_flavor = 'latex' + +" colors.lua setup +lua require'colorizer'.setup() + +" tmux setup +let g:tmuxcomplete#trigger = '' + +" GOYO +function! s:goyo_enter() + set noshowcmd + set scrolloff=999 +endfunction + +function! s:goyo_leave() + set showcmd + set scrolloff=1 +endfunction + +autocmd! User GoyoEnter nested call goyo_enter() +autocmd! User GoyoLeave nested call goyo_leave() + +let g:goyo_linenr = 0 + +" Autocompletion +if executable('pyls') + au User lsp_setup call lsp#register_server({ + \ 'name': 'pyls', + \ 'cmd': {server_info->['pyls']}, + \ 'whitelist': ['python'], + \ }) +endif + +function! s:on_lsp_buffer_enabled() abort + setlocal omnifunc=lsp#complete + setlocal signcolumn=yes + nmap gd (lsp-definition) + nmap (lsp-rename) + " refer to doc to add more commands +endfunction + +augroup lsp_install + au! + " call s:on_lsp_buffer_enabled only for languages that has the server registered. + autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() +augroup END + +" UltiSnips setup + +" Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. +let g:UltiSnipsExpandTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" +let g:UltiSnipsSnippetDirectories=[$HOME."/.vim/snipps"] + +" If you want :UltiSnipsEdit to split your window. +let g:UltiSnipsEditSplit="vertical" + +" Emmet Setup +let g:user_emmet_leader_key='' diff --git a/nvim/plugins.vim b/nvim/plugins.vim new file mode 100644 index 0000000..1d3e3af --- /dev/null +++ b/nvim/plugins.vim @@ -0,0 +1,70 @@ +" PLUGINS +call plug#begin('~/.config/nvim/bundle') +" USEFUL +" Editor config +Plug 'editorconfig/editorconfig-vim' + +" comment plugin +Plug 'tpope/vim-commentary' + +" brackets management +Plug 'tpope/vim-surround' + +" Snippets +Plug 'SirVer/ultisnips' + +" WINDOW MANAGEMENT + +" tmux navigator +Plug 'christoomey/vim-tmux-navigator' + +" winresizer +Plug 'simeji/winresizer' + +" goyo +Plug 'junegunn/goyo.vim' + +" FILE MANAGEMENT +" nerd-tree +Plug 'scrooloose/nerdtree' + +" fzf plugin +Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +Plug 'junegunn/fzf.vim' + +" vimwiki +Plug 'vimwiki/vimwiki' + +" GIT STUFF +" git +Plug 'tpope/vim-fugitive' + +" vim gitgutter +Plug 'airblade/vim-gitgutter' + +" COLORS +" Plastic colorscheme +Plug 'aonemd/kuroi.vim' + +" Color higlighting +Plug 'norcalli/nvim-colorizer.lua' + +" powerline +Plug 'vim-airline/vim-airline' + +" language packs +" disable latex before loading +let g:polyglot_disabled = ["latex"] +Plug 'sheerun/vim-polyglot' + +" latex +Plug 'lervag/vimtex' + +" Linting +Plug 'dense-analysis/ale' + +" Emmet +Plug 'mattn/emmet-vim' + +" All of your Plugins must be added before the following line +call plug#end() From 15771124895169ac9795191decdbf1ba34c7a327 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 25 Oct 2020 18:15:53 +0100 Subject: [PATCH 34/34] improve comments --- nvim/functions.vim | 2 ++ nvim/pluginoptions.vim | 43 ++++++++++++++++++++++++++++++++---------- nvim/plugins.vim | 19 +++++++++++++++---- 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/nvim/functions.vim b/nvim/functions.vim index 4e51acc..376f962 100644 --- a/nvim/functions.vim +++ b/nvim/functions.vim @@ -1,3 +1,5 @@ +" FUNCTIONS + " auto reload .vimrc on write autocmd BufWritePost init.vim source % diff --git a/nvim/pluginoptions.vim b/nvim/pluginoptions.vim index bbe9017..f14726f 100644 --- a/nvim/pluginoptions.vim +++ b/nvim/pluginoptions.vim @@ -1,11 +1,15 @@ " PLUGIN OPTIONS -" nerd tree setup +" NERD TREE SETUP +" ========================= + let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree map e :NERDTreeToggle " AIRLINE SETUP +" ========================= + " sections let g:airline_section_y = "" let g:airline_section_z = "%l/%L:%c" @@ -20,7 +24,9 @@ let g:airline#extensions#wordcount#enabled = 0 let g:airline#extensions#keymap#enabled = 0 set ttimeoutlen=50 -" gitgutter setup +" GITGUTTER SETUP +" ========================= + let g:gitgutter_sign_added = '∙' let g:gitgutter_sign_modified = '∙' let g:gitgutter_sign_removed = '∙' @@ -30,25 +36,37 @@ augroup VimDiff autocmd VimEnter,FilterWritePre * if &diff | GitGutterDisable | endif augroup END -" fzf setup +" FZF SETUP +" ========================= + nmap :Buffers nmap f :GFiles let g:fzf_buffers_jump = 1 -" Vimwiki setup +" VIMWIKI SETUP +" ========================= + let g:vimwiki_list = [{'path': '~/.wiki/'}] -" vimtex setup +" VIMTEX SETUP +" ========================= + let g:vimtex_compile_progname = 'nvr' let g:tex_flavor = 'latex' -" colors.lua setup +" COLORS.LUA SETUP +" ========================= + lua require'colorizer'.setup() -" tmux setup +" TMUX SETUP +" ========================= + let g:tmuxcomplete#trigger = '' " GOYO +" ========================= + function! s:goyo_enter() set noshowcmd set scrolloff=999 @@ -64,7 +82,9 @@ autocmd! User GoyoLeave nested call goyo_leave() let g:goyo_linenr = 0 -" Autocompletion +" AUTOCOMPLETION +" ========================= + if executable('pyls') au User lsp_setup call lsp#register_server({ \ 'name': 'pyls', @@ -87,7 +107,8 @@ augroup lsp_install autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() augroup END -" UltiSnips setup +" ULTISNIPS SETUP +" ========================= " Trigger configuration. Do not use if you use https://github.com/Valloric/YouCompleteMe. let g:UltiSnipsExpandTrigger="" @@ -98,5 +119,7 @@ let g:UltiSnipsSnippetDirectories=[$HOME."/.vim/snipps"] " If you want :UltiSnipsEdit to split your window. let g:UltiSnipsEditSplit="vertical" -" Emmet Setup +" EMMET SETUP +" ========================= + let g:user_emmet_leader_key='' diff --git a/nvim/plugins.vim b/nvim/plugins.vim index 1d3e3af..82f3ff6 100644 --- a/nvim/plugins.vim +++ b/nvim/plugins.vim @@ -1,6 +1,8 @@ " PLUGINS call plug#begin('~/.config/nvim/bundle') " USEFUL +" =================== + " Editor config Plug 'editorconfig/editorconfig-vim' @@ -14,6 +16,7 @@ Plug 'tpope/vim-surround' Plug 'SirVer/ultisnips' " WINDOW MANAGEMENT +" =================== " tmux navigator Plug 'christoomey/vim-tmux-navigator' @@ -25,6 +28,8 @@ Plug 'simeji/winresizer' Plug 'junegunn/goyo.vim' " FILE MANAGEMENT +" =================== + " nerd-tree Plug 'scrooloose/nerdtree' @@ -36,6 +41,8 @@ Plug 'junegunn/fzf.vim' Plug 'vimwiki/vimwiki' " GIT STUFF +" =================== + " git Plug 'tpope/vim-fugitive' @@ -43,6 +50,8 @@ Plug 'tpope/vim-fugitive' Plug 'airblade/vim-gitgutter' " COLORS +" =================== + " Plastic colorscheme Plug 'aonemd/kuroi.vim' @@ -52,7 +61,12 @@ Plug 'norcalli/nvim-colorizer.lua' " powerline Plug 'vim-airline/vim-airline' -" language packs +" LANGUAGES +" =================== + +" Linting +Plug 'dense-analysis/ale' + " disable latex before loading let g:polyglot_disabled = ["latex"] Plug 'sheerun/vim-polyglot' @@ -60,9 +74,6 @@ Plug 'sheerun/vim-polyglot' " latex Plug 'lervag/vimtex' -" Linting -Plug 'dense-analysis/ale' - " Emmet Plug 'mattn/emmet-vim'