From 153479352c269cfb761fafd50e2b1296bfafdba9 Mon Sep 17 00:00:00 2001 From: NiseVoid Date: Thu, 14 May 2020 20:03:55 +0200 Subject: [PATCH] Initial commit --- bin/lock | 39 + bin/panel | 13 + bin/screenie | 26 + bin/song | 10 + bin/switchbg | 5 + bin/watch-screen | 13 + imgs/fuyu-logo.png | Bin 0 -> 19619 bytes install.sh | 13 + kshrc | 12 + lock.png | Bin 0 -> 1329 bytes mpv.conf | 6 + nvim/.gitignore | 2 + nvim/autoload/plug.vim | 2526 ++++++++++++++++++++++++++++++++ nvim/colors/Tomorrow-Night.vim | 534 +++++++ nvim/init.vim | 169 +++ picom.conf | 5 + profile | 20 + xinitrc | 9 + 18 files changed, 3402 insertions(+) create mode 100755 bin/lock create mode 100755 bin/panel create mode 100755 bin/screenie create mode 100755 bin/song create mode 100755 bin/switchbg create mode 100755 bin/watch-screen create mode 100644 imgs/fuyu-logo.png create mode 100755 install.sh create mode 100755 kshrc create mode 100644 lock.png create mode 100644 mpv.conf create mode 100644 nvim/.gitignore create mode 100644 nvim/autoload/plug.vim create mode 100644 nvim/colors/Tomorrow-Night.vim create mode 100644 nvim/init.vim create mode 100644 picom.conf create mode 100755 profile create mode 100644 xinitrc diff --git a/bin/lock b/bin/lock new file mode 100755 index 0000000..67b45db --- /dev/null +++ b/bin/lock @@ -0,0 +1,39 @@ +#!/bin/bash + +echo RELOADAGENT | gpg-connect-agent +ssh-add -D + +if [ "$(xrandr | grep 3440x1440)" != "" ]; then + SCALE="100%" + DIR=$(echo -e "+800+0\n-800+0" | sort -R | head -1) +else + SCALE="75%" + DIR=$(echo -e "+500+0\n-500+0" | sort -R | head -1) +fi + +IMAGE=/tmp/screenlock.png + +IMG="$HOME/.LinuxConfig/imgs/" +IMG=$IMG$(ls $IMG | sort -R | head -1) + +echo $DIR + +maim -m 1 $IMAGE +convert $IMAGE -filter gaussian -blur 0x9 \ + -gravity center -matte \ + "$IMG[$SCALE]" -geometry $DIR -composite \ + ~/.LinuxConfig/lock.png -composite \ + -font Noto-Sans-CJK-JP-Regular -pointsize 25 -fill 'rgba(255,255,255,0.85)' -draw "text 0,150 'Enter password'" \ + -font Noto-Sans-CJK-JP-Regular -pointsize 20 -fill 'rgba(255,255,255,0.60)' -draw "text 0,200 'パスワードを入力する'" \ + $IMAGE + +i3lock \ + --textcolor=00000000 \ + --separatorcolor=00000000 --linecolor=00000000 \ + --keyhlcolor=22cc2288 --bshlcolor=cc222288 \ + --insidecolor=33333344 --ringcolor=aaaaaa88 \ + --insidevercolor=55555544 --ringvercolor=cccccc88 \ + --insidewrongcolor=cc222244 --ringwrongcolor=cc222288 \ + -eni $IMAGE + +rm $IMAGE diff --git a/bin/panel b/bin/panel new file mode 100755 index 0000000..41a5b5e --- /dev/null +++ b/bin/panel @@ -0,0 +1,13 @@ +#!/bin/sh + +while (true); do + if [ "$(mpc | wc -l)" -eq "3" ]; then + SONG=$(mpc | head -1) + if [ "$(mpc | grep '\[paused\]' | wc -l)" -eq "1" ]; then + SONG="⏸ $SONG" + fi + fi + + xsetroot -name " $SONG | $(date '+%Y-%m-%d %H:%M:%S') " + sleep 0.3s; +done diff --git a/bin/screenie b/bin/screenie new file mode 100755 index 0000000..f44c111 --- /dev/null +++ b/bin/screenie @@ -0,0 +1,26 @@ +#!/bin/bash + +NAME="ss-$(cat /dev/urandom | tr -dc A-Za-z0-9 | head -c${1:-32};)" + +maim -m 1 -s /tmp/$NAME.png -c 1,0.25,0.25,0.6 --hidecursor +if [ $? -ne 0 ] +then + notify-send 'Screenshot canceled' -u low + exit +fi + +if [ ! -e /tmp/$NAME.png ] +then + notify-send 'Screenshot failed' 'File does not exist' -u critical + exit +fi + +scp /tmp/$NAME.png ss:ss +if [ $? -eq 0 ] +then + echo -n 'https://ss.fuyu.moe/nisevoid/'$NAME'.png' | xclip -selection "clip-board" + notify-send 'Screenshot uploaded' -u low +else + notify-send 'Screenshot failed' 'Could not upload image' -u critical +fi +rm /tmp/$NAME.png diff --git a/bin/song b/bin/song new file mode 100755 index 0000000..6a7c703 --- /dev/null +++ b/bin/song @@ -0,0 +1,10 @@ +#!/bin/bash + +song=$(mpc --format "%position%\t%artist%\t%title%" playlist | sort | column -s" " -t | fzf) + +if [ "$song" == "" ] +then + exit +fi + +mpc play $(echo $song | awk '{print $1}') diff --git a/bin/switchbg b/bin/switchbg new file mode 100755 index 0000000..f59bab1 --- /dev/null +++ b/bin/switchbg @@ -0,0 +1,5 @@ +#!/bin/bash + +IMG="$HOME/images/"$(ls ~/images/ | sort -R | head -1) + +feh --bg-fill "$IMG" diff --git a/bin/watch-screen b/bin/watch-screen new file mode 100755 index 0000000..477d3b5 --- /dev/null +++ b/bin/watch-screen @@ -0,0 +1,13 @@ +#!/bin/bash + +xset s 300 +xset dpms 300 450 600 + +while true; do + sleep 1s; + if [ "$(xset q | grep 'Monitor is' | grep -v 'On' 2> /dev/null)" != "" ]; then + if [ "$(ps aux | grep '[i]3lock')" == "" ]; then + lock; + fi + fi +done diff --git a/imgs/fuyu-logo.png b/imgs/fuyu-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..76253485a7df1cf6df1eedbbab059cc12db8be0c GIT binary patch literal 19619 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 literal 0 HcmV?d00001 diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..59f6142 --- /dev/null +++ b/install.sh @@ -0,0 +1,13 @@ +#! /bin/bash +# Dependancies: feh maim slop mpd mpc mpv youtube-dl i3lock imagemagick dmenu neovim (lo)ksh fzf +# Build: dwm st + +ln -s ~/.LinuxConfig/profile ~/.profile +ln -s ~/.LinuxConfig/kshrc ~/.kshrc + +mkdir ~/.config/mpv +ln -s ~/.LinuxConfig/mpv.conf ~/.config/mpv/ + +ln -s ~/.LinuxConfig/xinitrc ~/.xinitrc + +sudo ln -s ~/.LinuxConfig/bin/* /usr/bin diff --git a/kshrc b/kshrc new file mode 100755 index 0000000..d264bda --- /dev/null +++ b/kshrc @@ -0,0 +1,12 @@ +alias gpg='gpg2' +export GPG_TTY=$(tty) + +alias vim=nvim +alias uwpass='PASSWORD_STORE_DIR=~/.pass/uw pass' +alias gca='git commit --amend --no-edit' +alias gpf='git push --force-with-lease' +alias openvpn='sudo openvpn --config *.ovpn' + +set -o emacs + +PS1='${PWD##*/} $ ' diff --git a/lock.png b/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..05c7195c15660a4a5d44ddfe458dfbc9e7bd06e0 GIT binary patch literal 1329 zcmV-11 zh|wToT!@1%B8e`X>fXBNzvrC) zo_lTubSY*QN{amZ1TXI4+2ZTV4K~mb>qJ$>7Gu31RW}W5%3K#>NDQW zWW-?p1a6UZpx#AWk+1^**Sc>H1BDD+GH@Vg17DcgW=WBm6?$R`GaCoK^?n7im3oUz zNcyT(iv(=|7y^y}8(Oen#RItDZ6l!UzY8q@nQ?|&0wPJ(q``_U0w@A60vGx~%@l|y z<_F*tU>cYMRs)v;Hv=0TP%&XrF9vo>nl!UP2h*J;%YmH@4&s1rp&A$snW3}+zQX8fGz=BB<=C`_@Mt8SkfY}&FOhx1FOVi zoC`b!O!;I~x?!g?frs1*K@$M?Ie@TLo|m*AxWNIGnz-hbW_GotB{K^<0%2wWFqsmF zyCv;%lSgeb($~NX?o#Cj);I^);@=CMTA~2lnczyNfTta7)FxdAl1>6UJaB_$q*3)O zU~`(TX&^#iQ-Ui^Nje6EX*Afto#OVhz#9pEzsAhgOImE^QfVMA^DMNHECC-Z^WnBd z(gN_2|7>K<5#XvMVhK~?VPnGhWnizj>j;GR#j}7|pXxG&hk?sG0ufJCLgyt()1A0d z16c$PIa4iv)*!I1QxE~LHsSs+-6l(Q;7h>qCazfo&g;e!!wL6hGfe&}DbE}3G!+kk zp%fR$GJ{Qe-cUFDiGco)pc@b)2@hGFv63SREAwa)m>`7$M-xn0k~EhE0;k#$U{!;_ z4x9<++A@=`jA6?Dx!TPl*F=}3u_E6fMTx0+UEV(I8Rl3Y#6>**AHbKuteFi+DmB|r zTxVu)dAiY;VrD-A4+EdYV1l}v&jZgTY#sYS>T6XyBt2?ogMkOtW5CPH8uh!Bfmb9w z8JO8R;8>rn3$0q@I51fR9?y~T%Y%JAussBBC!Z42`;DR3c=9N*H8zB4$yE+yAmo1_ zDc9*0|gY$$f+$<&xX{ zMkNOT;>GeeV4I{;%pBiSd*w5JzoK#)SgVuSFFP6i3fwAbpP3cHc+&#>Bxwz>71-;n n)lWd?f&IW%Nf!WzUH8hrOGd@VYuU4r00000NkvXXu0mjfgE3lI literal 0 HcmV?d00001 diff --git a/mpv.conf b/mpv.conf new file mode 100644 index 0000000..561f590 --- /dev/null +++ b/mpv.conf @@ -0,0 +1,6 @@ +audio-device='alsa/front:CARD=Multibit,DEV=0' +no-audio-display + +hwdec=vaapi + +no-osc diff --git a/nvim/.gitignore b/nvim/.gitignore new file mode 100644 index 0000000..89ee5b5 --- /dev/null +++ b/nvim/.gitignore @@ -0,0 +1,2 @@ +plugged +autoload/plug.vim.old diff --git a/nvim/autoload/plug.vim b/nvim/autoload/plug.vim new file mode 100644 index 0000000..bfafbfb --- /dev/null +++ b/nvim/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', 'after/ftdetect', 'after/ftplugin'] + if len(finddir(dir, path)) + if exists('#BufRead') + doautocmd BufRead + endif + return + endif + endfor + endfor +endfunction + +function! plug#load(...) + if a:0 == 0 + return s:err('Argument missing: plugin name(s) required') + endif + if !exists('g:plugs') + return s:err('plug#begin was not called') + endif + let names = a:0 == 1 && type(a:1) == s:TYPE.list ? a:1 : a:000 + let unknowns = filter(copy(names), '!has_key(g:plugs, v:val)') + if !empty(unknowns) + let s = len(unknowns) > 1 ? 's' : '' + return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', '))) + end + let unloaded = filter(copy(names), '!get(s:loaded, v:val, 0)') + if !empty(unloaded) + for name in unloaded + call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + endfor + call s:dobufread(unloaded) + return 1 + end + return 0 +endfunction + +function! s:remove_triggers(name) + if !has_key(s:triggers, a:name) + return + endif + for cmd in s:triggers[a:name].cmd + execute 'silent! delc' cmd + endfor + for map in s:triggers[a:name].map + execute 'silent! unmap' map + execute 'silent! iunmap' map + endfor + call remove(s:triggers, a:name) +endfunction + +function! s:lod(names, types, ...) + for name in a:names + call s:remove_triggers(name) + let s:loaded[name] = 1 + endfor + call s:reorg_rtp() + + for name in a:names + let rtp = s:rtp(g:plugs[name]) + for dir in a:types + call s:source(rtp, dir.'/**/*.vim') + endfor + if a:0 + if !s:source(rtp, a:1) && !empty(s:glob(rtp, a:2)) + execute 'runtime' a:1 + endif + call s:source(rtp, a:2) + endif + call s:doautocmd('User', name) + endfor +endfunction + +function! s:lod_ft(pat, names) + let syn = 'syntax/'.a:pat.'.vim' + call s:lod(a:names, ['plugin', 'after/plugin'], syn, 'after/'.syn) + execute 'autocmd! PlugLOD FileType' a:pat + call s:doautocmd('filetypeplugin', 'FileType') + call s:doautocmd('filetypeindent', 'FileType') +endfunction + +function! s:lod_cmd(cmd, bang, l1, l2, args, names) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + call s:dobufread(a:names) + execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) +endfunction + +function! s:lod_map(map, names, with_prefix, prefix) + call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) + call s:dobufread(a:names) + let extra = '' + while 1 + let c = getchar(0) + if c == 0 + break + endif + let extra .= nr2char(c) + endwhile + + if a:with_prefix + let prefix = v:count ? v:count : '' + let prefix .= '"'.v:register.a:prefix + if mode(1) == 'no' + if v:operator == 'c' + let prefix = "\" . prefix + endif + let prefix .= v:operator + endif + call feedkeys(prefix, 'n') + endif + call feedkeys(substitute(a:map, '^', "\", '') . extra) +endfunction + +function! plug#(repo, ...) + if a:0 > 1 + return s:err('Invalid number of arguments (1..2)') + endif + + try + let repo = s:trim(a:repo) + let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec + let name = get(opts, 'as', 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 = s:shellesc(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 = s:shellesc(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 = s:shellesc(batchfile) + endif + return system(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:shellesc(s:plug_src), s:shellesc(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, '\\\@grey_number(x) + if &t_Co == 88 + if a:x < 23 + return 0 + elseif a:x < 69 + return 1 + elseif a:x < 103 + return 2 + elseif a:x < 127 + return 3 + elseif a:x < 150 + return 4 + elseif a:x < 173 + return 5 + elseif a:x < 196 + return 6 + elseif a:x < 219 + return 7 + elseif a:x < 243 + return 8 + else + return 9 + endif + else + if a:x < 14 + return 0 + else + let l:n = (a:x - 8) / 10 + let l:m = (a:x - 8) % 10 + if l:m < 5 + return l:n + else + return l:n + 1 + endif + endif + endif + endfun + + " Returns the actual grey level represented by the grey index + fun grey_level(n) + if &t_Co == 88 + if a:n == 0 + return 0 + elseif a:n == 1 + return 46 + elseif a:n == 2 + return 92 + elseif a:n == 3 + return 115 + elseif a:n == 4 + return 139 + elseif a:n == 5 + return 162 + elseif a:n == 6 + return 185 + elseif a:n == 7 + return 208 + elseif a:n == 8 + return 231 + else + return 255 + endif + else + if a:n == 0 + return 0 + else + return 8 + (a:n * 10) + endif + endif + endfun + + " Returns the palette index for the given grey index + fun grey_colour(n) + if &t_Co == 88 + if a:n == 0 + return 16 + elseif a:n == 9 + return 79 + else + return 79 + a:n + endif + else + if a:n == 0 + return 16 + elseif a:n == 25 + return 231 + else + return 231 + a:n + endif + endif + endfun + + " Returns an approximate colour index for the given colour level + fun rgb_number(x) + if &t_Co == 88 + if a:x < 69 + return 0 + elseif a:x < 172 + return 1 + elseif a:x < 230 + return 2 + else + return 3 + endif + else + if a:x < 75 + return 0 + else + let l:n = (a:x - 55) / 40 + let l:m = (a:x - 55) % 40 + if l:m < 20 + return l:n + else + return l:n + 1 + endif + endif + endif + endfun + + " Returns the actual colour level for the given colour index + fun rgb_level(n) + if &t_Co == 88 + if a:n == 0 + return 0 + elseif a:n == 1 + return 139 + elseif a:n == 2 + return 205 + else + return 255 + endif + else + if a:n == 0 + return 0 + else + return 55 + (a:n * 40) + endif + endif + endfun + + " Returns the palette index for the given R/G/B colour indices + fun rgb_colour(x, y, z) + if &t_Co == 88 + return 16 + (a:x * 16) + (a:y * 4) + a:z + else + return 16 + (a:x * 36) + (a:y * 6) + a:z + endif + endfun + + " Returns the palette index to approximate the given R/G/B colour levels + fun colour(r, g, b) + " Get the closest grey + let l:gx = grey_number(a:r) + let l:gy = grey_number(a:g) + let l:gz = grey_number(a:b) + + " Get the closest colour + let l:x = rgb_number(a:r) + let l:y = rgb_number(a:g) + let l:z = rgb_number(a:b) + + if l:gx == l:gy && l:gy == l:gz + " There are two possibilities + let l:dgr = grey_level(l:gx) - a:r + let l:dgg = grey_level(l:gy) - a:g + let l:dgb = grey_level(l:gz) - a:b + let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) + let l:dr = rgb_level(l:gx) - a:r + let l:dg = rgb_level(l:gy) - a:g + let l:db = rgb_level(l:gz) - a:b + let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) + if l:dgrey < l:drgb + " Use the grey + return grey_colour(l:gx) + else + " Use the colour + return rgb_colour(l:x, l:y, l:z) + endif + else + " Only one possibility + return rgb_colour(l:x, l:y, l:z) + endif + endfun + + " Returns the palette index to approximate the 'rrggbb' hex string + fun rgb(rgb) + let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0 + let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0 + let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0 + + return colour(l:r, l:g, l:b) + endfun + + " Sets the highlighting for the given group + fun X(group, fg, bg, attr) + if a:fg != "" + exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . rgb(a:fg) + endif + if a:bg != "" + exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . rgb(a:bg) + endif + if a:attr != "" + exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr + endif + endfun + + " Vim Highlighting + call X("Normal", s:foreground, "", "") + call X("LineNr", s:selection, "", "") + call X("NonText", s:selection, "", "") + call X("SpecialKey", s:selection, "", "") + call X("Search", "", s:highlight, "") + call X("TabLine", s:window, s:foreground, "reverse") + call X("TabLineFill", s:window, s:foreground, "reverse") + call X("StatusLine", s:window, s:yellow, "reverse") + call X("StatusLineNC", s:window, s:foreground, "reverse") + call X("VertSplit", s:window, "", "none") + call X("Visual", "", s:selection, "") + call X("Directory", s:blue, "", "") + call X("ModeMsg", s:green, "", "") + call X("MoreMsg", s:green, "", "") + call X("Question", s:green, "", "") + call X("WarningMsg", s:red, "", "") + call X("MatchParen", "", s:selection, "") + call X("Folded", s:comment, "", "") + call X("FoldColumn", "", "", "") + if version >= 700 + call X("CursorLine", "", s:line, "none") + call X("CursorColumn", "", s:line, "none") + call X("PMenu", s:foreground, s:selection, "none") + call X("PMenuSel", s:foreground, s:selection, "reverse") + call X("SignColumn", "", "", "none") + end + if version >= 703 + call X("ColorColumn", "", s:line, "none") + end + + " Standard Highlighting + call X("Comment", s:comment, "", "") + call X("Todo", s:comment, "", "") + call X("Title", s:comment, "", "") + call X("Identifier", s:red, "", "none") + call X("Statement", s:foreground, "", "") + call X("Conditional", s:foreground, "", "") + call X("Repeat", s:foreground, "", "") + call X("Structure", s:purple, "", "") + call X("Function", s:blue, "", "") + call X("Constant", s:orange, "", "") + call X("Keyword", s:orange, "", "") + call X("String", s:green, "", "") + call X("Special", s:foreground, "", "") + call X("PreProc", s:purple, "", "") + call X("Operator", s:aqua, "", "none") + call X("Type", s:blue, "", "none") + call X("Define", s:purple, "", "none") + call X("Include", s:blue, "", "") + "call X("Ignore", "666666", "", "") + + " Vim Highlighting + call X("vimCommand", s:red, "", "none") + + " C Highlighting + call X("cType", s:yellow, "", "") + call X("cStorageClass", s:purple, "", "") + call X("cConditional", s:purple, "", "") + call X("cRepeat", s:purple, "", "") + + " PHP Highlighting + call X("phpVarSelector", s:red, "", "") + call X("phpKeyword", s:purple, "", "") + call X("phpRepeat", s:purple, "", "") + call X("phpConditional", s:purple, "", "") + call X("phpStatement", s:purple, "", "") + call X("phpMemberSelector", s:foreground, "", "") + + " Ruby Highlighting + call X("rubySymbol", s:green, "", "") + call X("rubyConstant", s:yellow, "", "") + call X("rubyAccess", s:yellow, "", "") + call X("rubyAttribute", s:blue, "", "") + call X("rubyInclude", s:blue, "", "") + call X("rubyLocalVariableOrMethod", s:orange, "", "") + call X("rubyCurlyBlock", s:orange, "", "") + call X("rubyStringDelimiter", s:green, "", "") + call X("rubyInterpolationDelimiter", s:orange, "", "") + call X("rubyConditional", s:purple, "", "") + call X("rubyRepeat", s:purple, "", "") + call X("rubyControl", s:purple, "", "") + call X("rubyException", s:purple, "", "") + + " Crystal Highlighting + call X("crystalSymbol", s:green, "", "") + call X("crystalConstant", s:yellow, "", "") + call X("crystalAccess", s:yellow, "", "") + call X("crystalAttribute", s:blue, "", "") + call X("crystalInclude", s:blue, "", "") + call X("crystalLocalVariableOrMethod", s:orange, "", "") + call X("crystalCurlyBlock", s:orange, "", "") + call X("crystalStringDelimiter", s:green, "", "") + call X("crystalInterpolationDelimiter", s:orange, "", "") + call X("crystalConditional", s:purple, "", "") + call X("crystalRepeat", s:purple, "", "") + call X("crystalControl", s:purple, "", "") + call X("crystalException", s:purple, "", "") + + " Python Highlighting + call X("pythonInclude", s:purple, "", "") + call X("pythonStatement", s:purple, "", "") + call X("pythonConditional", s:purple, "", "") + call X("pythonRepeat", s:purple, "", "") + call X("pythonException", s:purple, "", "") + call X("pythonFunction", s:blue, "", "") + call X("pythonPreCondit", s:purple, "", "") + call X("pythonRepeat", s:aqua, "", "") + call X("pythonExClass", s:orange, "", "") + + " JavaScript Highlighting + call X("javaScriptBraces", s:foreground, "", "") + call X("javaScriptFunction", s:purple, "", "") + call X("javaScriptConditional", s:purple, "", "") + call X("javaScriptRepeat", s:purple, "", "") + call X("javaScriptNumber", s:orange, "", "") + call X("javaScriptMember", s:orange, "", "") + call X("javascriptNull", s:orange, "", "") + call X("javascriptGlobal", s:blue, "", "") + call X("javascriptStatement", s:red, "", "") + + " CoffeeScript Highlighting + call X("coffeeRepeat", s:purple, "", "") + call X("coffeeConditional", s:purple, "", "") + call X("coffeeKeyword", s:purple, "", "") + call X("coffeeObject", s:yellow, "", "") + + " HTML Highlighting + call X("htmlTag", s:red, "", "") + call X("htmlTagName", s:red, "", "") + call X("htmlArg", s:red, "", "") + call X("htmlScriptTag", s:red, "", "") + + " Diff Highlighting + call X("diffAdd", "", "4c4e39", "") + call X("diffDelete", "", s:red, "") + call X("diffChange", "", "2B5B77", "") + call X("diffText", s:line, s:blue, "") + + " ShowMarks Highlighting + call X("ShowMarksHLl", s:orange, "", "none") + call X("ShowMarksHLo", s:purple, "", "none") + call X("ShowMarksHLu", s:yellow, "", "none") + call X("ShowMarksHLm", s:aqua, "", "none") + + " Lua Highlighting + call X("luaStatement", s:purple, "", "") + call X("luaRepeat", s:purple, "", "") + call X("luaCondStart", s:purple, "", "") + call X("luaCondElseif", s:purple, "", "") + call X("luaCond", s:purple, "", "") + call X("luaCondEnd", s:purple, "", "") + + " Cucumber Highlighting + call X("cucumberGiven", s:blue, "", "") + call X("cucumberGivenAnd", s:blue, "", "") + + " Rust Highlighting + call X("rustQuestionMark", s:red, "", "") + + " Go Highlighting + call X("goDirective", s:purple, "", "") + call X("goDeclaration", s:purple, "", "") + call X("goStatement", s:purple, "", "") + call X("goConditional", s:purple, "", "") + call X("goConstants", s:orange, "", "") + call X("goTodo", s:yellow, "", "") + call X("goDeclType", s:foreground, "", "") + call X("goBuiltins", s:purple, "", "") + call X("goRepeat", s:purple, "", "") + call X("goLabel", s:purple, "", "") + call X("goTypeName", s:red, "", "") + call X("goFunction", s:blue, "", "") + call X("goReceiverType", s:red, "", "") + call X("goFunctionCall", s:lightblue, "", "") + call X("goMethodCall", s:lightblue, "", "") + call X("goTypeConstructor", s:lightred, "", "") + call X("goPackage", s:orange, "", "") + call X("goType", s:lightpurple, "", "") + call X("goSignedInts", s:foreground, "", "") + + " Clojure Highlighting + call X("clojureConstant", s:orange, "", "") + call X("clojureBoolean", s:orange, "", "") + call X("clojureCharacter", s:orange, "", "") + call X("clojureKeyword", s:green, "", "") + call X("clojureNumber", s:orange, "", "") + call X("clojureString", s:green, "", "") + call X("clojureRegexp", s:green, "", "") + call X("clojureParen", s:aqua, "", "") + call X("clojureVariable", s:yellow, "", "") + call X("clojureCond", s:blue, "", "") + call X("clojureDefine", s:purple, "", "") + call X("clojureException", s:red, "", "") + call X("clojureFunc", s:blue, "", "") + call X("clojureMacro", s:blue, "", "") + call X("clojureRepeat", s:blue, "", "") + call X("clojureSpecial", s:purple, "", "") + call X("clojureQuote", s:blue, "", "") + call X("clojureUnquote", s:blue, "", "") + call X("clojureMeta", s:blue, "", "") + call X("clojureDeref", s:blue, "", "") + call X("clojureAnonArg", s:blue, "", "") + call X("clojureRepeat", s:blue, "", "") + call X("clojureDispatch", s:blue, "", "") + + " Scala Highlighting + call X("scalaKeyword", s:purple, "", "") + call X("scalaKeywordModifier", s:purple, "", "") + call X("scalaOperator", s:blue, "", "") + call X("scalaPackage", s:red, "", "") + call X("scalaFqn", s:foreground, "", "") + call X("scalaFqnSet", s:foreground, "", "") + call X("scalaImport", s:purple, "", "") + call X("scalaBoolean", s:orange, "", "") + call X("scalaDef", s:purple, "", "") + call X("scalaVal", s:purple, "", "") + call X("scalaVar", s:aqua, "", "") + call X("scalaClass", s:purple, "", "") + call X("scalaObject", s:purple, "", "") + call X("scalaTrait", s:purple, "", "") + call X("scalaDefName", s:blue, "", "") + call X("scalaValName", s:foreground, "", "") + call X("scalaVarName", s:foreground, "", "") + call X("scalaClassName", s:foreground, "", "") + call X("scalaType", s:yellow, "", "") + call X("scalaTypeSpecializer", s:yellow, "", "") + call X("scalaAnnotation", s:orange, "", "") + call X("scalaNumber", s:orange, "", "") + call X("scalaDefSpecializer", s:yellow, "", "") + call X("scalaClassSpecializer", s:yellow, "", "") + call X("scalaBackTick", s:green, "", "") + call X("scalaRoot", s:foreground, "", "") + call X("scalaMethodCall", s:blue, "", "") + call X("scalaCaseType", s:yellow, "", "") + call X("scalaLineComment", s:comment, "", "") + call X("scalaComment", s:comment, "", "") + call X("scalaDocComment", s:comment, "", "") + call X("scalaDocTags", s:comment, "", "") + call X("scalaEmptyString", s:green, "", "") + call X("scalaMultiLineString", s:green, "", "") + call X("scalaUnicode", s:orange, "", "") + call X("scalaString", s:green, "", "") + call X("scalaStringEscape", s:green, "", "") + call X("scalaSymbol", s:orange, "", "") + call X("scalaChar", s:orange, "", "") + call X("scalaXml", s:green, "", "") + call X("scalaConstructorSpecializer", s:yellow, "", "") + call X("scalaBackTick", s:blue, "", "") + + " Git + call X("diffAdded", s:green, "", "") + call X("diffRemoved", s:red, "", "") + call X("gitcommitSummary", "", "", "bold") + + " Diff + let s:diffbackground = "494e56" + call X("diffAdded", s:green, "", "") + call X("diffRemoved", s:red, "", "") + call X("DiffAdd", s:green, s:diffbackground, "") + call X("DiffDelete", s:red, s:diffbackground, "") + call X("DiffChange", s:yellow, s:diffbackground, "") + call X("DiffText", s:diffbackground, s:orange, "") + + " GitGutter + call X("GitGutterAdd", s:darkgreen, s:darkgreen, "none") + call X("GitGutterChange", s:darkorange, s:darkorange, "none") + call X("GitGutterChangeDelete", s:red, s:darkorange, "underline") + call X("GitGutterDelete", s:red, "", "underline") + + " Delete Functions + delf X + delf rgb + delf colour + delf rgb_colour + delf rgb_level + delf rgb_number + delf grey_colour + delf grey_level + delf grey_number +endif diff --git a/nvim/init.vim b/nvim/init.vim new file mode 100644 index 0000000..c5ac58c --- /dev/null +++ b/nvim/init.vim @@ -0,0 +1,169 @@ +" Set the encoding to UTF-8 +scriptencoding utf-8 +set encoding=utf8 + +set shada="NONE" + +" Run :PlugInstall to install plugins + +" Plugins +call plug#begin() + +" UI +Plug 'ctrlpvim/ctrlp.vim' +"Plug 'Shougo/echodoc.vim' + +" Formatting helpers +Plug 'tpope/vim-commentary' + +" Language specific +Plug 'fatih/vim-go' +Plug 'exu/pgsql.vim' +Plug 'sirtaj/vim-openscad' +"Plug 'rust-lang/rust.vim' +"Plug 'racer-rust/vim-racer' + +" Git helpers +Plug 'tpope/vim-fugitive' +Plug 'airblade/vim-gitgutter' + +call plug#end() + +" Set the vertical split character +set fillchars+=vert:\| + +set inccommand=split + +" Prevent useless redraws +set lazyredraw + +" Set colors +set termguicolors +set t_Co=256 +colorscheme Tomorrow-Night + +let g:gitgutter_sign_added = '+ ' +let g:gitgutter_sign_modified = '~ ' +let g:gitgutter_sign_modified_removed = '__' +let g:gitgutter_sign_removed = '_ ' + +" Syntax +syntax on +set showmatch + +" Set backspace to work everywhere +set backspace=start,eol,indent + +set laststatus=1 + +" Show indents and trailing whitespace +set list listchars=trail:·,tab:»\ ,eol:¬ + +" Set indent settings +set tabstop=4 shiftwidth=4 noexpandtab +autocmd BufRead,BufNewFile *.py set tabstop=4 shiftwidth=4 noexpandtab + +" Disable auto newlines +set wrap +set textwidth=0 +set wrapmargin=0 +set formatoptions=l + +" GUI options +set mouse=a +set clipboard=unnamedplus + +" Line numbers +set number +set numberwidth=6 +highlight LineNr ctermfg=darkgrey +set relativenumber + +set ruler + +set showtabline=1 + +set completeopt=menuone,noinsert + +" Configure CtrlP +let g:ctrlp_working_path_mode = 'r' + +let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . -co --exclude-standard', 'find %s -type f'] + +let g:netrw_dirhistmax=0 +let g:netrw_liststyle=3 + +set shortmess+=c + +let g:cm_auto_popup = 0 +let g:cm_sources_override = { + \ 'cm-tags': {'enable':0} + \ } + + +" echodoc + +"let g:echodoc_enable_at_startup = 1 +"set noshowmode + + +au FileType go nmap :GoAlternate + +" Go +let g:go_fmt_command = "goimports" +let g:go_fmt_fail_silently = 1 + +" let g:go_gocode_unimported_packages = 0 + +let g:go_highlight_functions = 1 +let g:go_highlight_methods = 1 +let g:go_highlight_types = 1 +let g:go_highlight_structs = 1 +let g:go_highlight_interfaces = 1 +let g:go_highlight_operators = 1 +let g:go_highlight_build_constraints = 1 +let g:go_highlight_generate_tags = 1 + +let g:go_metalinter_autosave = 0 +" let g:go_metalinter_autosave_enabled = ['golint', 'ineffassign'] + +let g:go_template_autocreate = 0 + +" let g:go_auto_type_info=1 +" let g:go_updatetime = 250 + +au BufNewFile,BufRead *.gohtml setf gohtmltmpl +au BufNewFile,BufRead *.tmpl setf gohtmltmpl + +" Rust + +let g:rustfmt_autosave = 0 + +let g:racer_experimental_completer = 1 + +autocmd BufRead,BufNewFile *.rs set tabstop=4 shiftwidth=4 expandtab + +au FileType rust nmap gd (rust-def) +au FileType rust nmap K (rust-doc) + +" Set keybindings + +nnoremap +nnoremap > <\>> +nnoremap <\<> + +nnoremap ^ +vnoremap ^ +inoremap ^ + +map :nohl + +inoremap + +nnoremap d "_d +vnoremap d "_d + +nnoremap D "_D + +map q: +map Q diff --git a/picom.conf b/picom.conf new file mode 100644 index 0000000..1970638 --- /dev/null +++ b/picom.conf @@ -0,0 +1,5 @@ +#backend = "glx"; +#glx-swap-method = "6"; + +inactive-opacity = 0.85; +focus-exclude = [ "name *= 'i3lock'", "class_g = 'dmenu'" ]; diff --git a/profile b/profile new file mode 100755 index 0000000..6a20a4d --- /dev/null +++ b/profile @@ -0,0 +1,20 @@ +export PATH="${PATH}:$HOME/go/bin" +export EDITOR=/usr/bin/nvim +export PAGER=/bin/less + +# SSH agent +if [ ! -S ~/.ssh/ssh_auth_sock ]; then + eval `ssh-agent -t 300` > /dev/null + ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock +fi +export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock + +# Go +export GOPRIVATE="git.ultraware.nl/*/*,git.sinuss.nl/*/*" + +# Fixes +export _JAVA_AWT_WM_NONREPARENTING=1 + +case "$SHELL" in + /bin/ksh | /bin/loksh | /bin/mksh) export ENV=~/.kshrc ;; +esac diff --git a/xinitrc b/xinitrc new file mode 100644 index 0000000..e92e5a7 --- /dev/null +++ b/xinitrc @@ -0,0 +1,9 @@ +xsetroot -cursor_name left_ptr +setxkbmap -option caps:none +setxkbmap -option compose:ralt + +picom -b --config ~/.LinuxConfig/picom.conf +~/.LinuxConfig/bin/switchbg & +~/.LinuxConfig/bin/panel & + +exec dwm