From dccebf5756e8c137571585245d6da632b1796c31 Mon Sep 17 00:00:00 2001 From: Nick Nisi Date: Sat, 16 Jan 2016 15:32:41 -0600 Subject: [PATCH] remove vim/ and add symlinks Remove the vim configuration files from the repository. I have moved fully over to neovim and so these configuration files have stagnated. Instead, let's symlink the neovim config for vim * remove vim/ * add symlinking code in install/link.sh to symlink neovim config for vim * symlink config/nvim -> ~/.vim * symlink config/nvim/init.vim -> ~/.vimrc * Remove old/outdated info from README * Revise Vim and Neovim section of README --- README.md | 47 +- install/link.sh | 24 +- vim/vim.symlink/autoload/plug.vim | 2037 ------------------ vim/vim.symlink/plugins.vim | 73 - vim/vim.symlink/snippets/_.snippets | 243 --- vim/vim.symlink/snippets/gitcommit.snippets | 6 - vim/vim.symlink/snippets/html.snippets | 51 - vim/vim.symlink/snippets/javascript.snippets | 82 - vim/vim.symlink/snippets/markdown.snippets | 3 - vim/vim.symlink/snippets/textile.snippets | 4 - vim/vim.symlink/snippets/typescript.snippets | 90 - vim/vim.symlink/snippets/vim.snippets | 2 - vim/vimrc.symlink | 468 ---- 13 files changed, 39 insertions(+), 3091 deletions(-) delete mode 100644 vim/vim.symlink/autoload/plug.vim delete mode 100644 vim/vim.symlink/plugins.vim delete mode 100644 vim/vim.symlink/snippets/_.snippets delete mode 100644 vim/vim.symlink/snippets/gitcommit.snippets delete mode 100644 vim/vim.symlink/snippets/html.snippets delete mode 100644 vim/vim.symlink/snippets/javascript.snippets delete mode 100644 vim/vim.symlink/snippets/markdown.snippets delete mode 100644 vim/vim.symlink/snippets/textile.snippets delete mode 100644 vim/vim.symlink/snippets/typescript.snippets delete mode 100644 vim/vim.symlink/snippets/vim.snippets delete mode 100644 vim/vimrc.symlink diff --git a/README.md b/README.md index e0a824f..76449d0 100644 --- a/README.md +++ b/README.md @@ -73,44 +73,29 @@ The prompt will also display a ✱ character in the `RPROMPT` indicating that th ## Vim and Neovim Setup -vim and neovim should just work once the correct plugins are installed. To install the plugins, you will need to open vim/neovim in the following way: +[Neovim](https://neovim.io/) is a fork and drop-in replacement for vim. in most cases, you would not notice a difference between the two, other than Neovim allows plugins to run asynchronously so that they do not freeze the editor, which is the main reason I have switched over to it. Vim and Neovim both use Vimscript and most plugins will work in both (all of the plugins I use do work in both Vim and Neovim). For this reason, they share the same configuration files in this setup. Neovim uses the [XDG base directory specification](http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html) which means it won't look for a `.vimrc` in your home directory. Instead, its configuration looks like the following: -for vim -```bash -vim +PlugInstall -``` +| | Vim | Neovim | +|-------------------------|------------|---------------------------| +| Main Configuratin File | `~/.vimrc` | `~/.config/nvim/init.vim` | +| Configuration directory | `~/.vim` | `~/.config/nvim` | + +### Installation + +Vim is likely already installed on your system. If using a Mac, MacVim will be installed from Homebrew. Neovim will also be installed from Homebrew by default on a Mac. For other systems, you may need to install Neovim manually. See their [web site](https://neovim.io) for more information. + +[`link.sh`](install/link.sh) will symlink the XDG configuration directory into your home directory and will then create symlinks for `.vimrc` and `.vim` over to the Neovim configuration so that Vim and Neovim will both be configured in the same way from the same files. The benefit of this configuration is that you only have to maintain a single vim configuration for both, so that if Neovim (which is still alpha software) has issues, you can very seamlessly transition back to vim with no big impact to your productivity. + +Inside of [`.zshrc`](zsh/zshrc.symlink), the `EDITOR` shell variable is set to `nvim`, defaulting to Neovim for editor tasks, such as git commit messages. Additionally, I have aliased `vim` to `nvim` in [`aliases.zsh`](zsh/aliases.zsh) You can remove this if you would rather not alias the `vim` command to `nvim`. + +vim and neovim should just work once the correct plugins are installed. To install the plugins, you will need to open Neovim in the following way: -for neovim ```bash nvim +PlugInstall ``` -### Fonts +## Fonts I am currently using [Hack](http://sourcefoundry.org/hack/) as my default font, which does include Powerline support, so you don't need an additional patched font. In addition to this, I do have [nerd-fonts](https://github.com/ryanoasis/nerd-fonts) installed and configured to be used for non-ascii characters. If you would prefer not to do this, then simply remove the `Plug 'ryanoasis/vim-devicons'` plugin from vim/nvim. Then, I configure the fonts in this way in iTerm2: ![](http://nicknisi.com/share/iterm-fonts-config.png) - ------ - -+ zsh configuration -+ vim configuration -+ tmux configuration -+ git configuration -+ osx configuration -+ Node.js setup (nvm) -+ Homebrew - -## Install - -1. `git clone https://github.com/nicknisi/dotfiles.git ~/.dotfiles` -1. `cd ~/.dotfiles` -1. `./install.sh` - -## ZSH Plugins - -By default, the `.zshrc` file will source any file within `.dotfiles/zsh` that have the `.zsh` extension. - -## Vim Plugins - -Vim plugins are managed with [vim-plug](https://github.com/junegunn/vim-plug). To install, run `vim +PlugInstall`. diff --git a/install/link.sh b/install/link.sh index ae98ada..922e70a 100755 --- a/install/link.sh +++ b/install/link.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env zsh DOTFILES=$HOME/.dotfiles @@ -31,3 +31,25 @@ for config in $DOTFILES/config/*; do ln -s $config $target fi done + +# create vim symlinks +# As I have moved off of vim as my full time editor in favor of neovim, +# I feel it doesn't make sense to leave my vimrc intact in the dotfiles repo +# as it is not really being actively maintained. However, I would still +# like to configure vim, so lets symlink ~/.vimrc and ~/.vim over to their +# neovim equivalent. + +echo "\nCreating vim symlinks" +echo "==============================" + +typeset -A vimfiles=(~/.vim $DOTFILES/config/nvim ~/.vimrc $DOTFILES/config/nvim/init.vim) + +for file in "${(@k)vimfiles}"; do + # echo "$file -> $vimfiles[$file]" + if [ -e ${file} ]; then + echo "${file} already exists... skipping" + else + echo "Creating symlink for $file" + ln -s $vimfiles[$file] $file + fi +done diff --git a/vim/vim.symlink/autoload/plug.vim b/vim/vim.symlink/autoload/plug.vim deleted file mode 100644 index edf9552..0000000 --- a/vim/vim.symlink/autoload/plug.vim +++ /dev/null @@ -1,2037 +0,0 @@ -" vim-plug: Vim plugin manager -" ============================ -" -" Download plug.vim and put it in ~/.vim/autoload -" -" curl -fLo ~/.vim/autoload/plug.vim --create-dirs \ -" https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim -" -" Edit your .vimrc -" -" call plug#begin('~/.vim/plugged') -" -" " Make sure you use single quotes -" Plug 'junegunn/seoul256.vim' -" Plug 'junegunn/vim-easy-align' -" -" " Group dependencies, vim-snippets depends on ultisnips -" Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets' -" -" " On-demand loading -" Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -" Plug 'tpope/vim-fireplace', { 'for': 'clojure' } -" -" " Using git URL -" Plug 'https://github.com/junegunn/vim-github-dashboard.git' -" -" " Plugin options -" Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' } -" -" " Plugin outside ~/.vim/plugged with post-update hook -" Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' } -" -" " Unmanaged plugin (manually installed and updated) -" Plug '~/my-prototype-plugin' -" -" " Add plugins to &runtimepath -" call plug#end() -" -" Then reload .vimrc and :PlugInstall to install plugins. -" Visit https://github.com/junegunn/vim-plug for more information. -" -" -" Copyright (c) 2015 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') || has('win64') -let s:nvim = has('nvim') && exists('*jobwait') && !s:is_win -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 - - 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 s:add() - if !executable('git') - return s:err('`git` executable not found. vim-plug requires git.') - endif - command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install('' == '!', []) - command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update('' == '!', []) - command! -nargs=0 -bar -bang PlugClean call s:clean('' == '!') - 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 PlugSnapshot call s:snapshot() -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:source(from, ...) - for pattern in a:000 - for vim in s:lines(globpath(a:from, pattern)) - execute 'source' s:esc(vim) - endfor - endfor -endfunction - -function! s:assoc(dict, key, val) - let a:dict[a:key] = add(get(a:dict, a:key, []), a:val) -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': {} } - - filetype off - for name in g:plugs_order - let plug = g:plugs[name] - if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(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]' - if exists(':'.cmd) != 2 - call s:assoc(lod.cmd, cmd, name) - endif - call add(s:triggers[name].cmd, cmd) - endif - endfor - endif - - if has_key(plug, 'for') - let types = s:to_a(plug.for) - if !empty(types) - call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim') - 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 %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")', - \ mode, map, map_prefix, string(map), string(names), 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') - syntax enable - else - call s:reload() - endif -endfunction - -function! s:loaded_names() - return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)') -endfunction - -function! s:reload() - for name in s:loaded_names() - call s:source(s:rtp(g:plugs[name]), 'plugin/**/*.vim', 'after/plugin/**/*.vim') - 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(...) - let s:git_version = get(s:, 'git_version', - \ map(split(split(s:system('git --version'))[-1], '\.'), 'str2nr(v:val)')) - 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 a:msg - echohl None - return 0 -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")'), 'isdirectory(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! 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 unknowns = filter(copy(a:000), '!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 - for name in a:000 - call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - endfor - if exists('#BufRead') - doautocmd BufRead - endif - return 1 -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 exists('#User#'.name) - execute 'doautocmd User' name - endif - endfor -endfunction - -function! s:lod_ft(pat, names) - call s:lod(a:names, ['plugin', 'after/plugin', 'syntax', 'after/syntax']) - execute 'autocmd! PlugLOD FileType' a:pat - if exists('#filetypeplugin#FileType') - doautocmd filetypeplugin FileType - endif - if exists('#filetypeindent#FileType') - doautocmd filetypeindent FileType - endif -endfunction - -function! s:lod_cmd(cmd, bang, l1, l2, args, names) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - 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, prefix) - call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) - let extra = '' - while 1 - let c = getchar(0) - if c == 0 - break - endif - let extra .= nr2char(c) - endwhile - call feedkeys(a:prefix . substitute(a:map, '^', "\", '') . extra) -endfunction - -function! s:add(repo, ...) - if a:0 > 1 - return s:err('Invalid number of arguments (1..2)') - endif - - try - let repo = s:trim(a:repo) - let name = fnamemodify(repo, ':t:s?\.git$??') - let spec = extend(s:infer_properties(name, repo), - \ a:0 == 1 ? s:parse_options(a:1) : s:base_spec) - 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 !~ '/' - let repo = 'vim-scripts/'. repo - endif - let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git') - let uri = printf(fmt, repo) - endif - let dir = s:dirpath( fnamemodify(join([g:plug_home, a:name], '/'), ':p') ) - return { 'dir': dir, '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([spec.dir, '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 plugInstall /\(^+ \)\@<=[^:]*/ - syn match plugUpdate /\(^* \)\@<=[^:]*/ - syn match plugCommit /^ [0-9a-z]\{7} .*/ contains=plugRelDate,plugSha - syn match plugSha /\(^ \)\@<=[0-9a-z]\{7}/ contained - syn match plugRelDate /([^)]*)$/ contained - syn match plugNotLoaded /(not loaded)$/ - syn match plugError /^x.*/ - syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean - hi def link plug1 Title - hi def link plug2 Repeat - 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 plugRelDate Comment - hi def link plugSha Identifier - - 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:prepare() - call s:job_abort() - if s:switch_in() - silent %d _ - else - call s:new_window() - nnoremap q :if b:plug_preview==1pcendifechoq - nnoremap R :silent! 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') - let b:plug_preview = -1 - let s:plug_tab = tabpagenr() - let s:plug_buf = winbufnr(0) - call s:assign_name() - endif - silent! unmap - silent! unmap L - silent! unmap o - silent! unmap X - setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable - setf vim-plug - call s:syntax() -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: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 && !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', spec.dir))) - if a:force || installed || updated - execute 'cd' s:esc(spec.dir) - call append(3, '- Post-update hook for '. name .' ... ') - let type = type(spec.do) - if type == s:TYPE.string - try - " FIXME: Escaping is incomplete. We could use shellescape with eval, - " but it won't work on Windows. - let g:_plug_do = '!'.escape(spec.do, '#!%') - execute "normal! :execute g:_plug_do\\" - finally - let result = v:shell_error ? ('Exit status: '.v:shell_error) : 'Done!' - unlet g:_plug_do - endtry - elseif type == s:TYPE.funcref - try - let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged') - call spec.do({ 'name': name, 'status': status, 'force': a:force }) - let result = 'Done!' - catch - let result = 'Error: ' . v:exception - endtry - else - let result = 'Error: Invalid type!' - endif - call setline(4, getline(4) . result) - cd - - endif - endfor -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 ... ') - 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 =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0")) - call add(msgs, "Press 'D' to see the updated changes.") - endif - echo join(msgs, ' ') -endfunction - -function! s:retry() - if empty(s:update.errors) - return - endif - 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:update_impl(pull, force, args) abort - let args = copy(a:args) - let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ? - \ remove(args, -1) : get(g:, 'plug_threads', s:is_win ? 1 : 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) - echohl WarningMsg - echo 'No plugin to '. (a:pull ? 'update' : 'install') . '.' - echohl None - return - 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 - echohl WarningMsg - echomsg 'vim-plug: update Neovim for parallel installer' - echohl None - endif - - let python = (has('python') || has('python3')) && !s:is_win && !has('win32unix') - \ && (!s:nvim || has('vim_starting')) - let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374')) - - let s:update = { - \ 'start': reltime(), - \ 'all': todo, - \ 'todo': copy(todo), - \ 'errors': [], - \ 'pull': a:pull, - \ 'force': a:force, - \ 'new': {}, - \ 'threads': (python || ruby || s:nvim) ? min([len(todo), threads]) : 1, - \ 'bar': '', - \ 'fin': 0 - \ } - - call s:prepare() - 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' : '') : '' - - " Python version requirement (>= 2.7) - if python && !has('python3') && !ruby && !s:nvim && 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() - endif -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 s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'has_key(v:val, "do")')) - 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 || !exists('s:jobs') - return - endif - - for [name, j] in items(s:jobs) - silent! call jobstop(j.jobid) - if j.new - call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir)) - endif - endfor - let s:jobs = {} -endfunction - -" When a:event == 'stdout', data = list of strings -" When a:event == 'exit', data = returncode -function! s:job_handler(job_id, data, event) abort - if !s:plug_window_exists() " plug window closed - return s:job_abort() - endif - - if a:event == 'stdout' - let self.result .= substitute(s:to_s(a:data), '[\r\n]', '', 'g') . "\n" - " To reduce the number of buffer updates - let self.tick = get(self, 'tick', -1) + 1 - if self.tick % len(s:jobs) == 0 - call s:log(self.new ? '+' : '*', self.name, self.result) - endif - elseif a:event == 'exit' - let self.running = 0 - if a:data != 0 - let self.error = 1 - endif - call s:reap(self.name) - call s:tick() - endif -endfunction - -function! s:spawn(name, cmd, opts) - let job = { 'name': a:name, 'running': 1, 'error': 0, 'result': '', - \ 'new': get(a:opts, 'new', 0), - \ 'on_stdout': function('s:job_handler'), - \ 'on_exit' : function('s:job_handler'), - \ } - let s:jobs[a:name] = job - - if s:nvim - let argv = [ 'sh', '-c', - \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd) ] - let jid = jobstart(argv, job) - if jid > 0 - let job.jobid = jid - else - let job.running = 0 - let job.error = 1 - let job.result = jid < 0 ? 'sh is not executable' : - \ 'Invalid arguments (or job table is full)' - endif - else - let params = has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd] - let job.result = call('s:system', params) - 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' : '=' - - call s:log(job.error ? 'x' : '-', a:name, job.result) - call s:bar() - - call remove(s:jobs, a:name) -endfunction - -function! s:bar() - if s:switch_in() - let total = len(s:update.all) - call setline(1, (s:update.pull ? 'Updating' : 'Installing'). - \ ' plugins ('.len(s:update.bar).'/'.total.')') - call s:progress_bar(2, s:update.bar, total) - call s:switch_out() - endif -endfunction - -function! s:logpos(name) - for i in range(1, line('$')) - if getline(i) =~# '^[-+x*] '.a:name.':' - return i - endif - endfor - return 0 -endfunction - -function! s:log(bullet, name, lines) - if s:switch_in() - let pos = s:logpos(a:name) - if pos > 0 - execute pos 'd _' - if pos > winheight('.') - let pos = 4 - endif - else - let pos = 4 - endif - call append(pos - 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) -while 1 " Without TCO, Vim stack is bound to explode - if empty(s:update.todo) - if empty(s:jobs) && !s:update.fin - let s:update.fin = 1 - call s:update_finish() - endif - return - endif - - let name = keys(s:update.todo)[0] - let spec = remove(s:update.todo, name) - let new = !isdirectory(spec.dir) - - call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...') - redraw - - let has_tag = has_key(spec, 'tag') - let checkout = s:shellesc(has_tag ? spec.tag : spec.branch) - let merge = s:shellesc(has_tag ? spec.tag : 'origin/'.spec.branch) - - if !new - let [valid, msg] = s:git_valid(spec, 0) - if valid - 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 && git checkout -q %s 2>&1 && git merge --ff-only %s 2>&1 && git submodule update --init --recursive 2>&1)', - \ fetch_opt, prog, checkout, merge), { 'dir': spec.dir }) - else - let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 } - endif - else - let s:jobs[name] = { 'running': 0, 'result': msg, 'error': 1 } - endif - else - call s:spawn(name, - \ printf('git clone %s %s --recursive %s -b %s %s 2>&1', - \ has_tag ? '' : s:clone_opt, - \ prog, - \ s:shellesc(spec.uri), - \ checkout, - \ 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('python3') ? 'python3' : 'python' -execute py_exe "<< EOF" -""" Due to use of signals this function is POSIX only. """ -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_THREADS = {} - -class PlugError(Exception): - def __init__(self, msg): - self._msg = msg - @property - def msg(self): - return self._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, is_win): - self.bar = '' - self.event = 'Updating' if is_pull else 'Installing' - self.is_win = is_win - 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') - if not self.is_win: - 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): - def __init__(self, cmd, cmd_dir=None, timeout=60, cb=None, clean=None): - self.cmd = cmd - self.cmd_dir = cmd_dir - 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') - self.proc = subprocess.Popen(self.cmd, cwd=self.cmd_dir, stdout=tfile, - stderr=subprocess.STDOUT, shell=True, - preexec_fn=os.setsid) - 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 = 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: - 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 - tag = args.get('tag', 0) - self.checkout = esc(tag if tag else args['branch']) - self.merge = esc(tag if tag else 'origin/' + args['branch']) - self.tag = tag - - 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'] - - 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} --recursive {2} -b {3} {4} 2>&1'.format( - '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], - self.checkout, 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 remote.origin.url' - command = Command(cmd, self.args['dir'], G_TIMEOUT,) - result = command.execute(G_RETRIES) - return result[-1] - - def update(self): - match = re.compile(r'git::?@') - actual_uri = re.sub(match, '', self.repo_uri()) - expect_uri = re.sub(match, '', self.args['uri']) - if actual_uri != expect_uri: - 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 '' - cmds = ['git fetch {0} {1}'.format(fetch_opt, G_PROGRESS), - 'git checkout -q {0}'.format(self.checkout), - 'git merge --ff-only {0}'.format(self.merge), - 'git submodule update --init --recursive'] - cmd = ' 2>&1 && '.join(cmds) - 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 - finally: - global G_THREADS - with lock: - del G_THREADS[thr.current_thread().name] - -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' - is_win = vim.eval('s:is_win') == '1' - - lock = thr.Lock() - buf = Buffer(lock, len(plugs), G_PULL, is_win) - buf_q, work_q = queue.Queue(), queue.Queue() - for work in plugs.items(): - work_q.put(work) - - global G_THREADS - for num in range(nthreads): - tname = 'PlugT-{0:02}'.format(num) - thread = PlugThread(tname, (buf_q, work_q, lock)) - thread.start() - G_THREADS[tname] = thread - if mac_gui: - rthread = RefreshThread(lock) - rthread.start() - - while not buf_q.empty() or len(G_THREADS) != 0: - try: - action, name, msg = buf_q.get(True, 0.25) - buf.write(action, name, 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] - 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 - - 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 - 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') unless iswin - } - 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}"] - 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 { - while VIM::evaluate('getchar(1)') - sleep 0.1 - end - mtx.synchronize do - running = false - threads.each { |t| t.raise Interrupt } - 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, branch, tag = pair.last.values_at *%w[dir uri branch tag] - checkout = esc(tag ? tag : branch) - merge = esc(tag ? tag : "origin/#{branch}") - subm = "git submodule update --init --recursive 2>&1" - exists = File.directory? dir - ok, result = - if exists - dir = iswin ? dir : esc(dir) - ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && 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 current_uri.sub(/git::?@/, '') != uri.sub(/git::?@/, '') - [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 "#{cd} #{dir} && git fetch #{fetch_opt} #{progress} 2>&1 && git checkout -q #{checkout} 2>&1 && git merge --ff-only #{merge} 2>&1 && #{subm}", 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} --recursive #{uri} -b #{checkout} #{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(arg) - return '"'.escape(a:arg, '"').'"' -endfunction - -function! s:glob_dir(path) - return map(filter(s:lines(globpath(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) - let a = substitute(a:a, 'git:\{1,2}@', '', '') - let b = substitute(a:b, 'git:\{1,2}@', '', '') - return a ==# b -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, shrd] = [&shell, &shellredir] - if !s:is_win - set shell=sh shellredir=>%s\ 2>&1 - endif - let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd - return system(s:is_win ? '('.cmd.')' : cmd) - finally - let [&shell, &shellredir] = [sh, shrd] - endtry -endfunction - -function! s:system_chomp(...) - let ret = call('s:system', a:000) - return v:shell_error ? '' : substitute(ret, '\n$', '', '') -endfunction - -function! s:git_valid(spec, check_branch) - let ret = 1 - let msg = 'OK' - if isdirectory(a:spec.dir) - let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url', a:spec.dir)) - let remote = result[-1] - if v:shell_error - let msg = join([remote, 'PlugClean required.'], "\n") - let ret = 0 - elseif !s:compare_git_uri(remote, a:spec.uri) - let msg = join(['Invalid URI: '.remote, - \ 'Expected: '.a:spec.uri, - \ 'PlugClean required.'], "\n") - let ret = 0 - 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 - let msg = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.', - \ (empty(tag) ? 'N/A' : tag), a:spec.tag) - let ret = 0 - endif - " Check branch - elseif a:spec.branch !=# branch - let msg = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ branch, a:spec.branch) - let ret = 0 - endif - endif - else - let msg = 'Not found' - let ret = 0 - endif - return [ret, msg] -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 unused plugins in '.g:plug_home) - call append(1, '') - - " List of valid directories - let dirs = [] - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - if !s:is_managed(name) || s:git_valid(spec, 0)[0] - call add(dirs, spec.dir) - 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) - let found = filter(found, 'stridx(v:val, f) != 0') - end - endwhile - - normal! G - redraw - if empty(todo) - call append(line('$'), 'Already clean.') - else - call inputsave() - let yes = a:force || (input('Proceed? (y/N) ') =~? '^y') - call inputrestore() - if yes - for dir in todo - call s:rm_rf(dir) - endfor - call append(line('$'), 'Removed.') - else - call append(line('$'), 'Cancelled.') - endif - endif - normal! G -endfunction - -function! s:upgrade() - echo 'Downloading the latest version of vim-plug' - redraw - let tmp = tempname() - let new = tmp . '/plug.vim' - - try - let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp)) - if v:shell_error - return s:err('Error upgrading vim-plug: '. out) - endif - - if readfile(s:me) ==# readfile(new) - echo 'vim-plug is already up-to-date' - return 0 - else - call rename(s:me, s:me . '.old') - call rename(new, s:me) - unlet g:loaded_plug - echo 'vim-plug has been upgraded' - return 1 - endif - finally - silent! call s:rm_rf(tmp) - endtry -endfunction - -function! s:upgrade_specs() - for spec in values(g:plugs) - let spec.frozen = get(spec, 'frozen', 0) - endfor -endfunction - -function! s:status() - call s:prepare() - call append(0, 'Checking plugins') - call append(1, '') - - let ecnt = 0 - let unloaded = 0 - let [cnt, total] = [0, len(g:plugs)] - for [name, spec] in items(g:plugs) - if has_key(spec, 'uri') - if isdirectory(spec.dir) - let [valid, msg] = s:git_valid(spec, 1) - else - let [valid, msg] = [0, 'Not found. Try PlugInstall.'] - endif - else - if isdirectory(spec.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 valid && 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 - return 0 -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('.'), '\(^ \)\@<=[0-9a-z]\{7}') - 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 - - execute 'pedit' sha - wincmd P - setlocal filetype=git buftype=nofile nobuflisted modifiable - execute 'silent read !cd' s:shellesc(g:plugs[name].dir) '&& git show --pretty=medium' sha - normal! gg"_dd - setlocal nomodifiable - nnoremap q :q - wincmd p -endfunction - -function! s:section(flags) - call search('\(^[x-] \)\@<=[^:]\+:', a:flags) -endfunction - -function! s:diff() - call s:prepare() - call append(0, 'Collecting updated changes ...') - normal! gg - redraw - - let cnt = 0 - for [k, v] in items(g:plugs) - if !isdirectory(v.dir) || !s:is_managed(k) - continue - endif - - let diff = s:system_chomp('git log --pretty=format:"%h %s (%cr)" "HEAD...HEAD@{1}"', v.dir) - if !empty(diff) - call append(1, '') - call append(2, '- '.k.':') - call append(3, map(s:lines(diff), '" ". v:val')) - let cnt += 1 - normal! gg - redraw - endif - endfor - - call setline(1, cnt == 0 ? 'No updates.' : 'Last update:') - nnoremap :silent! call preview_commit() - nnoremap o :silent! call preview_commit() - nnoremap X :call revert() - normal! gg - setlocal nomodifiable - if cnt > 0 - echo "Press 'X' on each block to revert the update" - endif -endfunction - -function! s:revert() - 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(...) abort - let home = get(s:, 'plug_home_org', g:plug_home) - let [type, var, header] = s:is_win ? - \ ['dosbatch', '%PLUG_HOME%', - \ ['@echo off', ':: Generated by vim-plug', ':: '.strftime("%c"), '', - \ ':: Make sure to PlugUpdate first', '', 'set PLUG_HOME='.home]] : - \ ['sh', '$PLUG_HOME', - \ ['#!/bin/sh', '# Generated by vim-plug', '# '.strftime("%c"), '', - \ 'vim +PlugUpdate +qa', '', 'PLUG_HOME='.s:esc(home)]] - - call s:prepare() - execute 'setf' type - call append(0, header) - call append('$', '') - 1 - redraw - - let dirs = sort(map(values(filter(copy(g:plugs), - \'has_key(v:val, "uri") && isdirectory(v:val.dir)')), 'v:val.dir')) - let anchor = line('$') - 1 - for dir in reverse(dirs) - let sha = s:system_chomp('git rev-parse --short HEAD', dir) - if !empty(sha) - call append(anchor, printf('cd %s && git reset --hard %s', - \ substitute(dir, '^\V'.escape(g:plug_home, '\'), var, ''), sha)) - redraw - endif - endfor - - if a:0 > 0 - let fn = expand(a:1) - let fne = s:esc(fn) - call writefile(getline(1, '$'), fn) - if !s:is_win | call s:system('chmod +x ' . fne) | endif - echo 'Saved to '.a:1 - silent execute 'e' fne - endif -endfunction - -function! s:split_rtp() - return split(&rtp, '\\\@. - - ${3} -snippet LGPL2 - ${1:One line to give the program's name and a brief description.} - Copyright (C) `strftime("%Y")` ${2:copyright holder} - - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, see . - - ${3} -snippet GPL3 - ${1:one line to give the program's name and a brief description.} - Copyright (C) `strftime("%Y")` ${2:copyright holder} - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - ${3} -snippet LGPL3 - ${1:One line to give the program's name and a brief description.} - Copyright (C) `strftime("%Y")` ${2:copyright holder} - - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this library; if not, see . - - ${3} -snippet BSD2 - ${1:one line to give the program's name and a brief description} - Copyright (C) `strftime("%Y")` ${2:copyright holder} - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL $2 BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - The views and conclusions contained in the software and documentation - are those of the authors and should not be interpreted as representing - official policies, either expressedor implied, of $2. - - ${4} -snippet BSD3 - ${1:one line to give the program's name and a brief description} - Copyright (C) `strftime("%Y")` ${2:copyright holder} - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the ${3:organization} nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL $2 BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ${4} -snippet BSD4 - ${1:one line to give the program's name and a brief description} - Copyright (C) `strftime("%Y")` ${2:copyright holder} - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by the ${3:organization}. - 4. Neither the name of the $3 nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY $2 ''AS IS'' AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL $2 BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - ${4} -snippet MIT - ${1:one line to give the program's name and a brief description} - Copyright (C) `strftime("%Y")` ${2:copyright holder} - - 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. - - ${3} -snippet APACHE - ${1:one line to give the program's name and a brief description} - Copyright `strftime("%Y")` ${2:copyright holder} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - ${3} -snippet BEERWARE - ${2:one line to give the program's name and a brief description} - Copyright `strftime("%Y")` ${3:copyright holder} - - Licensed under the "THE BEER-WARE LICENSE" (Revision 42): - ${1:`g:snips_author`} wrote this file. As long as you retain this notice you - can do whatever you want with this stuff. If we meet some day, and you think - this stuff is worth it, you can buy me a beer or coffee in return - - ${4} - -snippet WTFPL - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - Version 2, December 2004 - - Copyright `strftime("%Y")` ${1:copyright holder} - - Everyone is permitted to copy and distribute verbatim or modified - copies of this license document, and changing it is allowed as long - as the name is changed. - - DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/vim/vim.symlink/snippets/gitcommit.snippets b/vim/vim.symlink/snippets/gitcommit.snippets deleted file mode 100644 index 30aca1b..0000000 --- a/vim/vim.symlink/snippets/gitcommit.snippets +++ /dev/null @@ -1,6 +0,0 @@ -# skip jshint checking on push -snippet jsh - !skip_jshint -# add ticket number to commit -snippet ref - refs:#${1} diff --git a/vim/vim.symlink/snippets/html.snippets b/vim/vim.symlink/snippets/html.snippets deleted file mode 100644 index 8e1b0ef..0000000 --- a/vim/vim.symlink/snippets/html.snippets +++ /dev/null @@ -1,51 +0,0 @@ -snippet attach - data-dojo-attach-point="${1}" -snippet type - data-dojo-type="${1}" -snippet dtestcase - - - - - - - - -
- - - - - -snippet dsupport - - - - - - - - - - - -snippet viewport - -snippet dojocdn - -snippet clarocdn - diff --git a/vim/vim.symlink/snippets/javascript.snippets b/vim/vim.symlink/snippets/javascript.snippets deleted file mode 100644 index 24c03d7..0000000 --- a/vim/vim.symlink/snippets/javascript.snippets +++ /dev/null @@ -1,82 +0,0 @@ -# dojo/AMD snippets -snippet def - define([ - ${1} - ], function (${2}) { - }); -snippet dec - declare(${1}, { - }); -snippet req - require([ - ${1} - ], function (${2}) { - }); -snippet inh - this.inherited(arguments); -# basic snippets -snippet : - ${1:key}: ${2:value} -snippet :f - ${1:method_name}: function (${2:args}) { - } -snippet fn - function () { - } -snippet fun - function ${1:name}(${2:args}) { - } -snippet iife - (function () { - ${1} - })(); -snippet interval - setInterval(function () { - ${2} - }, ${1}); -snippet timeout - setTimeout(function () { - ${2} - }, ${1}); -# log snippets -snippet log - console.log(${1}); -snippet lred - console.log('%c${1}', 'font-weight:bold;color:red;'); -snippet lgreen - console.log('%c${1}', 'font-weight:bold;color:green;'); -snippet lblue - console.log('%c${1}', 'font-weight:bold;color:blue;'); -snippet lpurple - console.log('%c${1}', 'font-weight:bold;color:purple;'); -snippet lor - console.log('%c${1}', 'font-weight:bold;color:orange;'); -snippet ctab - console.table(${1}); -snippet debug - console.log('[DEBUG] ${1}'); -snippet trace - console.trace(); -snippet des - describe('${1}', function () { - }); -snippet it - it('${1}', function () { - }); -# dojo snippets -snippet widget - define([ - 'dojo/_base/declare', - 'dijit/_WidgetBase', - 'dijit/_TemplatedMixin', - 'dijit/_WidgetsInTemplateMixin', - 'dojo/text!./templates/${1}.html' - ], function (declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, template) { - return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], { - templateString: template - }); - }); -snippet doc - /** - * ${1} - */ diff --git a/vim/vim.symlink/snippets/markdown.snippets b/vim/vim.symlink/snippets/markdown.snippets deleted file mode 100644 index 7189f58..0000000 --- a/vim/vim.symlink/snippets/markdown.snippets +++ /dev/null @@ -1,3 +0,0 @@ -snippet code - \`\`\`${1} - \`\`\` diff --git a/vim/vim.symlink/snippets/textile.snippets b/vim/vim.symlink/snippets/textile.snippets deleted file mode 100644 index 194f01e..0000000 --- a/vim/vim.symlink/snippets/textile.snippets +++ /dev/null @@ -1,4 +0,0 @@ -snippet code - 

-	${2}
-
diff --git a/vim/vim.symlink/snippets/typescript.snippets b/vim/vim.symlink/snippets/typescript.snippets deleted file mode 100644 index 6af6dd3..0000000 --- a/vim/vim.symlink/snippets/typescript.snippets +++ /dev/null @@ -1,90 +0,0 @@ -snippet ref - /// -snippet des - describe('${1}', () => { - }); -snippet it - it('${1}', () => { - }); -# dojo/AMD snippets -snippet def - define([ - ${1} - ], function (${2}) { - }); -snippet dec - declare(${1}, { - }); -snippet req - require([ - ${1} - ], function (${2}) { - }); -snippet inh - this.inherited(arguments); -# basic snippets -snippet : - ${1:key}: ${2:value} -snippet :f - ${1:method_name}: function (${2:args}) { - } -snippet fn - function () { - } -snippet fun - function ${1:name}(${2:args}) { - } -snippet iife - (function () { - ${1} - })(); -snippet interval - setInterval(function () { - ${2} - }, ${1}); -snippet timeout - setTimeout(function () { - ${2} - }, ${1}); -# log snippets -snippet log - console.log(${1}); -snippet lred - console.log('%c${1}', 'font-weight:bold;color:red;'); -snippet lgreen - console.log('%c${1}', 'font-weight:bold;color:green;'); -snippet lblue - console.log('%c${1}', 'font-weight:bold;color:blue;'); -snippet lpurple - console.log('%c${1}', 'font-weight:bold;color:purple;'); -snippet lor - console.log('%c${1}', 'font-weight:bold;color:orange;'); -snippet ctab - console.table(${1}); -snippet debug - console.log('[DEBUG] ${1}'); -snippet trace - console.trace(); -snippet des - describe('${1}', function () { - }); -snippet it - it('${1}', function () { - }); -# dojo snippets -snippet widget - define([ - 'dojo/_base/declare', - 'dijit/_WidgetBase', - 'dijit/_TemplatedMixin', - 'dijit/_WidgetsInTemplateMixin', - 'dojo/text!./templates/${1}.html' - ], function (declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, template) { - return declare([_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], { - templateString: template - }); - }); -snippet doc - /** - * ${1} - */ diff --git a/vim/vim.symlink/snippets/vim.snippets b/vim/vim.symlink/snippets/vim.snippets deleted file mode 100644 index aef61c1..0000000 --- a/vim/vim.symlink/snippets/vim.snippets +++ /dev/null @@ -1,2 +0,0 @@ -snippet bun - Bundle '${1}' diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink deleted file mode 100644 index fbcd771..0000000 --- a/vim/vimrc.symlink +++ /dev/null @@ -1,468 +0,0 @@ -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => General -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -" load plugins from vundle -source ~/.vim/plugins.vim - -" Abbreviations -abbr funciton function -abbr teh the -abbr tempalte template -abbr fitler filter - -set nocompatible " not compatible with vi -set autoread " detect when a file is changed - -" make backspace behave in a sane manner -set backspace=indent,eol,start - -" set a map leader for more key combos -let mapleader = ',' -let g:mapleader = ',' - -set history=1000 " change history to 1000 -set textwidth=120 - -" Tab control -set noexpandtab " insert tabs rather than spaces for -set smarttab " tab respects 'tabstop', 'shiftwidth', and 'softtabstop' -set tabstop=4 " the visible width of tabs -set softtabstop=4 " edit as if the tabs are 4 characters wide -set shiftwidth=4 " number of spaces to use for indent and unindent -set shiftround " round indent to a multiple of 'shiftwidth' -set completeopt+=longest - -if has('mouse') - set mouse=a - set ttymouse=xterm2 -endif - -set clipboard=unnamed - -" faster redrawing -set ttyfast - -" highlight conflicts -match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' - -" file type specific settings -if has('autocmd') && !exists('autocommands_loaded') - let autocommands_loaded = 1 - autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab - autocmd FileType make setlocal ts=8 sts=8 sw=8 noexpandtab - autocmd FileType ruby setlocal ts=2 sts=2 sw=2 expandtab - autocmd FileType html setlocal ts=4 sts=4 sw=4 noexpandtab indentkeys-=* - autocmd FileType jade setlocal ts=2 sts=2 sw=2 noexpandtab - autocmd FileType *.md.js :call SyntasticReset - autocmd FileType markdown,textile setlocal textwidth=0 wrapmargin=0 wrap spell - autocmd FileType .xml exe ":silent %!xmllint --format --recover - 2>/dev/null" - autocmd FileType crontab setlocal nobackup nowritebackup - "autocmd WinEnter * setlocal cursorline - "autocmd WinLeave * setlocal nocursorline - - " automatically resize panes on resize - autocmd VimResized * exe 'normal! \=' - autocmd BufWritePost .vimrc source % - autocmd BufWritePost .vimrc.local source % - " save all files on focus lost, ignoring warnings about untitled buffers - autocmd FocusLost * silent! wa - - autocmd BufNewFile,BufRead *.ejs set filetype=html - autocmd BufNewFile,BufRead *.ino set filetype=c - autocmd BufNewFile,BufRead *.svg set filetype=xml - - " make quickfix windows take all the lower section of the screen when there - " are multiple windows open - autocmd FileType qf wincmd J - - autocmd BufNewFile,BufReadPost *.md set filetype=markdown - let g:markdown_fenced_languages = ['css', 'javascript', 'js=javascript', 'json=javascript', 'stylus', 'html'] - - " autocmd! BufEnter * call ApplyLocalSettings(expand(':p:h')) -endif - -" code folding settings -set foldmethod=syntax " fold based on indent -set foldnestmax=10 " deepest fold is 10 levels -set nofoldenable " don't fold by default -set foldlevel=1 - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => User Interface -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -set so=7 " set 7 lines to the cursors - when moving vertical -set wildmenu " enhanced command line completion -set hidden " current buffer can be put into background -set showcmd " show incomplete commands -set noshowmode " don't show which mode disabled for PowerLine -set wildmode=list:longest " complete files like a shell -set scrolloff=3 " lines of text around cursor -set shell=$SHELL -set cmdheight=1 " command bar height - -set title " set terminal title - -" Searching -set ignorecase " case insensitive searching -set smartcase " case-sensitive if expresson contains a capital letter -set hlsearch -set incsearch " set incremental search, like modern browsers -set nolazyredraw " don't redraw while executing macros - -set magic " Set magic on, for regex - -set showmatch " show matching braces -set mat=2 " how many tenths of a second to blink - -" error bells -set noerrorbells -set visualbell -set t_vb= -set tm=500 - -" switch syntax highlighting on -syntax on - -set encoding=utf8 -let base16colorspace=256 " Access colors present in 256 colorspace" -set t_Co=256 " Explicitly tell vim that the terminal supports 256 colors" -execute "set background=".$BACKGROUND -execute "colorscheme ".$THEME - -" set number " show line numbers -" set relativenumber " show relative line numbers -set number " show the current line number" - -set wrap "turn on line wrapping -set wrapmargin=8 " wrap lines when coming within n characters from side -set linebreak " set soft wrapping -set showbreak=… " show ellipsis at breaking - -set autoindent " automatically set indent of new line -set smartindent - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Files, backups, and undo -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -"set nobackup -"set nowritebackup -"set noswapfile -set backupdir=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp -set directory=~/.vim-tmp,~/.tmp,~/tmp,/var/tmp,/tmp - - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => StatusLine -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -set laststatus=2 " show the satus line all the time - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Mappings -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" General mappings/shortcuts for functionality -" Additional, plugin-specific mappings are located under -" the plugins section - -" Close the current buffer -" noremap :q - -" remap esc -inoremap jk - -" markdown to html -nmap md :%!markdown --html4tags - -" remove extra whitespace -nmap :%s/\s\+$ - -" wipout buffer -nmap b :bw - -" shortcut to save -nmap , :w - -" disable Ex mode -noremap Q - -" set paste toggle -set pastetoggle= - -" toggle paste mode -map v :set paste! - -" edit ~/.vimrc -map ev :e! ~/.vimrc -" edit vim plugins -map evp :e! ~/.vim/plugins.vim -" edit vim functions -map evf :e! ~/.vim/functions.vim -" edit gitconfig -map eg :e! ~/.gitconfig - -" clear highlighted search -noremap :set hlsearch! hlsearch? - -" activate spell-checking alternatives -nmap ;s :set invspell spelllang=en - -" toggle invisible characters -set invlist -set listchars=tab:▸\ ,eol:¬,trail:⋅,extends:❯,precedes:❮ -highlight SpecialKey ctermbg=none " make the highlighting of tabs less annoying -set showbreak=↪ -nmap l :set list! - -" Textmate style indentation -vmap [ ] >gv -nmap [ << -nmap ] >> - -" switch between current and last buffer -nmap . - -" enable . command in visual mode -vnoremap . :normal . - -map :call WinMove('h') -map :call WinMove('j') -map :call WinMove('k') -map :call WinMove('l') - -map wc :wincmd q - -" toggle cursor line -nnoremap i :set cursorline! - -" scroll the viewport faster -nnoremap 3 -nnoremap 3 - -" moving up and down work as you would expect -nnoremap j gj -nnoremap k gk -nnoremap ^ g^ -nnoremap $ g$ - -" search for word under the cursor -nnoremap / "fyiw :/f - -" inoremap =Smart_TabComplete() - -map r :call RunCustomCommand() -" map s :call SetCustomCommand() -let g:silent_custom_command = 0 - -" helpers for dealing with other people's code -nmap \t :set ts=4 sts=4 sw=4 noet -nmap \s :set ts=4 sts=4 sw=4 et - -nmap w :setf textile :Goyo - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Functions -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -" Window movement shortcuts -" move to the window in the direction shown, or create a new window -function! WinMove(key) - let t:curwin = winnr() - exec "wincmd ".a:key - if (t:curwin == winnr()) - if (match(a:key,'[jk]')) - wincmd v - else - wincmd s - endif - exec "wincmd ".a:key - endif -endfunction - -" recursively search up from dirname, sourcing all .vimrc.local files along the way -function! ApplyLocalSettings(dirname) - " convert windows paths to unix style - let l:curDir = substitute(a:dirname, '\\', '/', 'g') - - " walk to the top of the dir tree - let l:parentDir = strpart(l:curDir, 0, strridx(l:curDir, '/')) - if isdirectory(l:parentDir) - call ApplyLocalSettings(l:parentDir) - endif - - " now walk back down the path and source .vimsettings as you find them. - " child directories can inherit from their parents - let l:settingsFile = a:dirname . '/.vimrc.local' - if filereadable(l:settingsFile) - exec ':source' . l:settingsFile - endif -endfunction - -" smart tab completion -function! Smart_TabComplete() - let line = getline('.') " current line - - let substr = strpart(line, -1, col('.')+1) " from the start of the current - " line to one character right - " of the cursor - let substr = matchstr(substr, '[^ \t]*$') " word till cursor - if (strlen(substr)==0) " nothing to match on empty string - return '\' - endif - let has_period = match(substr, '\.') != -1 " position of period, if any - let has_slash = match(substr, '\/') != -1 " position of slash, if any - if (!has_period && !has_slash) - return '\\' " existing text matching - elseif ( has_slash ) - return '\\' " file matching - else - return '\\' " plugin matching - endif -endfunction - -" execute a custom command -function! RunCustomCommand() - up - if g:silent_custom_command - execute 'silent !' . s:customcommand - else - execute '!' . s:customcommand - endif -endfunction - -function! SetCustomCommand() - let s:customcommand = input('Enter Custom Command$ ') -endfunction - -function! TrimWhiteSpace() - %s/\s\+$//e -endfunction - -function! HiInterestingWord(n) - " Save our location. - normal! mz - - " Yank the current word into the z register. - normal! "zyiw - - " Calculate an arbitrary match ID. Hopefully nothing else is using it. - let mid = 86750 + a:n - - " Clear existing matches, but don't worry if they don't exist. - silent! call matchdelete(mid) - - " Construct a literal pattern that has to match at boundaries. - let pat = '\V\<' . escape(@z, '\') . '\>' - - " Actually match the words. - call matchadd("InterestingWord" . a:n, pat, 1, mid) - - " Move back to our original location. - normal! `z -endfunction - -nnoremap 1 :call HiInterestingWord(1) -nnoremap 2 :call HiInterestingWord(2) -nnoremap 3 :call HiInterestingWord(3) -nnoremap 4 :call HiInterestingWord(4) -nnoremap 5 :call HiInterestingWord(5) -nnoremap 6 :call HiInterestingWord(6) - -hi def InterestingWord1 guifg=#000000 ctermfg=16 guibg=#ffa724 ctermbg=214 -hi def InterestingWord2 guifg=#000000 ctermfg=16 guibg=#aeee00 ctermbg=154 -hi def InterestingWord3 guifg=#000000 ctermfg=16 guibg=#8cffba ctermbg=121 -hi def InterestingWord4 guifg=#000000 ctermfg=16 guibg=#b88853 ctermbg=137 -hi def InterestingWord5 guifg=#000000 ctermfg=16 guibg=#ff9eb8 ctermbg=211 -hi def InterestingWord6 guifg=#000000 ctermfg=16 guibg=#ff2c4b ctermbg=195 - -function! HtmlUnEscape() - silent s/<//eg - silent s/&/\&/eg -endfunction - -nnoremap u :call HtmlUnEscape() - - -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" => Plugins -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -" close NERDTree after a file is opened -let g:NERDTreeQuitOnOpen=0 -" show hidden files in NERDTree -let NERDTreeShowHidden=1 -" remove some files by extension -let NERDTreeIgnore = ['\.js.map$'] -" Toggle NERDTree -nmap k :NERDTreeToggle -" expand to the path of the file in the current buffer -nmap y :NERDTreeFind - -" map fuzzyfinder (CtrlP) plugin -" nmap t :CtrlP -nmap r :CtrlPBuffer -let g:ctrlp_map='t' -let g:ctrlp_dotfiles=1 -let g:ctrlp_working_path_mode = 'ra' - -" Fugitive Shortcuts -nmap gs :Gstatus -nmap ge :Gedit -nmap gr :Gread -nmap gb :Gblame - -nmap m :MarkedOpen! -nmap mq :MarkedQuit - -" toggle syntastic -nmap s :SyntasticToggleMode - -" toggle Limelight -nmap f :Limelight!! - -" allow es5 mode when looking at TypeScript -let g:syntastic_typescript_tsc_args = '--module amd --target ES5 --noImplicitAny' -let g:syntastic_typescript_checkers = ['tslint'] -let g:syntastic_javascript_checkers = ['jshint', 'jscs'] -let g:syntastic_error_symbol='✗' -let g:syntastic_warning_symbol='⚠' - -" CtrlP ignore patterns -" let g:ctrlp_custom_ignore = { -" \ 'dir': '\.git$\|node_modules$\|bower_components$\|\.hg$\|\.svn$', -" \ 'file': '\.exe$\|\.so$' -" \ } -" only show files that are not ignored by git -let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] - -" search the nearest ancestor that contains .git, .hg, .svn -let g:ctrlp_working_path_mode = 2 - - -" airline options -let g:airline_powerline_fonts=1 -let g:airline_left_sep='' -let g:airline_right_sep='' -let g:airline_theme='base16' - -" don't hide quotes in json files -let g:vim_json_syntax_conceal = 0 - - -let g:SuperTabCrMapping = 0 - -if (has("gui_running")) - set guioptions=egmrt - set background=light - colorscheme solarized - let g:airline_left_sep='' - let g:airline_right_sep='' - let g:airline_powerline_fonts=0 - let g:airline_theme='solarized' -endif - -call ApplyLocalSettings(expand('.'))