From f5d56602df70950de6b7d40966b00c9939c81763 Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Sun, 26 Jan 2020 17:16:07 +0100 Subject: Intial commit of v2 See https://drewdevault.com/2019/12/30/dotfiles.html --- .vim/.ignore | 1 + .vim/UltiSnips/all.snippets | 9 + .vim/UltiSnips/ebuild.snippets | 25 + .vim/UltiSnips/go.snippets | 12 + .vim/UltiSnips/markdown.snippets | 20 + .vim/UltiSnips/tex.snippets | 31 + .vim/UltiSnips/zettel.snippets | 3 + .vim/after/ftplugin/c.vim | 81 + .vim/after/ftplugin/crontab.vim | 1 + .vim/after/ftplugin/diff.vim | 33 + .vim/after/ftplugin/gitrebase.vim | 8 + .vim/after/ftplugin/go.vim | 77 + .vim/after/ftplugin/gotmpl.vim | 1 + .vim/after/ftplugin/i3.vim | 1 + .vim/after/ftplugin/ledger.vim | 1 + .vim/after/ftplugin/mail.vim | 22 + .vim/after/ftplugin/make.vim | 2 + .vim/after/ftplugin/markdown.vim | 27 + .vim/after/ftplugin/python.vim | 3 + .vim/after/ftplugin/rust.vim | 72 + .vim/after/ftplugin/snippets.vim | 1 + .vim/after/ftplugin/tex.vim | 0 .vim/after/ftplugin/toml.vim | 6 + .vim/after/ftplugin/vim.vim | 1 + .vim/after/plugin/clap.vim | 8 + .vim/after/plugin/coc.vim | 84 + .vim/after/plugin/line_bufferline.vim | 30 + .vim/after/plugin/line_obsession.vim | 10 + .vim/after/plugin/lsp.vim | 22 + .vim/after/plugin/neomake.vim | 60 + .vim/after/plugin/writing.vim | 108 + .vim/autoload/alternate.vim | 8 + .vim/autoload/daymode.vim | 34 + .vim/autoload/fasd.vim | 18 + .vim/autoload/fuzz.vim | 140 ++ .../lightline/colorscheme/papercolor_dim.vim | 56 + .vim/autoload/numbertoggle.vim | 17 + .vim/autoload/plug.vim | 2526 ++++++++++++++++++++ .vim/autoload/popup.vim | 215 ++ .vim/autoload/retab.vim | 7 + .vim/autoload/split_term.vim | 69 + .vim/autoload/zettel.vim | 37 + .vim/coc-settings.json | 82 + .vim/doc/how-to-do-things.md | 9 + .vim/ftdetect/h.vim | 1 + .vim/ftdetect/journal.vim | 1 + .vim/ftdetect/pixy.vim | 1 + .vim/ftdetect/scarlet.vim | 1 + .vim/ftdetect/zettel.vim | 4 + .vim/general.vim | 65 + .vim/init.vim | 286 +++ .vim/init_veonim.vim | 34 + .vim/lua/split_term/init.lua | 46 + .vim/plug.vim | 102 + .vim/plugin/fuzz.vim | 16 + .vim/plugin/hard.vim | 65 + .vim/plugin/line.vim | 159 ++ .vim/plugin/split_term.vim | 11 + .vim/syntax/gotmpl.vim | 93 + 59 files changed, 4863 insertions(+) create mode 100644 .vim/.ignore create mode 100644 .vim/UltiSnips/all.snippets create mode 100644 .vim/UltiSnips/ebuild.snippets create mode 100644 .vim/UltiSnips/go.snippets create mode 100644 .vim/UltiSnips/markdown.snippets create mode 100644 .vim/UltiSnips/tex.snippets create mode 100644 .vim/UltiSnips/zettel.snippets create mode 100644 .vim/after/ftplugin/c.vim create mode 100644 .vim/after/ftplugin/crontab.vim create mode 100644 .vim/after/ftplugin/diff.vim create mode 100644 .vim/after/ftplugin/gitrebase.vim create mode 100644 .vim/after/ftplugin/go.vim create mode 100644 .vim/after/ftplugin/gotmpl.vim create mode 100644 .vim/after/ftplugin/i3.vim create mode 100644 .vim/after/ftplugin/ledger.vim create mode 100644 .vim/after/ftplugin/mail.vim create mode 100644 .vim/after/ftplugin/make.vim create mode 100644 .vim/after/ftplugin/markdown.vim create mode 100644 .vim/after/ftplugin/python.vim create mode 100644 .vim/after/ftplugin/rust.vim create mode 100644 .vim/after/ftplugin/snippets.vim create mode 100644 .vim/after/ftplugin/tex.vim create mode 100644 .vim/after/ftplugin/toml.vim create mode 100644 .vim/after/ftplugin/vim.vim create mode 100644 .vim/after/plugin/clap.vim create mode 100644 .vim/after/plugin/coc.vim create mode 100644 .vim/after/plugin/line_bufferline.vim create mode 100644 .vim/after/plugin/line_obsession.vim create mode 100644 .vim/after/plugin/lsp.vim create mode 100644 .vim/after/plugin/neomake.vim create mode 100644 .vim/after/plugin/writing.vim create mode 100644 .vim/autoload/alternate.vim create mode 100644 .vim/autoload/daymode.vim create mode 100644 .vim/autoload/fasd.vim create mode 100644 .vim/autoload/fuzz.vim create mode 100644 .vim/autoload/lightline/colorscheme/papercolor_dim.vim create mode 100644 .vim/autoload/numbertoggle.vim create mode 100644 .vim/autoload/plug.vim create mode 100644 .vim/autoload/popup.vim create mode 100644 .vim/autoload/retab.vim create mode 100644 .vim/autoload/split_term.vim create mode 100644 .vim/autoload/zettel.vim create mode 100644 .vim/coc-settings.json create mode 100644 .vim/doc/how-to-do-things.md create mode 100644 .vim/ftdetect/h.vim create mode 100644 .vim/ftdetect/journal.vim create mode 100644 .vim/ftdetect/pixy.vim create mode 100644 .vim/ftdetect/scarlet.vim create mode 100644 .vim/ftdetect/zettel.vim create mode 100644 .vim/general.vim create mode 100644 .vim/init.vim create mode 100644 .vim/init_veonim.vim create mode 100644 .vim/lua/split_term/init.lua create mode 100644 .vim/plug.vim create mode 100644 .vim/plugin/fuzz.vim create mode 100644 .vim/plugin/hard.vim create mode 100644 .vim/plugin/line.vim create mode 100644 .vim/plugin/split_term.vim create mode 100644 .vim/syntax/gotmpl.vim (limited to '.vim') diff --git a/.vim/.ignore b/.vim/.ignore new file mode 100644 index 0000000..060f79b --- /dev/null +++ b/.vim/.ignore @@ -0,0 +1 @@ +plugged/ diff --git a/.vim/UltiSnips/all.snippets b/.vim/UltiSnips/all.snippets new file mode 100644 index 0000000..780be8b --- /dev/null +++ b/.vim/UltiSnips/all.snippets @@ -0,0 +1,9 @@ +snippet sign "Signature" +${1:Cheers}, + +Robert Günzler +endsnippet + +snippet now "Timestamp (rfc3999)" +`now` +endsnippet diff --git a/.vim/UltiSnips/ebuild.snippets b/.vim/UltiSnips/ebuild.snippets new file mode 100644 index 0000000..ef736ab --- /dev/null +++ b/.vim/UltiSnips/ebuild.snippets @@ -0,0 +1,25 @@ +snippet eapi7 "eapi7" +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="$2" +HOMEPAGE="$3" + +if [[ ${PV} = *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/$1/${PN}.git" +else + SRC_URI="https://github.com/$1/${PN}/releases/download/v${PV}/${P}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="" + +DEPEND="$0" +RDEPEND="${DEPEND}" +BDEPEND="" +endsnippet diff --git a/.vim/UltiSnips/go.snippets b/.vim/UltiSnips/go.snippets new file mode 100644 index 0000000..9233be0 --- /dev/null +++ b/.vim/UltiSnips/go.snippets @@ -0,0 +1,12 @@ +snippet main "func main()" +func main() { + ${0} +} +endsnippet + +snippet 'if err' "if err != nil {}" +if err != nil { + $1 +} +$0 +endsnippet diff --git a/.vim/UltiSnips/markdown.snippets b/.vim/UltiSnips/markdown.snippets new file mode 100644 index 0000000..9972963 --- /dev/null +++ b/.vim/UltiSnips/markdown.snippets @@ -0,0 +1,20 @@ +snippet link "Link" +[$1](${2:${VISUAL}}) +endsnippet + +snippet code "Code block" b +\`\`\`$1 +${2:${VISUAL}} +\`\`\` +$0 +endsnippet + +snippet detail "Detail block" b +
+$1 + +${2:${VISUAL}} + +
+$0 +endsnippet diff --git a/.vim/UltiSnips/tex.snippets b/.vim/UltiSnips/tex.snippets new file mode 100644 index 0000000..9fb2880 --- /dev/null +++ b/.vim/UltiSnips/tex.snippets @@ -0,0 +1,31 @@ +snippet beg "begin{} / end{}" bA +\begin{$1} +$0 +\end{$1} +endsnippet + +snippet mk "Math" wA +$${1}$ $0 +endsnippet +snippet dm "Math" iA +\[ + ${1:${VISUAL}} +.\] $0 +endsnippet + +snippet // "Fraction" iA +\\frac{$1}{$2}$0 +endsnippet + +snippet fun "Function" wA +f: \R \to \R +endsnippet +snippet sum "Sum" wA +\sum_{n=1}^{${1:\infty}} $0 +endsnippet +snippet !> "Maps to" wA +\mapsto +endsnippet +snippet -> "To" wA +\to +endsnippet diff --git a/.vim/UltiSnips/zettel.snippets b/.vim/UltiSnips/zettel.snippets new file mode 100644 index 0000000..4fb343e --- /dev/null +++ b/.vim/UltiSnips/zettel.snippets @@ -0,0 +1,3 @@ +snippet h "hyperlink" +[[$1]]$0 +endsnippet diff --git a/.vim/after/ftplugin/c.vim b/.vim/after/ftplugin/c.vim new file mode 100644 index 0000000..85ff8a2 --- /dev/null +++ b/.vim/after/ftplugin/c.vim @@ -0,0 +1,81 @@ +setlocal cindent + +setlocal foldmethod=syntax +setlocal foldlevel=10 + +if exists('g:loaded_gutentags') + let g:gutentags_enabled = 1 +endif + +" toggle between header and implementation in c/cpp +function! Alternate_c() + let file = expand('%') + if match(file, '\.c') > 0 + exe ':e %<.h' + elseif match(file, '\.h') > 0 + exe ':e %<.c' + endif +endfunction + +nmap a :call alternate#alternate() + +" source: https://github.com/igankevich/mesonic/blob/master/plugin/meson.vim +function! MesonProjectDir() + let l:dir = getcwd() " a starting directory to look for meson.build file + let l:project_dir = l:dir " the top-most directory with meson.build file + let l:nesting = 100 " maximal no. of subdirectories in a project + + " find top-most directory with readable meson.build file + while fnamemodify(l:dir, ':p') !=# '/' && l:nesting > 0 + if filereadable(l:dir . '/' . 'meson.build') + let l:project_dir = l:dir + endif + let l:dir = l:dir . '/..' + let l:nesting = l:nesting - 1 + endwhile + + " why one needs to do it two times? + let l:project_dir = fnamemodify(l:project_dir, ':p') + let l:project_dir = fnamemodify(l:project_dir, ':p') + return l:project_dir +endfunction + +if exists('g:loaded_neomake') + function! s:ninja_InitForJob(_jobinfo) dict + " set cwd to project dir + if !has_key(self, 'cwd') + let self.cwd = MesonProjectDir() + endif + " generate new error format lines + " source: https://github.com/igankevich/mesonic/blob/master/compiler/meson.vim#L67 + if !has_key(self, 'errorformat') + let g:meson_error_format = [ + \ '%EMeson encountered an error in file ' . l:project_subdir . '%f\, line %l\, column %c:,%Z%m', + \ '%Dninja: Entering directory `%f''', + \ '%f:%l.%c-%[%^:]%#: %t%[%^:]%#: %m' + \ ] + let self.errorformat = join(g:meson_error_format, ',') + endif + return self + endfunction + function! s:ninja_postprocess(entry) + if empty(a:entry.type) + let a:entry.type = 'E' + endif + endfunction + let g:neomake_c_ninja_maker = { + \ 'exe': 'ninja', + \ 'args': ['-C', 'build'], + \ 'append_file': 0, + \ 'postprocess': function('s:ninja_postprocess'), + \ 'InitForJob': function('s:ninja_InitForJob'), + \ } + let g:neomake_c_ninjaclean_maker = { + \ 'exe': 'ninja', + \ 'args': ['-C', 'build', 'clean'], + \ 'append_file': 0, + \ 'postprocess': function('s:ninja_postprocess'), + \ 'InitForJob': function('s:ninja_InitForJob'), + \ } + let g:neomake_c_enabled_makers = ['ninja'] +endif diff --git a/.vim/after/ftplugin/crontab.vim b/.vim/after/ftplugin/crontab.vim new file mode 100644 index 0000000..46faa33 --- /dev/null +++ b/.vim/after/ftplugin/crontab.vim @@ -0,0 +1 @@ +autocmd filetype crontab setlocal nobackup nowritebackup diff --git a/.vim/after/ftplugin/diff.vim b/.vim/after/ftplugin/diff.vim new file mode 100644 index 0000000..49974ec --- /dev/null +++ b/.vim/after/ftplugin/diff.vim @@ -0,0 +1,33 @@ +" disable annoying plugins +let b:coc_enabled = 0 +silent NeomakeDisable + +command! FindMergeMarker execute 'normal /^<<<<<<' + +" shortcuts for 3-way merges +command! DiffGetLocal :diffget LOCAL +command! DiffGetRemote :diffget REMOTE +" quicksave +command! DiffSave :wqa + +cnoreabbrev fmm FindMergeMarker +cnoreabbrev dgl DiffGetLocal +cnoreabbrev dgr DiffGetRemote +cnoreabbrev ds DiffSave + + +let s:markers = { + \ 'ours': '^<<<<<<< ', + \ 'theirs': '^>>>>>>> ', + \ 'base': '^||||||| ', + \ 'delimiter': '^=======\r\?$', + \ } + +if &diff + " set custom ctags in diff mode + + let _ft=&filetype + let g:vista_ctags_cmd = { + \ _ft: 'ctags --format=2 --excmd=pattern --fields=nksSaf --file-scope=yes --sort=no --append=no --output-format=json --fields=-PF -f-', + \ } +endif diff --git a/.vim/after/ftplugin/gitrebase.vim b/.vim/after/ftplugin/gitrebase.vim new file mode 100644 index 0000000..e97d225 --- /dev/null +++ b/.vim/after/ftplugin/gitrebase.vim @@ -0,0 +1,8 @@ +set keywordprg=:GitShow +command! -nargs=1 -bar GitShow call s:git_show() + +function! s:git_show(commit) abort + let p = popup#new({ 'filetype': 'diff' }) + let p.contents = systemlist("git show ".a:commit) + call p.open() +endfunction diff --git a/.vim/after/ftplugin/go.vim b/.vim/after/ftplugin/go.vim new file mode 100644 index 0000000..b5c0d44 --- /dev/null +++ b/.vim/after/ftplugin/go.vim @@ -0,0 +1,77 @@ +setlocal noexpandtab +setlocal shiftwidth=8 +setlocal tabstop=8 + +let g:go_echo_go_info = 0 +let g:go_auto_type_info = 0 +" let g:go_info_mode = 'gocode' +" let g:go_auto_sameids = 1 +" let g:go_gocode_unimported_packages = 0 +" let g:go_list_type = 'quickfix' +let g:go_template_autocreate = 0 + +let g:go_mod_fmt_autosave = 1 +let g:go_fmt_autosave = 1 +let g:go_fmt_command = 'goimports' +let g:go_fmt_fail_silently = 1 +let g:go_fmt_experimental = 1 " solves https://github.com/fatih/vim-go/issues/502 + +" let g:go_term_enabled = 0 +" let g:go_term_mode = 'split' + +let g:go_metalinter_autosave = 0 +let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck'] +let g:go_metalinter_autosave_enabled = ['vet', 'golint'] +let g:go_metalinter_deadline = '2s' + +" let g:go_highlight_functions = 1 +" let g:go_highlight_methods = 1 +" let g:go_highlight_fields = 1 +" let g:go_highlight_structs = 1 +" let g:go_highlight_interfaces = 1 +" let g:go_highlight_build_constraints = 1 +" let g:go_highlight_types = 1 +" let g:go_highlight_extra_types = 1 +" let g:go_highlight_operators = 1 +" let g:go_highlight_space_tab_error = 1 +" let g:go_highlight_array_whitespace_error = 1 +" let g:go_highlight_trailing_whitespace_error = 1 + +function! Alternate_go() + call (go-alternate-edit) +endfunction + +" augroup go +" au! +" au VimEnter go call vista#RunForNearestMethodOrFunction() +" augroup END + +if exists('g:loaded_neomake') + let g:neomake_go_build_maker = { + \ 'exe': 'go', + \ 'args': 'build', + \ 'append_file': 0, + \ } + " let g:neomake_go_golangci_lint_args = ['run', '--out-format=line-number', '--print-issued-lines=false'] + let g:neomake_go_enabled_makers = ['go', 'golangci_lint'] +endif + +" https://github.com/fatih/dotfiles/blob/master/vimrc#L380 +" create a go doc comment based on the word under the cursor +function! s:create_go_doc_comment() + norm "zyiw + execute ":put! z" + execute ":norm I// \$" +endfunction +nnoremap ui :call create_go_doc_comment() + +" let b:deoplete_disable_auto_complete = 0 +" let g:neoformat_enabled_go = [] +" + +if exists('g:did_coc_loaded') + augroup CoC + au! + au BufWritePre * CocCommand editor.action.organizeImport + augroup END +endif diff --git a/.vim/after/ftplugin/gotmpl.vim b/.vim/after/ftplugin/gotmpl.vim new file mode 100644 index 0000000..cf481c4 --- /dev/null +++ b/.vim/after/ftplugin/gotmpl.vim @@ -0,0 +1 @@ +set commentstring= diff --git a/.vim/after/ftplugin/i3.vim b/.vim/after/ftplugin/i3.vim new file mode 100644 index 0000000..9c2e80a --- /dev/null +++ b/.vim/after/ftplugin/i3.vim @@ -0,0 +1 @@ +set commentstring=#\ %s diff --git a/.vim/after/ftplugin/ledger.vim b/.vim/after/ftplugin/ledger.vim new file mode 100644 index 0000000..0aa29a3 --- /dev/null +++ b/.vim/after/ftplugin/ledger.vim @@ -0,0 +1 @@ +let g:ledger_bin = 'hledger' diff --git a/.vim/after/ftplugin/mail.vim b/.vim/after/ftplugin/mail.vim new file mode 100644 index 0000000..108cbf7 --- /dev/null +++ b/.vim/after/ftplugin/mail.vim @@ -0,0 +1,22 @@ +" backup aerc mails to a draft directory +let g:mail_draft_dir = $HOME.'/.aerc/drafts' + +function! SaveDraft() + if !isdirectory(g:mail_draft_dir) + call mkdir(g:mail_draft_dir, 'p') + endif + let draft = join([g:mail_draft_dir, expand('%:t')], '/') + execute 'silent! write! '.draft +endfunction + +function! RestoreFromDraft() + let draft = join([g:mail_draft_dir, expand('%:t')], '/') + echoerr 'todo' +endfunction + +augroup vim_mail + au! + au CursorHold * call SaveDraft() +augroup END + +set commentstring=>\ %s diff --git a/.vim/after/ftplugin/make.vim b/.vim/after/ftplugin/make.vim new file mode 100644 index 0000000..840c87a --- /dev/null +++ b/.vim/after/ftplugin/make.vim @@ -0,0 +1,2 @@ +" Disable tabs->spaces for Makefiles +autocmd filetype make setlocal noexpandtab diff --git a/.vim/after/ftplugin/markdown.vim b/.vim/after/ftplugin/markdown.vim new file mode 100644 index 0000000..0d42ff0 --- /dev/null +++ b/.vim/after/ftplugin/markdown.vim @@ -0,0 +1,27 @@ +setlocal foldlevel=1 + +if exists('g:loaded_lexima') + let g:lexima_enable_space_rules=0 +endif + +function! s:markdown_underline(bang) + call append(line('.'), substitute(getline('.'), '.', (a:bang ? '-' : '='), 'g')) +endfunction +command! -nargs=0 -bang Underline call s:markdown_underline(0) + +if exists('g:loaded_neomake') + let g:neomake_markdown_shiba_maker = { + \ 'exe': 'shiba', + \ 'args': ['--detach', '%:p'], + \ 'append_file': 0, + \ } + let g:neomake_markdown_enabled_makers = [] +endif + +augroup Markdown + au! + " au FileType markdown NeomakeDisableBuffer + + " Make vim-markdown-folding ignore frontmatter blocks + au BufNewFile,BufRead markdown syntax match Comment /\%^---\_.\{-}---$/ +augroup END diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim new file mode 100644 index 0000000..667d22e --- /dev/null +++ b/.vim/after/ftplugin/python.vim @@ -0,0 +1,3 @@ +let g:neomake_python_enabled_makers = [] +let g:neoformat_enabled_python = ["yapf"] + diff --git a/.vim/after/ftplugin/rust.vim b/.vim/after/ftplugin/rust.vim new file mode 100644 index 0000000..9bf2ca9 --- /dev/null +++ b/.vim/after/ftplugin/rust.vim @@ -0,0 +1,72 @@ +set tags='./rusty-tags.vi/' + +if exists('g:loaded_lexima') + call lexima#add_rule({'filetype': ['rust'], 'char': "'", 'at': '<\%# | &\%#'}) +endif + +let g:racer_cmd = $HOME.'/.cargo/bin/racer' + +" let g:gutentags_enabled = 0 +" let g:gutentags_define_advanced_commands = 1 +" let g:gutentags_ctags_executable_rust = 'rusty-tags' +" let g:gutentags_ctags_extra_args = ['--omit-deps', 'vi'] +" let g:gutentags_ctags_tagfile = 'rusty-tags.vi' + +" when using standard ctags +let g:tagbar_type_rust = { + \ 'ctagstype' : 'rust', + \ 'kinds' : [ + \'T:types,type definitions', + \'f:functions,function definitions', + \'g:enum,enumeration names', + \'s:structure names', + \'m:modules,module names', + \'c:consts,static constants', + \'t:traits', + \'i:impls,trait implementations', + \] + \} + +" when using universal-ctags +" let g:rust_use_custom_ctags_defs = 1 " if using rust.vim +" let g:tagbar_type_rust = { +" \ 'ctagstype' : 'rust', +" \ 'kinds' : [ +" \ 'n:modules', +" \ 's:structures:1', +" \ 'i:interfaces', +" \ 'c:implementations', +" \ 'f:functions:1', +" \ 'g:enumerations:1', +" \ 't:type aliases:1:0', +" \ 'v:constants:1:0', +" \ 'M:macros:1', +" \ 'm:fields:1:0', +" \ 'e:enum variants:1:0', +" \ 'P:methods:1', +" \ ], +" \ 'sro': '::', +" \ 'kind2scope' : { +" \ 'n': 'module', +" \ 's': 'struct', +" \ 'i': 'interface', +" \ 'c': 'implementation', +" \ 'f': 'function', +" \ 'g': 'enum', +" \ 't': 'typedef', +" \ 'v': 'variable', +" \ 'M': 'macro', +" \ 'm': 'field', +" \ 'e': 'enumerator', +" \ 'P': 'method', +" \ }, +" \ } + +let g:neomake_rust_enabled_makers = ['cargo'] + +" augroup rust +" au! +" augroup END + +" nmap d (rust-doc) +" nmap j (rust-def) diff --git a/.vim/after/ftplugin/snippets.vim b/.vim/after/ftplugin/snippets.vim new file mode 100644 index 0000000..cb39fa6 --- /dev/null +++ b/.vim/after/ftplugin/snippets.vim @@ -0,0 +1 @@ +set list diff --git a/.vim/after/ftplugin/tex.vim b/.vim/after/ftplugin/tex.vim new file mode 100644 index 0000000..e69de29 diff --git a/.vim/after/ftplugin/toml.vim b/.vim/after/ftplugin/toml.vim new file mode 100644 index 0000000..03bf098 --- /dev/null +++ b/.vim/after/ftplugin/toml.vim @@ -0,0 +1,6 @@ +" let g:neoformat_toml_tomlfix = { +" \ 'exe': 'tomlfix', +" \ 'args': ['-w'], +" \ 'replace': 1, +" \ } +" let g:neoformat_enabled_toml = ['tomlfix'] diff --git a/.vim/after/ftplugin/vim.vim b/.vim/after/ftplugin/vim.vim new file mode 100644 index 0000000..a6014c7 --- /dev/null +++ b/.vim/after/ftplugin/vim.vim @@ -0,0 +1 @@ +set foldmethod=marker diff --git a/.vim/after/plugin/clap.vim b/.vim/after/plugin/clap.vim new file mode 100644 index 0000000..b5d48db --- /dev/null +++ b/.vim/after/plugin/clap.vim @@ -0,0 +1,8 @@ +if !exists('g:loaded_clap') + finish +endif + +let g:clap_selected_sign = { 'text': '* ', 'texthl': "WarningMsg", "linehl": "ClapSelected" } + +nnoremap cc :Clap +nmap cg :Clap grep diff --git a/.vim/after/plugin/coc.vim b/.vim/after/plugin/coc.vim new file mode 100644 index 0000000..2ebe27a --- /dev/null +++ b/.vim/after/plugin/coc.vim @@ -0,0 +1,84 @@ +" coc json config -> ../../coc-settings.json +if !exists('g:did_coc_loaded') + finish +endif + +set completeopt=noinsert,menuone,noselect +set completeopt-=preview +set shortmess+=c +" set showmatch + +" let g:coc_auto_copen = 1 +let g:coc_snippet_next = '' +let g:coc_snippet_prev = '' + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" inoremap +" \ pumvisible() ? "\" : +" \ check_back_space() ? "\" : +" \ coc#refresh() +inoremap + \ pumvisible() ? coc#_select_confirm() : + \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : + \ check_back_space() ? "\" : + \ coc#refresh() + +inoremap pumvisible() ? "\" : "\" +inoremap pumvisible() ? "\" : "\u\" +inoremap coc#refresh() + +vmap (coc-snippets-select) + +nmap [c (coc-diagnostic-next) +nmap ]c (coc-diagnostic-prev) +nmap lc :CocList diagnostics + +imap (coc-complete-custom) +nmap d (coc-definition) +nmap t (coc-type-definition) +nmap i (coc-implementation) +nmap r (coc-references) +nmap rn (coc-rename) +nmap qf (coc-fix-current) +nmap ac (coc-codeaction) + +xmap f (coc-format-selected) +nmap f (coc-format-selected) + +xmap a (coc-codeaction-current) +nmap a (coc-codeaction-current) +nmap ac (coc-codeaction) + +nmap o :CocList outline + +function! s:show_doc() + if (index(['vim', 'help'], &filetype) >= 0) + execute 'h ' . expand('') + else + call CocAction('doHover') + endif +endfunction +nmap i :silent! call show_doc() + +au CursorHold * silent call CocActionAsync('highlight') + +command! -nargs=0 Format :call CocAction('format') +command! -nargs=? Fold :call CocAction('fold', ) + +let g:lightline.component_function.coc = 'LightLineCocStatus' +function! LightLineCocStatus() + let info = get(b:, 'coc_diagnostic_info', {}) + if empty(info) | return '' | endif + let msgs = [] + if get(info, 'error', 0) + call add(msgs, '✘ ' . info['error']) + endif + if get(info, 'warning', 0) + call add(msgs, '‼ ' . info['warning']) + endif + return 'coc: ' . join(msgs, ' ') +endfunction diff --git a/.vim/after/plugin/line_bufferline.vim b/.vim/after/plugin/line_bufferline.vim new file mode 100644 index 0000000..551790f --- /dev/null +++ b/.vim/after/plugin/line_bufferline.vim @@ -0,0 +1,30 @@ +if !exists('g:loaded_bufferline') + finish +endif + +if !exists('g:lightline.tabline.left') + let g:lightline.tabline.left = [] +endif +let g:lightline.tabline.left += [['bufferline']] +let g:lightline.component_expand.bufferline = 'LightLineBufferline' +let g:lightline.component_type.bufferline = 'tabsel' + +function! LightLineBufferline() + call bufferline#refresh_status() + let l:buffers = [ + \ g:bufferline_status_info.before, + \ g:bufferline_status_info.current, + \ g:bufferline_status_info.after + \ ] + + function! s:fmt(key, val) + let limit = 25 + if strlen(a:val) > limit + return trim(a:val)[:limit] . '..' + endif + return trim(a:val) + endfunction + + call map(l:buffers, function('s:fmt')) + return l:buffers +endfunction diff --git a/.vim/after/plugin/line_obsession.vim b/.vim/after/plugin/line_obsession.vim new file mode 100644 index 0000000..c4f774f --- /dev/null +++ b/.vim/after/plugin/line_obsession.vim @@ -0,0 +1,10 @@ +if !exists('g:loaded_obsession') + finish +endif + +let g:lightline.component_function.obsession = 'LightLineSession' + +function! LightLineSession() + let l:indicator = ObsessionStatus('active', 'paused') + return l:indicator ? '[obs '.l:indicator.']' : '' +endfunction diff --git a/.vim/after/plugin/lsp.vim b/.vim/after/plugin/lsp.vim new file mode 100644 index 0000000..d31886a --- /dev/null +++ b/.vim/after/plugin/lsp.vim @@ -0,0 +1,22 @@ +" if !has('nvim-0.5.0') +" echoerr 'nvim_lsp only works with neovim>=0.5.0' +" finish +" endif +finish + +silent LspInstall bashls +silent LspInstall cssls + +" call nvim_lsp#setup("gopls", {}) +call nvim_lsp#setup("pyls", {}) +call nvim_lsp#setup("rust_analyzer", {}) +call nvim_lsp#setup("texlab", {}) + +autocmd Filetype bash,shell,css,go,python,rust,tex,latex setl omnifunc=lsp#omnifunc + +nnoremap gd :call lsp#text_document_definition() +nnoremap gdc :call lsp#text_document_declaration() +nnoremap gt :call lsp#text_document_type_definition() +nnoremap gi :call lsp#text_document_implementation() +nnoremap ;h :call lsp#text_document_hover() +nnoremap ;s :call lsp#text_document_signature_help() diff --git a/.vim/after/plugin/neomake.vim b/.vim/after/plugin/neomake.vim new file mode 100644 index 0000000..7024408 --- /dev/null +++ b/.vim/after/plugin/neomake.vim @@ -0,0 +1,60 @@ +if !exists('g:loaded_neomake') + finish +endif + +" Neomake +cnoreabbrev neom Neomake +cnoreabbrev nm Neomake +call neomake#configure#automake('w') + +" \ 'BufWritePost': {'delay': 0}, +let g:neomake_error_sign = {'text': '✘', 'texthl': 'NeomakeErrorSign'} +let g:neomake_warning_sign = {'text': '‼', 'texthl': 'NeomakeWarningSign'} +let g:neomake_message_sign = {'text': '☛', 'texthl': 'NeomakeMessageSign'} +let g:neomake_info_sign = {'text': 'i', 'texthl': 'NeomakeInfoSign'} +" let g:neomake_error_sign = {'text': '✘', 'texthl': 'ALEErrorSign'} +" let g:neomake_warning_sign = {'text': '‼', 'texthl': 'ALEWarningSign'} +" let g:neomake_message_sign = {'text': '☛', 'texthl': 'ALEInfoSign'} +" let g:neomake_info_sign = {'text': 'i', 'texthl': 'ALEInfoSign'} +" let g:neomake_serialize = 1 + +let g:neomake_highlight_columns = 1 +let g:neomake_highlight_lines = 1 +let g:neomake_open_list = 0 + +" function! OnNeomakeJobFinished() +" let l:ctx = g:neomake_hook_context +" if l:ctx.jobinfo.exit_code != 0 +" echoerr l:ctx.jobinfo.maker.name . ' failed' +" endif +" endfunction +augroup neomake_hooks + au! + " au User NeomakeJobFinished call OnNeomakeJobFinished() + au BufWritePost * Neomake +augroup END + +" generic makers +let g:neomake_makeclean_maker = { 'exe': 'make', 'args': ['clean'], 'errorformat': '%f:%l:%c: %m' } +let g:neomake_make_maker = { 'exe': 'make', 'errorformat': '%f:%l:%c: %m' } + +nmap nm :Neomake + +let g:lightline.component_function.neomake = 'LightLineNeomake' +function! LightLineNeomake() + let l:msg = neomake#statusline#get(bufnr('%'), { + \ 'format_status_disabled': '{{disabled_info}} %s', + \ 'format_status_enabled': '%s', + \ 'format_running': '… {{running_job_names}}', + \ 'format_loclist_ok': ' ✔', + \ 'format_loclist_issues': '%s', + \ 'format_loclist_unknown': '', + \ 'format_loclist_type_E': ' ✘ {{count}}', + \ 'format_loclist_type_W': ' ‼ {{count}}', + \ 'format_loclist_type_I': ' i {{count}}', + \ 'format_quickfix_type_E': '✘ {{count}}', + \ 'format_quickfix_type_W': '‼ {{count}}', + \ 'format_quickfix_type_I': 'i {{count}}', + \ }) + return l:msg ? 'nm:'.l:msg : '' +endfunction diff --git a/.vim/after/plugin/writing.vim b/.vim/after/plugin/writing.vim new file mode 100644 index 0000000..d868304 --- /dev/null +++ b/.vim/after/plugin/writing.vim @@ -0,0 +1,108 @@ +" Configuration for writing text in vim + +" Grammer checker +let g:grammarous#languagetool_cmd = 'languagetool' + +" Minimal UX for concentration +let g:goyo_width = 120 +let g:goyo_height = 90 +let g:goyo_linenr = 0 +nmap :Goyo + +let g:limelight_default_coefficient = 0.5 +let g:limelight_paragraph_span = 1 +" let g:limelight_default_coefficient = 0.5 +" let g:limelight_paragraph_span = 1 +let g:limelight_priority = -1 + +" goyo enter/leave funcs {{{ +function! s:goyo_enter() + if has('gui_running') || has('gui_vimr') + " set linespace = 7 + + elseif exists('$TMUX') + silent !tmux set status off + endif + + " set noshowmode + " set noshowcmd + set scrolloff=999 + Limelight + + " make sure :q in the last buffer, in Goyo also quits vim + let b:quitting = 0 + let b:quitting_bang = 0 + autocmd QuitPre let b:quitting = 1 + cabbrev q! let b:quitting_bang = 1 q! +endfunction + +function! s:goyo_leave() + if has('gui_running') || has('gui_vimr') + " set linespace = 0 + + elseif exists('$TMUX') + silent !tmux set status on + endif + + " set showmode + " set showcmd + set scrolloff=5 + Limelight! + + " make sure :q in the last buffer, in Goyo also quits vim + if b:quitting && len(filter(range(1, bufnr('$')), 'buflisted(v:val)')) == 1 + if b:quitting_bang + qa! + else + qa + endif + endif +endfunction +" }}} + +" writing autocommands +function! s:writing_mode_enter() + set textwidth=120 + " ALEToggle + " Grammarous keymaps + nmap c :GrammarousCheck --lang=de + nmap gi (grammarous-move-to-info-window) + nmap gr (grammarous-remove-error) + nmap gd (grammarous-disable-rule) + nmap gf (grammarous-fixit) + nmap gn (grammarous-move-to-next-error) + nmap gp (grammarous-move-to-previous-error) +endfunction + +augroup Writing + au! + au FileType markdown,tex call writing_mode_enter() + " goyo autocommands + au User GoyoEnter nested call goyo_enter() + au User GoyoLeave nested call goyo_leave() +augroup END + +" LaTeX +" let g:vimtex_view_general_viewer +" \ = '/Applications/Skim.app/Contents/SharedSupport/displayline' +" let g:vimtex_view_general_options = '-r @line @pdf @tex' + +" " This adds a callback hook that updates Skim after compilation +" let g:vimtex_latexmk_callback_hooks = ['UpdateSkim'] +" function! UpdateSkim(status) +" if !a:status | return | endif + +" let l:out = b:vimtex.out() +" let l:tex = expand('%:p') +" let l:cmd = [g:vimtex_view_general_viewer, '-r'] +" if !empty(system('pgrep Skim')) +" call extend(l:cmd, ['-g']) +" endif +" if has('nvim') +" call jobstart(l:cmd + [line('.'), l:out, l:tex]) +" elseif has('job') +" call job_start(l:cmd + [line('.'), l:out, l:tex]) +" else +" call system(join(l:cmd + [line('.'), shellescape(l:out), shellescape(l:tex)], ' ')) +" endif +" endfunction diff --git a/.vim/autoload/alternate.vim b/.vim/autoload/alternate.vim new file mode 100644 index 0000000..e179fce --- /dev/null +++ b/.vim/autoload/alternate.vim @@ -0,0 +1,8 @@ +function! alternate#alternate() + let l:function_name = 'Alternate_' . &filetype + if exists('*' . l:function_name) + execute l:function_name + else + echo 'no alternate function defined for "' . &filetype . '"' + endif +endfunction diff --git a/.vim/autoload/daymode.vim b/.vim/autoload/daymode.vim new file mode 100644 index 0000000..afac142 --- /dev/null +++ b/.vim/autoload/daymode.vim @@ -0,0 +1,34 @@ +function! s:lightline_update(colors) + if !exists('g:loaded_lightline') + return + endif + try + let g:lightline.colorscheme = a:colors + call lightline#init() + call lightline#colorscheme() + call lightline#update() + catch + endtry +endfunction + +let s:day_mode_previous_colorscheme = '' +let s:day_mode_previous_lightline_colorscheme = '' + +function! daymode#switch(bang) + if a:bang + set background=dark + execute 'colorscheme' s:day_mode_previous_colorscheme + call s:lightline_update(s:day_mode_previous_lightline_colorscheme) + else + let s:day_mode_previous_colorscheme = g:colors_name + let s:day_mode_previous_lightline_colorscheme = g:lightline.colorscheme + + set background=light + execute 'colorscheme' get(g:, 'day_mode_colorscheme', 'morning') + call s:lightline_update(get(g:, 'day_mode_lightline_colorscheme', 'PaperColor_light')) + endif + + if exists("syntax_on") + syntax reset + endif +endfunction diff --git a/.vim/autoload/fasd.vim b/.vim/autoload/fasd.vim new file mode 100644 index 0000000..7ef53bd --- /dev/null +++ b/.vim/autoload/fasd.vim @@ -0,0 +1,18 @@ +" not sure if I am using this +finish + +if exists('g:loaded_fasd') + finish +endif +let g:loaded_fasd = 1 +let g:fasd_path = '/home/robert/.dotfiles/zsh/.zplug/repos/sorin-ionescu/prezto/modules/fasd/external/fasd' + +function! fasd#run(args) abort + return system(g:fasd_path . ' -d -0 ' . a:args) +endfunction + +function! fasd#cd(args) abort + execute 'tcd' . fasd#run(a:args) +endfunction + +command! -nargs=1 J :call fasd#cd() diff --git a/.vim/autoload/fuzz.vim b/.vim/autoload/fuzz.vim new file mode 100644 index 0000000..39d02f1 --- /dev/null +++ b/.vim/autoload/fuzz.vim @@ -0,0 +1,140 @@ +function! s:prompt(str) + return a:str . g:fuzz_prompt . ' ' +endfunction + +function! s:fuzz(name, opts) + " call skim#run(skim#wrap(a:name, a:opts, 0)) + call fzf#run(fzf#wrap(a:name, a:opts, 0)) +endfunction + +function! s:strip(str) + return substitute(a:str, '^\s*\|\s*$', '', 'g') +endfunction + +function! s:open(cmd, target) + if stridx('edit', a:cmd) == 0 && fnamemodify(a:target, ':p') ==# expand('%:p') + return + endif + execute a:cmd fnameescape(a:target) +endfunction + + +" rg {{{ +function s:map_rg_output(line) + let parts = split(a:line, ':') + return {'filename': &acd ? fnamemodify(parts[0], ':p') : parts[0], 'lnum': parts[1], 'text': join(parts[2:], ':')} +endfunction + +function s:rg_handler(lines) + if len(a:lines) < 1 + return + endif + let first = map(filter(a:lines, 'len(v:val)'), 's:map_rg_output(v:val)')[0] + call s:open('edit', first.filename) + execute first.lnum + normal! zz +endfunction + +function s:rg(prompt, ...) + if !executable('rg') + echoerr 'rg not found' + return + endif + if len(a:000) < 1 || len(a:000[0]) < 1 + echoerr 'no arguments' + return + endif + + call s:fuzz(!empty(a:prompt) ? tolower(a:prompt) : 'rg', { + \ 'source': 'rg --line-number --no-heading --color=always --smart-case '.join(a:000[0], ' '), + \ 'sink*': function('s:rg_handler'), + \ 'options': ['--prompt', s:prompt(!empty(a:prompt) ? a:prompt : 'Rg'), + \ '--ansi', '--multi'] + \ }) +endfunction + +function! fuzz#rg(args) abort + call s:rg('', a:args) +endfunction +" }}} + +" files {{{ +function! fuzz#files() abort + call s:fuzz('files', { + \ 'options': ['--prompt', s:prompt('Fs')] + \ }) +endfunction +" }}} + +" buffers {{{ +function! s:buffers_list() + function! s:buflisted() + return filter(range(1, bufnr('$')), 'buflisted(v:val) && getbufvar(v:val, "&filetype") != "qf"') + endfunction + + function! s:format_buffer(b) + let name = bufname(a:b) + let name = empty(name) ? '[No Name]' : fnamemodify(name, ":p:~:.") + let flag = a:b == bufnr('') ? '%' : + \ (a:b == bufnr('#') ? '#' : ' ') + let modified = getbufvar(a:b, '&modified') ? ' [+]' : '' + let readonly = getbufvar(a:b, '&modifiable') ? '' : ' [RO]' + let extra = join(filter([modified, readonly], '!empty(v:val)'), '') + return s:strip(printf("[%s] %s\t%s\t%s", a:b, flag, name, extra)) + endfunction + + return map(sort(s:buflisted()), 's:format_buffer(v:val)') +endfunction + +function! s:buffers_handler(lines) + if len(a:lines) < 1 + return + endif + let b = matchstr(a:lines[0], '\[\zs[0-9]*\ze\]') + execute 'buffer' b +endfunction + +function! fuzz#buffers() abort + call s:fuzz('buffers', { + \ 'source': s:buffers_list(), + \ 'sink*': function('s:buffers_handler'), + \ 'options': ['--prompt', s:prompt('Buf')] + \ }) +endfunction +" }}} + +" commands {{{ +function! s:command_handler(lines) + if len(a:lines) < 1 + return + endif + call feedkeys(':'.a:lines[0]) +endfunction + +function! fuzz#commands() abort + call s:fuzz('commands', { + \ 'source': sort(getcompletion('', 'command')), + \ 'sink*': function('s:command_handler'), + \ 'options': ['--prompt', s:prompt('Cmd')] + \ }) +endfunction +" }}} + +function! fuzz#cmdoptions(...) abort + let opts = sort(['files', 'buffers', 'commands', 'rg']) + return join(opts, "\n") +endfunction + +function! fuzz#exec(cmd, ...) abort + if a:cmd == 'files' + call fuzz#files() + elseif a:cmd == 'buffers' + call fuzz#buffers() + elseif a:cmd == 'commands' + call fuzz#commands() + elseif a:cmd == 'rg' + call fuzz#rg(a:000) + else + echoerr 'Unknown command ' . a:cmd + endif +endfunction diff --git a/.vim/autoload/lightline/colorscheme/papercolor_dim.vim b/.vim/autoload/lightline/colorscheme/papercolor_dim.vim new file mode 100644 index 0000000..6398cdb --- /dev/null +++ b/.vim/autoload/lightline/colorscheme/papercolor_dim.vim @@ -0,0 +1,56 @@ +" papercolor_dim : a less flashy statusline +" +" Adapted from the Papercolor_dark theme: +" ============================================================================= +" Filename: autoload/lightline/colorscheme/PaperColor_dark.vim +" Author: TKNGUE +" License: MIT License +" Last Change: 2015-07-27 06:01 +" ============================================================================= + +let s:red = '#af005f' +let s:green = '#5faf5f' +let s:blue = '#5fafd7' +let s:magenta = '#ff5faf' +let s:olive = '#dfaf5f' +let s:navy = '#df875f' +let s:orange = '#d7875f' +let s:purple = '#af87d7' +let s:aqua = '#00afaf' + +let s:black = '#1c1c1c' +let s:grey_dim = '#3a3a3a' +let s:grey_dimmer = '#262626' + +let s:white = '#d0d0d0' +let s:white_dim = '#bdc0ba' + +" Tabline: +let s:tabline_bg = '#3a3a3a' +let s:tabline_active_fg = '#1c1c1c' +let s:tabline_active_bg = '#00afaf' +let s:tabline_inactive_fg = '#c6c6c6' +let s:tabline_inactive_bg = '#585858' + +let s:p = {'command': {}, 'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} + +let s:p.normal.left = [[ s:white, s:grey_dim ], [ s:white_dim, s:grey_dimmer ], [ s:white_dim, 'none' ]] +let s:p.normal.right = [[ s:white, s:grey_dim ], [ s:white_dim, s:grey_dimmer ], [ s:white_dim, 'none' ]] +let s:p.normal.middle = [[ s:white_dim, 'none' ]] +let s:p.normal.error = [[ s:black, s:red ]] + +let s:p.inactive.right = [[ s:white_dim, s:grey_dim ], [ s:white_dim, s:grey_dim ]] +let s:p.inactive.right = [[ s:white_dim, s:grey_dim ], [ s:white_dim, s:grey_dim ]] +let s:p.inactive.middle = [[ s:white_dim, s:grey_dim ]] + +let s:p.insert.left = [[ s:black, s:blue ], copy(s:p.normal.left[1]), copy(s:p.normal.left[2])] +let s:p.replace.left = [[ s:black, s:orange ], copy(s:p.normal.left[1]), copy(s:p.normal.left[2])] +let s:p.visual.left = [[ s:black, s:purple ], copy(s:p.normal.left[1]), copy(s:p.normal.left[2])] +" let s:p.command.left = [[ s:black, s:green ], copy(s:p.normal.left[1]), copy(s:p.normal.left[2])] + +let s:p.tabline.left = [[ s:grey_dim, 'none' ]] +let s:p.tabline.tabsel = [[ s:white_dim, 'none' ]] +let s:p.tabline.middle = [[ s:white_dim, 'none' ]] +let s:p.tabline.right = [[ s:white_dim, 'none' ]] + +let g:lightline#colorscheme#papercolor_dim#palette = lightline#colorscheme#fill(s:p) diff --git a/.vim/autoload/numbertoggle.vim b/.vim/autoload/numbertoggle.vim new file mode 100644 index 0000000..fe8ddcc --- /dev/null +++ b/.vim/autoload/numbertoggle.vim @@ -0,0 +1,17 @@ +function! s:relative_linenumbers() + set number + set relativenumber +endfunc + +function! s:absolute_linenumbers() + set number + set norelativenumber +endfunc + +function! numbertoggle#switch() + if &relativenumber + call s:absolute_linenumbers() + else + call s:relative_linenumbers() + endif +endfunc diff --git a/.vim/autoload/plug.vim b/.vim/autoload/plug.vim new file mode 100644 index 0000000..4e05630 --- /dev/null +++ b/.vim/autoload/plug.vim @@ -0,0 +1,2526 @@ +" 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') +let s:me = resolve(expand(':p')) +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', {}) + +function! plug#begin(...) + if a:0 > 0 + let s:plug_home_org = a:1 + let home = s:path(fnamemodify(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 fnamemodify(home, ':t') ==# 'plugin' && 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 + 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 + +if s:is_win + function! s:rtp(spec) + return s:path(a:spec.dir . get(a:spec, 'rtp', '')) + endfunction + + 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 +else + function! s:rtp(spec) + return s:dirpath(a:spec.dir . get(a:spec, 'rtp', '')) + endfunction + + 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'] + 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', 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(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(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(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 + set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1 + elseif a:swap + set shell=sh shellredir=>%s\ 2>&1 + endif + return prev +endfunction + +function! s:bang(cmd, ...) + 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 = tempname().'.bat' + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = batchfile + 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 + 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 '.s:esc(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') + 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 '.s:shellesc(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 '.s:esc(tag).' -- 2>&1', spec.dir) + else + let branch = s:esc(get(spec, 'branch', 'master')) + call s:log4(name, 'Merging origin/'.branch) + let out = s:system('git checkout -q '.branch.' -- 2>&1' + \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only 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:system('rm -rf ' . s:shellesc(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': [''], + \ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '', + \ '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) : a:cmd + if !empty(job.batchfile) + call writefile(["@echo off\r", cmd . "\r"], job.batchfile) + let cmd = job.batchfile + endif + let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd) + + if s:nvim + call extend(job, { + \ 'on_stdout': function('s:nvim_cb'), + \ 'on_exit': function('s:nvim_cb'), + \ }) + let jid = 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() + + if has_key(job, 'batchfile') && !empty(job.batchfile) + call delete(job.batchfile) + endif + 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, + \ s:shellesc(spec.uri), + \ s:shellesc(s:trim(spec.dir))), { '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) + let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g') + let escaped = substitute(escaped, '%', '%%', 'g') + let escaped = substitute(escaped, '"', '\\^&', 'g') + let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g') + return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"' +endfunction + +function! s:shellesc(arg) + if &shell =~# 'cmd.exe$' + return s:shellesc_cmd(a:arg) + endif + return shellescape(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) + return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd) +endfunction + +function! s:system(cmd, ...) + 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 = tempname().'.bat' + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = batchfile + endif + return system(s:is_win ? '('.cmd.')' : cmd) + finally + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win + 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 ') . s:shellesc(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(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 = tempname() + let new = tmp . '/plug.vim' + + try + let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, 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 + try + let [sh, shellcmdflag, shrd] = s:chsh(1) + let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha + if s:is_win + let batchfile = tempname().'.bat' + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = batchfile + endif + execute 'silent %!' cmd + finally + let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] + if s:is_win + 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 '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')) + if has_key(v, 'rtp') + let cmd .= ' -- '.s:shellesc(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 '.s:esc(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 = 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, '\\\@ width + if lw > max_width + let height += lw / popup_max_width + 1 + let width = popup_max_width + continue + endif + let width = lw + endif + let height += 1 + endfor + let width += 1 + + if height > max_height + let height = max_height + endif + + return [width, height] +endfunction +let s:popup.window_size = funcref('s:popup__window_size') + +function! s:popup__get_winnr() dict abort + return win_id2win(self.win_id) +endfunction +let s:popup.get_winnr = funcref('s:popup__get_winnr') + +function! s:popup__get_opener_winnr() dict abort + let winnr = win_id2win(self.opener_winid) + if winnr != 0 + return winnr + endif + let winnr = bufwinnr(self.opener_bufnr) + if winnr > 0 + return winnr + endif + return 0 +endfunction +let s:popup.get_opener_winnr = funcref('s:popup__get_opener_winnr') + +function! s:popup_open() dict abort + let self.opened_at = getpos('.') + let self.opener_bufnr = bufnr('%') + let self.opener_winid = win_getid() + let self.type = 'floating' + + let [w, h] = self.window_size() + + if self.type ==# 'floating' + let opts = self.floating_win_opts(w, h) + let win_id = nvim_open_win(self.opener_bufnr, v:true, opts) + endif + + enew! + let popup_bufnr = bufnr('%') + setlocal + \ buftype=nofile bufhidden=hide nomodified nobuflisted noswapfile nonumber + \ nocursorline wrap nonumber norelativenumber signcolumn=no nofoldenable + \ nospell nolist nomodeline + if has_key(self.opts, 'filetype') + let &l:filetype = self.opts.filetype + endif + + call setline(1, self.contents) + setlocal nomodified nomodifiable + + if has('nvim') + setlocal winhl=Normal:NormalFloat,NormalNC:NormalFloat + endif + + nnoremap :call b:__popup.close() + nnoremap q :call b:__popup.close() + + let b:__popup = self + execute 'autocmd BufWipeout,BufLeave call getbufvar(' . popup_bufnr . ', "__popup").close()' + + if has_key(self.opts, 'enter') && !self.opts.enter + wincmd p + endif + + let self.bufnr = popup_bufnr + let self.win_id = win_id +endfunction +let s:popup.open = funcref('s:popup_open') + +function! s:popup__close() dict abort + if !has_key(self, 'bufnr') + return + endif + + let winnr = self.get_winnr() + if winnr > 0 + noautocmd execute winnr . 'wincmd c' + endif + + unlet self.bufnr + unlet self.win_id +endfunction +let s:popup.close = funcref('s:popup__close') + +function! s:popup__scroll(map) dict abort + let winnr = self.get_winnr() + if winnr == 0 + return + endif + execute winnr . 'wincmd w' + sandbox let input = eval('"\<'.a:map.'>"') + execute 'normal!' input + wincmd p +endfunction +let s:popup.scroll = funcref('s:popup__scroll') + +function! s:popup__update() dict abort + " Note: `:noautocmd` to prevent BufLeave autocmd event (#13) + " It should be ok because the cursor position is finally back to the first + " position. + + let prev_winnr = winnr() + + let popup_winnr = self.get_winnr() + if popup_winnr == 0 + return + endif + let opener_winnr = self.get_opener_winnr() + if opener_winnr == 0 + return + endif + + if opener_winnr != prev_winnr + noautocmd execute opener_winnr . 'wincmd w' + endif + + try + let [width, height] = self.window_size() + + " Window must be configured in opener buffer since the window position + " is relative to cursor + if self.type ==# 'floating' + let id = win_getid(popup_winnr) + if id == 0 + return + endif + let opts = self.floating_win_opts(width, height) + call nvim_win_set_config(id, opts) + endif + + noautocmd execute popup_winnr . 'wincmd w' + + if self.type ==# 'preview' + execute height . 'wincmd _' + endif + + setlocal modifiable + silent %delete _ + call setline(1, self.contents) + setlocal nomodified nomodifiable + finally + if winnr() != prev_winnr + noautocmd execute prev_winnr . 'wincmd w' + endif + endtry +endfunction +let s:popup.update = funcref('s:popup__update') + +function! popup#new(opts) abort + let p = deepcopy(s:popup) + let opts = { 'floating': v:true } + let p.opts = extend(opts, a:opts) + return p +endfunction diff --git a/.vim/autoload/retab.vim b/.vim/autoload/retab.vim new file mode 100644 index 0000000..8cb8759 --- /dev/null +++ b/.vim/autoload/retab.vim @@ -0,0 +1,7 @@ + +func! retab#do() + for lineno in range(a:firstline, a:lastline) + normal! << + normal! >> + endfor +endfunc diff --git a/.vim/autoload/split_term.vim b/.vim/autoload/split_term.vim new file mode 100644 index 0000000..e34fe59 --- /dev/null +++ b/.vim/autoload/split_term.vim @@ -0,0 +1,69 @@ +let s:spt = {} + +function! s:spt_open() dict abort + botright new + exec "resize " . self.opts.height + try + exec "buffer " . self.bufnr + catch + call termopen(self.opts.exec, {"detach": 0}) + let self.bufnr = bufnr('%') + " term style + set nonumber + set norelativenumber + set signcolumn=no + " garbage collect after closing + let b:__split_term = self + execute 'autocmd BufWipeout call getbufvar(' . self.bufnr . ', "__split_term").close()' + endtry + startinsert! + let self.winid = win_getid() +endfunction +let s:spt.open = funcref('s:spt_open') + +function! s:spt_hide() dict abort + if win_gotoid(self.winid) + hide + else + echoerr 'split term window not found' + endif +endfunction +let s:spt.hide = funcref('s:spt_hide') + +function! s:spt_close() dict abort + if win_gotoid(self.winid) + close + endif + unlet self.bufnr + unlet self.winid +endfunction +let s:spt.close = funcref('s:spt_close') + +function! split_term#new(opts) abort + let spt = deepcopy(s:spt) + let opts = { + \ 'exec': $SHELL, + \ 'height': 20, + \ } + let spt.opts = extend(opts, a:opts) + return spt +endfunction + +function! s:split_term_new(args) abort + if len(a:args) > 0 + let opts = {'exec': join(a:args, ' ')} + endif + let g:split_term = split_term#new(exists('opts') ? opts : {}) +endfunction +function! s:split_term_toggle(bang, ...) abort + if !a:bang + if !exists('g:split_term') + call s:split_term_new(a:000) + endif + call g:split_term.open() + else + if exists('g:split_term') + call g:split_term.hide() + endif + endif +endfunction diff --git a/.vim/autoload/zettel.vim b/.vim/autoload/zettel.vim new file mode 100644 index 0000000..381b8e6 --- /dev/null +++ b/.vim/autoload/zettel.vim @@ -0,0 +1,37 @@ +" note taking helpers +" to aide in practicing the zettelkasten.de system +" +" ref: https://vimways.org/2019/personal-notetaking-in-vim/ + +let g:zettel_dir = '~/wiki' +let g:zettel_ext = '.md' + +func! zettel#is_zettel(fpath) + if a:fpath =~ g:zettel_dir . '/.*' . g:zettel_ext . '$' | return 1 | en + return 0 +endfunc + +func! zettel#set_filetype() + silent exec 'setlocal filetype=zettel.' . &filetype +endfunc + +func! zettel#edit(...) + let l:sep = '' + if len(a:000) > 0 + " argument is a title for the note + let l:sep = '-' + endif + let l:fname = expand(g:zettel_dir) . '/' + \ . strftime('%Y-%m-%dT%H-%M') + \ . l:sep . join(a:000, l:sep) . g:zettel_ext + + silent exec 'e ' . l:fname + + " if len(a:000) > 0 + " silent exec 'normal gg0\=strftime("%Y-%m-%d %H:%M")\ ' + " \ . join(a:000) + " \ . '\\G' + " else + " silent exec 'normal gg0\=strftime("%Y-%m-%d %H:%M")\\\G' + " endif +endfunc diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json new file mode 100644 index 0000000..6bf350b --- /dev/null +++ b/.vim/coc-settings.json @@ -0,0 +1,82 @@ +{ + "coc.preferences.snippets.enable": true, + "coc.preferences.formatOnType": false, + "coc.preferences.formatOnSaveFiletypes": [], + "coc.preferences.hoverTarget": "float", + "coc.preferences.enableFloatHighlight": true, + "coc.preferences.extensionUpdateCheck": "never", + + "list.signOffset": 900, + + "suggest.autoTrigger": "always", + "suggest.triggerAfterInsertEnter": true, + "suggest.minTriggerInputLength": 1, + "suggest.noselect": true, + "suggest.enablePreview": true, + "suggest.enablePreselect": false, + "suggest.floatEnable": true, + + "signature.enable": true, + "signature.target": "float", + "signature.preferShownAbove": true, + + "diagnostic.enable": true, + "diagnostic.checkCurrentLine": false, + "diagnostic.virtualText": true, + "diagnostic.virtualTextLines": 1, + "diagnostic.messageTarget": "float", + "diagnostic.level": "hint", + "diagnostic.enableSign": true, + "diagnostic.errorSign": "✘", + "diagnostic.warningSign": "‼", + "diagnostic.infoSign": "i", + "diagnostic.hintSign": "☛", + + "rust-client.channel": "stable", + "rust-client.rlsPath": "ra_lsp_server", + + "python.linting.flake8Enabled": false, + "python.linting.pylintEnabled": true, + + "languageserver": { + "gopls": { + "enable": false, + "command": "gopls", + "rootPatterns": ["go.mod", ".git/", ".hg/"], + "filetypes": ["go"] + }, + "go-langserver": { + "enable": false, + "command": "go-langserver", + "initializationOptions": { + "gocodeCompletionEnabled": true, + "diagnosticsEnabled": true, + "lintTool": "golint" + }, + "filetypes": ["go"] + }, + "ccls": { + "enable": false, + "command": "ccls", + "rootPatterns": [".ccls", "compile_commands.json", ".git/", ".hg/"], + "initializationOptions": { + "cache": { + "directory": "/tmp/ccls" + } + }, + "filetypes": ["c", "cpp", "objc", "objcpp"] + }, + "rust-analyzer": { + "enable": false, + "command": "ra_lsp_server", + "rootPatterns": ["Cargo.toml", "Cargo.lock", ".git/"], + "filetypes": ["rust"] + }, + "efm": { + "enable": false, + "command": "efm-langserver", + "args": [], + "filetypes": ["vim", "markdown", "yaml"] + } + } +} diff --git a/.vim/doc/how-to-do-things.md b/.vim/doc/how-to-do-things.md new file mode 100644 index 0000000..a705d62 --- /dev/null +++ b/.vim/doc/how-to-do-things.md @@ -0,0 +1,9 @@ +# vim : how to do things + +## navigation + +### open path under cursor? + +- `gf` _goto file_ +- `f` _in new window_ +- `gf` \_in new tab` diff --git a/.vim/ftdetect/h.vim b/.vim/ftdetect/h.vim new file mode 100644 index 0000000..665088d --- /dev/null +++ b/.vim/ftdetect/h.vim @@ -0,0 +1 @@ +au BufNewFile,BufEnter *.h :setlocal filetype=c diff --git a/.vim/ftdetect/journal.vim b/.vim/ftdetect/journal.vim new file mode 100644 index 0000000..a636837 --- /dev/null +++ b/.vim/ftdetect/journal.vim @@ -0,0 +1 @@ +au BufNewFile,BufRead *.journal set filetype=ledger diff --git a/.vim/ftdetect/pixy.vim b/.vim/ftdetect/pixy.vim new file mode 100644 index 0000000..2ffb158 --- /dev/null +++ b/.vim/ftdetect/pixy.vim @@ -0,0 +1 @@ +au BufNewFile,BufRead *.pixy set filetype=pug noet diff --git a/.vim/ftdetect/scarlet.vim b/.vim/ftdetect/scarlet.vim new file mode 100644 index 0000000..40ed638 --- /dev/null +++ b/.vim/ftdetect/scarlet.vim @@ -0,0 +1 @@ +au BufNewFile,BufRead *.scarlet set filetype=stylus diff --git a/.vim/ftdetect/zettel.vim b/.vim/ftdetect/zettel.vim new file mode 100644 index 0000000..ecf6a0e --- /dev/null +++ b/.vim/ftdetect/zettel.vim @@ -0,0 +1,4 @@ +augroup zettel_file + au! + au BufNewFile,BufRead * if zettel#is_zettel(expand('%:p')) | call zettel#set_filetype() | en +augroup END diff --git a/.vim/general.vim b/.vim/general.vim new file mode 100644 index 0000000..8fbc18d --- /dev/null +++ b/.vim/general.vim @@ -0,0 +1,65 @@ +" .vimrc#General settings +set exrc +set secure +set title +set noshowmode +set autowrite +set inccommand=split +set noshowcmd +" set autochdir " automatically sets cwd to the dir containing the file in the current buffer +set hidden +set nolist +" set lcs+=space:• +" set lcs+=trail:∙ +set encoding=utf-8 nobomb +" set nocompatible +set number +let &showbreak='↪ ' +set visualbell +set noerrorbells +set hlsearch +set smartcase +set ignorecase +set incsearch +" set cmdheight=2 +set pumheight=10 +set lazyredraw +set mouse=a +set clipboard+=unnamedplus " share OSX clipboard +set backspace=indent,eol,start " allow backspace in INSERT mode +set signcolumn=yes +set cursorline +" set cursorcolumn +set colorcolumn=80 +set updatetime=300 + +" For conceal markers. +if has('conceal') + " set conceallevel=2 concealcursor=nv + set conceallevel=2 concealcursor= +endif + +" centralize vimfiles +set backupdir=/tmp +set directory=/tmp +if exists('&undodir') + set undodir=~/.vim/undo +endif + +" pane divider chars +set fillchars=fold:-,vert:\│ + +"" colorscheme options +if has("termguicolors") + set termguicolors +endif + +filetype plugin indent on +if has('syntax') && !exists('g:syntax_on') + syntax enable +endif + +" some defaults +" set ts=8 sts=0 et sw=4 sta + +set diffopt+=algorithm:patience diff --git a/.vim/init.vim b/.vim/init.vim new file mode 100644 index 0000000..879753a --- /dev/null +++ b/.vim/init.vim @@ -0,0 +1,286 @@ +let g:mapleader = ' ' " key to +let g:maplocalleader = '\' + +runtime general.vim +runtime plug.vim + +" hi CursorLine cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white +" hi CursorLine cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white +" nnoremap cl :set cursorline! +" nnoremap cc :set cursorcolumn! + +" looks {{{ +set background=dark +let g:PaperColor_Theme_Options = { +\ 'theme': { +\ 'default.dark': { +\ 'allow_bold': 1, +\ 'allow_italic': 1, +\ 'transparent_background': 1, +\ } +\ } +\ } +colorscheme PaperColor +let g:day_mode_colorscheme = 'PaperColor' + +" Make comments italic, no matter what the colorscheme does +hi Comment gui=italic +" Fix ugly looking grey when transparent_background=1 +hi SignColumn guibg=none ctermbg=none +" }}} + +" key bindings {{{ +" speed +noremap j gj +noremap k gk +" because this is annoying +cnoreabbrev W w +cnoreabbrev E e +cnoreabbrev Q q +" Buffer commands +nmap gb :bnext +nmap gB :bprevious +" quickfix jumping +nnoremap cn :cnext +nnoremap cp :cprevious +nnoremap cl :clist +" loclist jumping +nnoremap ln :lnext +nnoremap lp :lprevious +nnoremap ll :llist +" escape terminal mode with +tnoremap +tnoremap qq :bdelete! +" delete and don't remember... +" nnoremap s "_d +" nnoremap ss "_dd +" vnoremap s "_d +" replace word under cursor +nmap riw :%s/\<\>/ + +nmap ga (EasyAlign) +vmap (EasyAlign) +nmap gl (OrgHyperlinkFollow) +nmap gm (git-messenger) +nmap v :Vista!! +nmap nt :call numbertoggle#switch() +nmap tn :rightbelow Tnew +vmap rt :call retab#do() +" }}} + +" alternate -> plugin/alternate.vim +" daymode -> plugin/daymode.vim +" fasd -> plugin/fasd.vim +" fuzzy -> plugin/fuzz.vim +" hardmode -> plugin/hard.vim +" numbertoggle -> plugin/numbertoggle.vim +" writing -> after/plugin/tagbar.vim +" filetype configs -> after/ftplugin +" coc -> after/plugin/coc.vim +" neomake -> after/plugin/neomake.vim +" tagbar -> after/plugin/tagbar.vim +" lightline -> plugin/line.vim + +" plugin config {{{ +" +" obsession {{{2 +let g:session_extension = ".vim-session" +let g:session_autosave = "no" +let g:session_autoload = "no" +let g:session_autosave_periodic = 5 +let g:session_command_aliases = 1 +" }}}2 +let g:echodoc_enable_at_startup = 1 +" matchtagalways {{{2 +let g:mta_use_matchparen_group = 1 +let g:mta_filetypes = { + \ 'html' : 1, + \ 'xhtml' : 1, + \ 'xml' : 1, + \ 'jinja' : 1, + \ 'vue' : 1 + \} +" }}}2 +" emmet +let g:user_emmet_leader_key = g:maplocalleader " followed by , +" let g:user_emmet_mode = 'a' +" indentguides {{{2 +let g:indent_guides_enable_on_vim_startup = 1 +let g:indent_guides_start_level = 2 +let g:indent_guides_color_change_percent = 2 +let g:indent_guides_guide_size = 1 +" }}}2 +" indentline {{{2 +" let g:indentLine_char = '▏' +" let g:indentLine_enabled = 1 +" let g:indentLine_conceallevel = 1 +" :set list lcs=tab:\▏\ +" }}}2 +" signify {{{2 +" let g:signify_sign_add = '▎' +" let g:signify_sign_delete = '▎' +" let g:signify_sign_delete_first_line = '▀' +let g:signify_sign_change = '~' +" let g:signify_sign_changedelete = g:signify_sign_change +" let g:signify_sign_show_text = 0 + +hi SignifySignChange guibg=NONE ctermbg=NONE +hi SignifySignAdd guibg=NONE ctermbg=NONE +hi SignifySignDelete guibg=NONE ctermbg=NONE + +nmap ]h (signify-next-hunk) +nmap [h (signify-prev-hunk) +" }}}2 + +let g:polyglot_disabled = ['markdown', 'org', 'latex', 'tex', 'vue'] +let g:vue_disable_pre_processors = 1 +let g:vim_json_syntax_conceal = 1 + +let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] " quickscope +let g:utl_cfg_hdl_scm_http = 'silent !xdg-open %u' +let g:sneak#label = 1 + +" vista {{{2 +let g:vista_icon_indent = ['> ', '* '] +let g:vista_default_executive = 'ctags' +" let g:vista_executive_for = { +" \ 'javascript': 'coc', +" \ 'python': 'coc', +" \ } +let g:vista#renderer#enable_icon = 0 +let g:vista#renderer#icons = { +\ 'func': "f", +\ 'function': "f", +\ 'functions': "fs", +\ 'var': "v", +\ 'variable': "v", +\ 'variables': "vs", +\ 'const': "c", +\ 'constant': "c", +\ 'method': "m", +\ 'package': "p", +\ 'packages': "ps", +\ 'enum': "e", +\ 'enumerator': "E", +\ 'module': "m", +\ 'modules': "ms", +\ 'type': "t", +\ 'typedef': "t", +\ 'types': "ts", +\ 'field': "fd", +\ 'fields': "fds", +\ 'macro': "mc", +\ 'macros': "mcs", +\ 'map': "mp", +\ 'class': "cl", +\ 'augroup': "au", +\ 'struct': "st", +\ 'union': "u", +\ 'member': "mb", +\ 'target': "ta", +\ 'property': "pr", +\ 'interface': "if", +\ 'namespace': "ns", +\ 'subroutine': "sr", +\ 'implementation': "im", +\ 'typeParameter': "tp", +\ 'default': "_" +\ } +" }}}2 + +" bufferline {{{2 +let g:bufferline_echo = 0 +let g:bufferline_show_bufnr = 0 +" let g:bufferline_separator = ' ' +let g:bufferline_active_buffer_left = '' +let g:bufferline_active_buffer_right = '' +" let g:bufferline_unamed_buffer = '[no name]' +let g:bufferline_fname_mod = ':t:s?^$?[no name]?' +" }}}2 + +" Enable color highlighting for all filetypes +let g:Hexokinase_ftAutoload = ['*'] +let $SKIM_DEFAULT_COMMAND = '' + +" vim-markdown {{{2 +let g:vim_markdown_folding_disabled = 1 +let g:vim_markdown_math = 1 +let g:vim_markdown_frontmatter = 1 +let g:vim_markdown_json_frontmatter = 1 +let g:vim_markdown_toml_frontmatter = 1 +let g:vim_markdown_folding_level = 2 +let g:vim_markdown_strikethrough = 1 +let g:vim_markdown_auto_insert_bullets = 1 +let g:vim_markdown_new_list_item_indent = 0 +" }}}2 + +" let g:git_messenger_include_diff = v:false +let g:git_messenger_always_into_popup = v:true +let g:git_messenger_close_on_cursor_moved = v:true + +" Neoformat {{{2 +let g:neoformat_basic_format_align = 0 +let g:neoformat_basic_format_retab = 0 +let g:neoformat_basic_format_trim = 0 +let g:neoformat_only_msg_on_error = 1 +" }}}2 + +let g:neoterm_size = 20 +let g:neoterm_autoinsert = 1 + +let g:UltiSnipsExpandTrigger = "" +let g:UltiSnipsJumpForwardTrigger = "" +let g:UltiSnipsJumpBackwardTrigger = "" +" }}}1 + +" gui extra config {{{ +" probably obsolete... +if exists('veonim') + " set linespace=5 + set guifont=Iosevka\ R:h17 + runtime init_veonim.vim +endif +" }}} + +function! s:fmt() abort + if exists('g:nofmt') || exists('b:nofmt') + return + endif + try | undojoin | Neoformat | catch /^Vim\%((\a\+)\)\=:E790/ | finally | silent Neoformat | endtry +endfunction + +" autogroups {{{ +augroup SpecialBuffers + au! + " au FileType vista,fzf,skim set laststatus=0 noshowmode noruler + " \| au BufLeave set laststatus=2 ruler + au FileType fzf,skim tnoremap + au FileType gitmessengerpopup nmap (git-messenger-close) + au FileType vista nmap :wincmd p + au FileType help,qf nmap q +augroup END + +augroup init + au! + au VimEnter * set iskeyword-=- + " au VimEnter * call vista#RunForNearestMethodOrFunction() + " au VimEnter * Vista!! + + " vim was opened as diff tool, load the 'diff' ftplugin conf + au VimEnter * if &diff | runtime after/ftplugin/diff.vim | endif + + au BufEnter,BufLeave,BufWritePost * rshada|wshada + " au BufWritePre * :call fmt() + " au FileType dirvish call fugitive#detect(@%) + au BufReadPost * + \ if line("'\"") > 1 && line("'\"") <= line("$") && &ft !~# 'commit' + \ | exe "normal! g`\"" + \ | endif +augroup END +" }}} + +command! -bang DayMode call daymode#switch(0) +command! -range Retab ,call retab#do() +command! NumberToggle call numbertoggle#switch() +command! Alternate call alternate#alternate() +command! -nargs=* Zet call zettel#edit() diff --git a/.vim/init_veonim.vim b/.vim/init_veonim.vim new file mode 100644 index 0000000..7cfa3a6 --- /dev/null +++ b/.vim/init_veonim.vim @@ -0,0 +1,34 @@ +" workspace functions +nno ,f :Veonim files +nno ,e :Veonim explorer +nno ,b :Veonim buffers +nno ,d :Veonim change-dir + +" searching text +nno fw :Veonim grep-word +vno fw :Veonim grep-selection +nno fa :Veonim grep +nno ff :Veonim grep-resume +nno fb :Veonim buffer-search + +" language server functions +nno sr :Veonim rename +nno sd :Veonim definition +nno st :Veonim type-definition +nno si :Veonim implementation +nno sf :Veonim references +nno sh :Veonim hover +nno sl :Veonim symbols +nno so :Veonim workspace-symbols +nno sq :Veonim code-action +nno sp :Veonim show-problem +nno sk :Veonim highlight +nno sK :Veonim highlight-clear +nno :Veonim next-problem +nno :Veonim prev-problem +nno ,n :Veonim next-usage +nno ,p :Veonim prev-usage +nno pt :Veonim problems-toggle +nno pf :Veonim problems-focus +nno :Veonim buffer-prev +nno :Veonim buffer-next diff --git a/.vim/lua/split_term/init.lua b/.vim/lua/split_term/init.lua new file mode 100644 index 0000000..7dcb044 --- /dev/null +++ b/.vim/lua/split_term/init.lua @@ -0,0 +1,46 @@ +local spt = {} + +function spt:create() + self = { + height = 80, + buf_nr = nil, + win_id = nil, + visible = false, + } +end + +function spt:show() + vim.eval('botright new') + if self.buf_nr then + vim.eval('buffer ' .. self.buf_nr) + else + vim.termopen(self.exec, { detach=0 }) + self.buf_nr = vim.bufnr('%') + end +end + +function spt:open() +end + +function spt:hide() +end + +function spt:close() + local force = true + vim.api.nvim_win_close(self.win_id, force) + self.buf_nr = nil + self.win_id = nil +end + +function spt_toggle() + if spt.win_id then + if spt.visible then + spt:hide() + else + spt:show() + end + else + spt:create() + spt:show() + end +end diff --git a/.vim/plug.vim b/.vim/plug.vim new file mode 100644 index 0000000..165f16f --- /dev/null +++ b/.vim/plug.vim @@ -0,0 +1,102 @@ +" get plug.vim if it's not installed +if empty(glob('~/.vim/autoload/plug.vim')) + silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + autocmd VimEnter * PlugInstall --sync | source $MYVIMRC +endif + +call plug#begin('~/.vim/plugged') + +" Core + " Plug 'airblade/vim-gitgutter' " line status next to line nums + Plug 'mhinz/vim-signify' " git status in the sign column + Plug 'tpope/vim-commentary' " auto-comment using `gcc` + Plug 'cohama/lexima.vim' " auto-close parens, brackets, etc. + Plug 'tpope/vim-surround' " edit surroundings in pairs + Plug 'itchyny/lightline.vim' " lightweight status bar + Plug 'neomake/neomake' " async job runner + Plug 'sbdchd/neoformat' " async code formatter + Plug 'justinmk/vim-dirvish' " folder browser + Plug 'justinmk/vim-sneak' " powerful missing vim motions + + " Plug 'neovim/nvim-lsp' + Plug 'SirVer/ultisnips' + \| Plug 'honza/vim-snippets' + + " Plug 'neoclide/coc.nvim', + " \ { 'do': './install.sh nightly' } + " \| Plug 'neoclide/coc-snippets', { 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'neoclide/coc-json', { 'for': ['json'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'neoclide/coc-rls', { 'for': ['rust'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'neoclide/coc-python', { 'for': ['python'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'neoclide/coc-yaml', { 'for': ['yaml'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'neoclide/coc-html', { 'for': ['html'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'neoclide/coc-css', { 'for': ['css'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'josa42/coc-go', { 'for': ['go'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'neoclide/coc-java', { 'for': ['java'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug 'neoclide/coc-emmet', { 'for': ['html', 'css'], 'do': 'yarn install --frozen-lockfile' } + " \| Plug '~/devel/upstream/github.com/microsoft/vscode-go', { 'for': ['go'] } + + " search + " Plug 'junegunn/fzf', + " \ { 'dir': '~/.fzf', 'do': './install --all'} + " \ |Plug 'junegunn/fzf.vim' + " Plug 'lotabout/skim', + " \ { 'on': 'SK', 'dir': '~/.skim', 'do': './install'} + + Plug 'liuchengxu/vim-clap' " interactive finder / dispatcher + +" Misc + Plug 'junegunn/vim-easy-align', + \ { 'on': ['EasyAlign', '(EasyAlign)'] } + Plug 'tpope/vim-sleuth' " auto-set shiftwidth and expandtab options + Plug 'nathanaelkane/vim-indent-guides' " show indentation levels + Plug 'tpope/vim-repeat' " extend '.' to plugins + Plug 'liuchengxu/vista.vim' " sidebar populated by coc, ctags, etc. + Plug 'sgur/vim-editorconfig' " implements editorconfig in vimscript + Plug 'rhysd/conflict-marker.vim' + Plug 'michaeljsmith/vim-indent-object' " adds indentation text-objects + Plug 'kshenoy/vim-signature' " toggle, display and navigate marks + Plug 'RRethy/vim-hexokinase', + \ { 'do': 'make hexokinase' } " highlights color codes + Plug 'rhysd/git-messenger.vim' " git-blame in a popup + Plug 'bling/vim-bufferline' " needed to put buffers into tabline + + Plug 'kassio/neoterm', + \ { 'on': ['T', 'Tnew'] } + +" Languages + " NOTE: these should only be loaded when they are required... + " Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' } + " Plug 'rhysd/vim-grammarous', { 'for': ['markdown', 'latex', 'tex'] } + Plug 'lervag/vimtex', { 'for': ['latex', 'tex'] } + Plug 'plasticboy/vim-markdown', { 'for': ['markdown'] } + Plug 'masukomi/vim-markdown-folding', { 'for': ['markdown'] } + Plug 'mattn/emmet-vim', { 'for': ['html', 'vue'] } " super-fast HTML editing + Plug 'valloric/matchtagalways', { 'for': ['html', 'vue', 'xml'] } " visually match HTML tags enclosing cursor location + Plug 'ledger/vim-ledger', { 'for': ['ledger'] } + Plug 'jceb/vim-orgmode', { 'for': ['org'] } + \| Plug 'tpope/vim-speeddating' " easy time/date incrementing + \| Plug 'vim-scripts/utl.vim' " follow links/urls + Plug 'gentoo/gentoo-syntax', { 'for': ['ebuild'] } + + " multi-language support with lazy loading + " NOTE: put language specific plugs before this to avoid conflicsts + Plug 'sheerun/vim-polyglot' + +" Minimal UX + Plug 'junegunn/goyo.vim', { 'on': 'Goyo' } " hide ui clutter + Plug 'junegunn/limelight.vim', { 'on': 'Limelight' } " dims colors + " Plug 'equalsraf/neovim-gui-shim' + +" Colorschemes + " Plug 'deviantfero/wpgtk.vim' + " Plug 'KeitaNakamura/neodark.vim' + Plug 'NLKNguyen/papercolor-theme' + " Plug 'crusoexia/vim-dracula' + +" Local + " Plug '~/devel/projects/nihon-theme/vim' + Plug '~/devel/projects/vim-orgdown' + +call plug#end() diff --git a/.vim/plugin/fuzz.vim b/.vim/plugin/fuzz.vim new file mode 100644 index 0000000..0e1cb55 --- /dev/null +++ b/.vim/plugin/fuzz.vim @@ -0,0 +1,16 @@ +" skip this, we have vim-clap now!!! +finish + +if exists('g:loaded_fuzz') + finish +endif +let g:loaded_fuzz = 1 +let g:fuzz_prompt = '❯' + +nmap ff :call fuzz#files() +nmap fb :call fuzz#buffers() +nmap fc :call fuzz#commands() +nmap fr :Rg + +command! -nargs=* -complete=custom,fuzz#cmdoptions Fuzz :call fuzz#exec() +command! -nargs=* Rg :call fuzz#rg() diff --git a/.vim/plugin/hard.vim b/.vim/plugin/hard.vim new file mode 100644 index 0000000..07a346d --- /dev/null +++ b/.vim/plugin/hard.vim @@ -0,0 +1,65 @@ +" hardmode == not using arrow keys + +function! s:bail() + let l:msg = 'E0X: Use hjkl' + echohl ErrorMsg | echo l:msg | echohl None +endfunction + +function! s:enable_hardmode(bang) + if !a:bang + try + " map arrow keys to more useful actions + " https://coderoncode.com/posts/vim-is-the-perfect-ide + nmap r :resize +2 + nmap r :resize -2 + nmap r :vertical resize +2 + nmap r :vertical resize +2 + + nmap w :wincmd k + nmap w :wincmd j + nmap w :wincmd h + nmap w :wincmd l + + nmap wm :wincmd K + nmap wm :wincmd J + nmap wm :wincmd H + nmap wm :wincmd L + + " or bail on them altogether + nmap :call bail() + nmap :call bail() + nmap :call bail() + nmap :call bail() + + vmap :call bail() + vmap :call bail() + vmap :call bail() + vmap :call bail() + + imap :call bail() + imap :call bail() + imap :call bail() + imap :call bail() + catch + endtry + else + try + nunmap + nunmap + nunmap + nunmap + vunmap + vunmap + vunmap + vunmap + iunmap + iunmap + iunmap + iunmap + catch + endtry + endif +endfunction + +call s:enable_hardmode(0) +command! -bang Hardmode call s:enable_hardmode(0) diff --git a/.vim/plugin/line.vim b/.vim/plugin/line.vim new file mode 100644 index 0000000..66072c3 --- /dev/null +++ b/.vim/plugin/line.vim @@ -0,0 +1,159 @@ +let g:lightline = {} +let g:lightline.colorscheme = 'papercolor_dim' + +let g:lightline.enable = { 'statusline': 1, 'tabline': 1 } + +let g:lightline.mode_map = { +\ 'n' : 'N', +\ 'i' : 'I', +\ 'R' : 'R', +\ 'v' : 'V', +\ 'V' : 'V-LINE', +\ "\": 'V-BLOCK', +\ 'c' : '>', +\ 's' : 'SELECT', +\ 'S' : 'S-LINE', +\ "\": 'S-BLOCK', +\ 't': 'T', +\ } + +let g:lightline.active = { +\ 'left': [ +\ ['mode', 'paste'], +\ ['filename', 'vista'], +\ ['neomake', 'coc', 'ctags', 'obsession'], +\ ], +\ 'right': [ +\ ['filetype', 'fileencoding', 'fileformat'], +\ ['lineinfo', 'percent'], +\ ['tabstatus'], +\ ], +\ } + +set showtabline=2 +let g:lightline.tabline = { +\ 'right': [ +\ ['tabs'], +\ ['porcelain'], +\ ], +\ } + +let g:lightline.tab = { +\ 'active': ['tabnum'], +\ 'inactive': ['tabnum'], +\ } + +let g:lightline.component = { +\ 'lineinfo': ' %l:%v', +\ 'filetype': "%{winwidth(0) > 70 ? (strlen(&filetype) ? &filetype : 'no ft') : ''}", +\ 'dir': "%{substitute(expand('%:p:h'), $HOME, '~', '')}", +\ } + +let g:lightline.component_function = { +\ 'filename': 'LightLineFilename', +\ 'fileformat': 'LightLineFileformat', +\ 'fileencoding': 'LightLineFileencoding', +\ 'mode': 'LightLineMode', +\ 'vista': 'LightLineVista', +\ 'o': 'LightLineO', +\ 'porcelain': 'LightLinePorcelain', +\ } + +" \ 'separator': { 'left': "\ue0b8", 'right': "\ue0be" }, +" \ 'subseparator': { 'left': "\ue0b9", 'right': "\ue0b9" }, +" \ 'tabline_separator': { 'left': "\ue0bc", 'right': "\ue0ba" }, +" \ 'tabline_subseparator': { 'left': "\ue0bb", 'right': "\ue0bb" }, +" \ + +let g:lightline.component_expand = {} +let g:lightline.component_type = {} + + +" Modified {{{ +hi ModifiedColor ctermfg=196 guifg=#ff0000 gui=bold +function! LightLineModified() + return &modified ? '+' : &modifiable ? '' : '-' +endfunction +" }}} + +" Readonly {{{ +function! LightLineReadonly() + return &filetype !~? 'help\|vimfiler\|gundo' && &readonly ? '' : '' +endfunction +" }}} + +" Filename {{{ +function! LightLineFilename() + return ('' !=? LightLineReadonly() ? LightLineReadonly() . ' ' : '') . + \ (&filetype ==# 'vimfiler' ? vimfiler#get_status_string() : + \ &filetype ==# 'unite' ? unite#get_status_string() : + \ &filetype ==# 'vimshell' ? vimshell#get_status_string() : + \ '' !=? expand('%:t') ? expand('%:t') : '[No Name]') . + \ ('' !=? LightLineModified() ? ' ' . LightLineModified() : '') +endfunction +" }}} + +" Fileformat {{{ +function! LightLineFileformat() + if (&fileformat == 'unix') + return '' + endif + return winwidth(0) > 70 ? &fileformat : '' +endfunction +" }}} + +" Fileencoding {{{ +function! LightLineFileencoding() + if (&fileencoding == 'utf-8') + return '' + endif + return winwidth(0) > 70 ? (strlen(&fileencoding) ? &fileencoding : &encoding) : '' +endfunction +" }}} + +" Mode {{{ +function! LightLineMode() + return winwidth(0) > 60 ? ( + \ expand('%:t') ==# '__Tagbar__' ? 'Tagbar': + \ &filetype ==# 'vimfiler' ? 'VimFiler' : + \ &filetype ==# 'vimshell' ? 'VimShell' : + \ &filetype ==# 'dirvish' ? 'DIRVISH' : + \ lightline#mode() ) + \ : '' +endfunction +" }}} + +" Tabchar {{{ +function! LightLineTabchar() + return '[' + \ . &tabstop + \ . (&expandtab == 1 ? '->' : '<>') + \ . &shiftwidth + \ . ']' +endfunction +" }}} + +" Vista {{{ +function! LightLineVista() + let l:sym = get(b:, 'vista_nearest_method_or_function', '') + return empty(l:sym) ? '' : g:vista#renderer#icons.function . ' ' . l:sym +endfunction +" }}} + +" Porcelain {{{ +function! LightLinePorcelain() + if &buftype !=# 'terminal' + let gitinfo = system('porcelain -no-color -path=' . expand('%:h')) + return (v:shell_error ? '' : gitinfo) + endif +endfunction +" }}} + +function! LightLineO() + let l:circ_empty="\u25CB" + let l:circ_quart="\u25D4" + let l:circ_half="\u25D1" + let l:circ_threequart="\u25D5" + let l:circ_full="\u25CF" + return ('' != LightLineModified() ? l:circ_full : l:circ_empty) +endfunction diff --git a/.vim/plugin/split_term.vim b/.vim/plugin/split_term.vim new file mode 100644 index 0000000..efb9b86 --- /dev/null +++ b/.vim/plugin/split_term.vim @@ -0,0 +1,11 @@ +" SplitTerm: quickly pop out a terminal + +" skip this while were testing kassio/neoterm +finish + +" lua require('split_term') +" command! LuaTerm :lua spt_toggle() + +command! -bang -nargs=* SplitTerm call s:split_term_toggle(0, ) +cnoreabbrev spt SplitTerm +cnoreabbrev st SplitTerm diff --git a/.vim/syntax/gotmpl.vim b/.vim/syntax/gotmpl.vim new file mode 100644 index 0000000..9e6c1e1 --- /dev/null +++ b/.vim/syntax/gotmpl.vim @@ -0,0 +1,93 @@ +" Copyright 2011 The Go Authors. All rights reserved. +" Use of this source code is governed by a BSD-style +" license that can be found in the LICENSE file. +" +" gotexttmpl.vim: Vim syntax file for Go templates. + +" Quit when a (custom) syntax file was already loaded +if exists("b:current_syntax") + finish +endif + +if !exists("g:main_syntax") + let g:main_syntax = 'html' +endif + +runtime! syntax/html.vim + +syn case match + +" Go escapes +syn match goEscapeOctal display contained "\\[0-7]\{3}" +syn match goEscapeC display contained +\\[abfnrtv\\'"]+ +syn match goEscapeX display contained "\\x\x\{2}" +syn match goEscapeU display contained "\\u\x\{4}" +syn match goEscapeBigU display contained "\\U\x\{8}" +syn match goEscapeError display contained +\\[^0-7xuUabfnrtv\\'"]+ + +hi def link goEscapeOctal goSpecialString +hi def link goEscapeC goSpecialString +hi def link goEscapeX goSpecialString +hi def link goEscapeU goSpecialString +hi def link goEscapeBigU goSpecialString +hi def link goSpecialString Special +hi def link goEscapeError Error + +" Strings and their contents +syn cluster goStringGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError +syn region goString contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup +syn region goRawString contained start=+`+ end=+`+ + +hi def link goString String +hi def link goRawString String + +" Characters; their contents +syn cluster goCharacterGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU +syn region goCharacter contained start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup + +hi def link goCharacter Character + +" Integers +syn match goDecimalInt contained "\<\d\+\([Ee]\d\+\)\?\>" +syn match goHexadecimalInt contained "\<0x\x\+\>" +syn match goOctalInt contained "\<0\o\+\>" +syn match goOctalError contained "\<0\o*[89]\d*\>" +syn cluster goInt contains=goDecimalInt,goHexadecimalInt,goOctalInt +" Floating point +syn match goFloat contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>" +syn match goFloat contained "\<\.\d\+\([Ee][-+]\d\+\)\?\>" +syn match goFloat contained "\<\d\+[Ee][-+]\d\+\>" +" Imaginary literals +syn match goImaginary contained "\<\d\+i\>" +syn match goImaginary contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>" +syn match goImaginary contained "\<\.\d\+\([Ee][-+]\d\+\)\?i\>" +syn match goImaginary contained "\<\d\+[Ee][-+]\d\+i\>" + +hi def link goInt Number +hi def link goFloat Number +hi def link goImaginary Number + +" Token groups +syn cluster gotplLiteral contains=goString,goRawString,goCharacter,@goInt,goFloat,goImaginary +syn keyword gotplControl contained if else end range with template +syn keyword gotplFunctions contained and html index js len not or print printf println urlquery eq ne lt le gt ge +syn match gotplVariable contained /\$[a-zA-Z0-9_]*\>/ +syn match goTplIdentifier contained /\.[^\s}]+\>/ + +hi def link gotplControl Keyword +hi def link gotplFunctions Function +hi def link goTplVariable Special + +syn region gotplAction start="{{" end="}}" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable,goTplIdentifier display +syn region gotplAction start="\[\[" end="\]\]" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable display +syn region goTplComment start="{{\(- \)\?/\*" end="\*/\( -\)\?}}" display +syn region goTplComment start="\[\[\(- \)\?/\*" end="\*/\( -\)\?\]\]" display + +hi def link gotplAction PreProc +hi def link goTplComment Comment + +syn cluster htmlPreproc add=gotplAction,goTplComment + +let b:current_syntax = "gotmpl" + +" vim: sw=2 ts=2 et -- cgit 1.4.1