diff options
| -rw-r--r-- | .gitmodules | 27 | ||||
| -rw-r--r-- | vim/.vim/autoload/pathogen.vim | 353 | ||||
| m--------- | vim/.vim/bundle/ctrlp.vim | 0 | ||||
| m--------- | vim/.vim/bundle/gruvbox | 0 | ||||
| m--------- | vim/.vim/bundle/nerdtree | 0 | ||||
| m--------- | vim/.vim/bundle/tabular | 0 | ||||
| m--------- | vim/.vim/bundle/tagbar | 0 | ||||
| m--------- | vim/.vim/bundle/vim-airline | 0 | ||||
| m--------- | vim/.vim/bundle/vim-airline-themes | 0 | ||||
| m--------- | vim/.vim/bundle/vim-fugitive | 0 | ||||
| m--------- | vim/.vim/bundle/vimwiki | 0 | ||||
| -rw-r--r-- | vim/.vimrc | 65 |
12 files changed, 0 insertions, 445 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 098555e..0000000 --- a/.gitmodules +++ /dev/null @@ -1,27 +0,0 @@ -[submodule "vim/.vim/bundle/ctrlp.vim"] - path = vim/.vim/bundle/ctrlp.vim - url = https://github.com/ctrlpvim/ctrlp.vim.git -[submodule "vim/.vim/bundle/vimwiki"] - path = vim/.vim/bundle/vimwiki - url = https://github.com/vimwiki/vimwiki.git -[submodule "vim/.vim/bundle/gruvbox"] - path = vim/.vim/bundle/gruvbox - url = https://github.com/morhetz/gruvbox.git -[submodule "vim/.vim/bundle/tabular"] - path = vim/.vim/bundle/tabular - url = git://github.com/godlygeek/tabular.git -[submodule "vim/.vim/bundle/vim-airline"] - path = vim/.vim/bundle/vim-airline - url = https://github.com/vim-airline/vim-airline -[submodule "vim/.vim/bundle/vim-airline-themes"] - path = vim/.vim/bundle/vim-airline-themes - url = https://github.com/vim-airline/vim-airline-themes -[submodule "vim/.vim/bundle/vim-fugitive"] - path = vim/.vim/bundle/vim-fugitive - url = git://github.com/tpope/vim-fugitive.git -[submodule "vim/.vim/bundle/nerdtree"] - path = vim/.vim/bundle/nerdtree - url = https://github.com/scrooloose/nerdtree.git -[submodule "vim/.vim/bundle/tagbar"] - path = vim/.vim/bundle/tagbar - url = https://github.com/majutsushi/tagbar.git diff --git a/vim/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim deleted file mode 100644 index 59a75c1..0000000 --- a/vim/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,353 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope <http://tpo.pe/> -" Version: 2.4 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke -" pathogen#surround(). Curly braces are expanded with pathogen#expand(): -" "bundle/{}" finds all subdirectories inside "bundle" inside all directories -" in the runtime path. -function! pathogen#infect(...) abort - for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}'] - if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]' - call pathogen#surround(path) - elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)' - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#surround(path . '/{}') - elseif path =~# '[{}*]' - call pathogen#interpose(path) - else - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#interpose(path . '/{}') - endif - endfor - call pathogen#cycle_filetype() - if pathogen#is_disabled($MYVIMRC) - return 'finish' - endif - return '' -endfunction - -" Split a path into a list. -function! pathogen#split(path) abort - if type(a:path) == type([]) | return a:path | endif - if empty(a:path) | return [] | endif - let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,') - return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")') -endfunction - -" Convert a list to a path. -function! pathogen#join(...) abort - if type(a:1) == type(1) && a:1 - let i = 1 - let space = ' ' - else - let i = 0 - let space = '' - endif - let path = "" - while i < a:0 - if type(a:000[i]) == type([]) - let list = a:000[i] - let j = 0 - while j < len(list) - let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g') - let path .= ',' . escaped - let j += 1 - endwhile - else - let path .= "," . a:000[i] - endif - let i += 1 - endwhile - return substitute(path,'^,','','') -endfunction - -" Convert a list to a path with escaped spaces for 'path', 'tag', etc. -function! pathogen#legacyjoin(...) abort - return call('pathogen#join',[1] + a:000) -endfunction - -" Turn filetype detection off and back on again if it was already enabled. -function! pathogen#cycle_filetype() abort - if exists('g:did_load_filetypes') - filetype off - filetype on - endif -endfunction - -" Check if a bundle is disabled. A bundle is considered disabled if its -" basename or full name is included in the list g:pathogen_blacklist or the -" comma delimited environment variable $VIMBLACKLIST. -function! pathogen#is_disabled(path) abort - if a:path =~# '\~$' - return 1 - endif - let sep = pathogen#slash() - let blacklist = - \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + - \ pathogen#split($VIMBLACKLIST) - if !empty(blacklist) - call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")') - endif - return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1 -endfunction - -" Prepend the given directory to the runtime path and append its corresponding -" after directory. Curly braces are expanded with pathogen#expand(). -function! pathogen#surround(path) abort - let sep = pathogen#slash() - let rtp = pathogen#split(&rtp) - let path = fnamemodify(a:path, ':s?[\\/]\=$??') - let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)') - let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])') - call filter(rtp, 'index(before + after, v:val) == -1') - let &rtp = pathogen#join(before, rtp, after) - return &rtp -endfunction - -" For each directory in the runtime path, add a second entry with the given -" argument appended. Curly braces are expanded with pathogen#expand(). -function! pathogen#interpose(name) abort - let sep = pathogen#slash() - let name = a:name - if has_key(s:done_bundles, name) - return "" - endif - let s:done_bundles[name] = 1 - let list = [] - for dir in pathogen#split(&rtp) - if dir =~# '\<after$' - let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir] - else - let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)') - endif - endfor - let &rtp = pathogen#join(pathogen#uniq(list)) - return 1 -endfunction - -let s:done_bundles = {} - -" Invoke :helptags on all non-$VIM doc directories in runtimepath. -function! pathogen#helptags() abort - let sep = pathogen#slash() - for glob in pathogen#split(&rtp) - for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep') - if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags')) - silent! execute 'helptags' pathogen#fnameescape(dir) - endif - endfor - endfor -endfunction - -command! -bar Helptags :call pathogen#helptags() - -" Execute the given command. This is basically a backdoor for --remote-expr. -function! pathogen#execute(...) abort - for command in a:000 - execute command - endfor - return '' -endfunction - -" Section: Unofficial - -function! pathogen#is_absolute(path) abort - return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]') -endfunction - -" Given a string, returns all possible permutations of comma delimited braced -" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields -" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard -" and globbed. Actual globs are preserved. -function! pathogen#expand(pattern, ...) abort - let after = a:0 ? a:1 : '' - if a:pattern =~# '{[^{}]\+}' - let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1) - let found = map(split(pat, ',', 1), 'pre.v:val.post') - let results = [] - for pattern in found - call extend(results, pathogen#expand(pattern)) - endfor - elseif a:pattern =~# '{}' - let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)') - let post = a:pattern[strlen(pat) : -1] - let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post') - else - let results = [a:pattern] - endif - let vf = pathogen#slash() . 'vimfiles' - call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""') - return filter(results, '!empty(v:val)') -endfunction - -" \ on Windows unless shellslash is set, / everywhere else. -function! pathogen#slash() abort - return !exists("+shellslash") || &shellslash ? '/' : '\' -endfunction - -function! pathogen#separator() abort - return pathogen#slash() -endfunction - -" Convenience wrapper around glob() which returns a list. -function! pathogen#glob(pattern) abort - let files = split(glob(a:pattern),"\n") - return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")') -endfunction - -" Like pathogen#glob(), only limit the results to directories. -function! pathogen#glob_directories(pattern) abort - return filter(pathogen#glob(a:pattern),'isdirectory(v:val)') -endfunction - -" Remove duplicates from a list. -function! pathogen#uniq(list) abort - let i = 0 - let seen = {} - while i < len(a:list) - if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i]) - call remove(a:list,i) - elseif a:list[i] ==# '' - let i += 1 - let empty = 1 - else - let seen[a:list[i]] = 1 - let i += 1 - endif - endwhile - return a:list -endfunction - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) abort - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction - -" Section: Deprecated - -function! s:warn(msg) abort - echohl WarningMsg - echomsg a:msg - echohl NONE -endfunction - -" Prepend all subdirectories of path to the rtp, and append all 'after' -" directories in those subdirectories. Deprecated. -function! pathogen#runtime_prepend_subdirectories(path) abort - call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')') - return pathogen#surround(a:path . pathogen#slash() . '{}') -endfunction - -function! pathogen#incubate(...) abort - let name = a:0 ? a:1 : 'bundle/{}' - call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')') - return pathogen#interpose(name) -endfunction - -" Deprecated alias for pathogen#interpose(). -function! pathogen#runtime_append_all_bundles(...) abort - if a:0 - call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')') - else - call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()') - endif - return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}') -endfunction - -if exists(':Vedit') - finish -endif - -let s:vopen_warning = 0 - -function! s:find(count,cmd,file,lcd) - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - endif - if !s:vopen_warning - let s:vopen_warning = 1 - let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE' - else - let warning = '' - endif - if a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) . warning - else - return a:cmd.' '.pathogen#fnameescape(file) . warning - endif -endfunction - -function! s:Findcomplete(A,L,P) - let sep = pathogen#slash() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(<count>,'edit<bang>',<q-args>,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(<count>,'edit<bang>',<q-args>,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(<count>,'edit<bang>',<q-args>,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(<count>,'split',<q-args>,<bang>1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(<count>,'vsplit',<q-args>,<bang>1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(<count>,'pedit',<q-args>,<bang>1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(<count>,'read',<q-args>,<bang>1) - -" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/vim/.vim/bundle/ctrlp.vim b/vim/.vim/bundle/ctrlp.vim deleted file mode 160000 -Subproject 2868678a987834563bbc384763135462c2423eb diff --git a/vim/.vim/bundle/gruvbox b/vim/.vim/bundle/gruvbox deleted file mode 160000 -Subproject 127c9d14d4bac1bac31e328b835a8919a255789 diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree deleted file mode 160000 -Subproject eee431dbd44111c858c6d33ffd366cae1f17f8b diff --git a/vim/.vim/bundle/tabular b/vim/.vim/bundle/tabular deleted file mode 160000 -Subproject 00e1e7fcdbc6d753e0bc8043e0d2546fa81bf36 diff --git a/vim/.vim/bundle/tagbar b/vim/.vim/bundle/tagbar deleted file mode 160000 -Subproject 51e6e3b66a43d4ea09ebe8b40004c7b54b4d586 diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline deleted file mode 160000 -Subproject e83ed2408878ddd3bedf07d563b3ec1139a8f5e diff --git a/vim/.vim/bundle/vim-airline-themes b/vim/.vim/bundle/vim-airline-themes deleted file mode 160000 -Subproject 2a97d9ee410d7b9980a7741fc6e705d53eea23c diff --git a/vim/.vim/bundle/vim-fugitive b/vim/.vim/bundle/vim-fugitive deleted file mode 160000 -Subproject b754bc2031f21a532c083dd0d072ba373bbe3a3 diff --git a/vim/.vim/bundle/vimwiki b/vim/.vim/bundle/vimwiki deleted file mode 160000 -Subproject bb75ec6debffca00318bcb4753f2143a7f94669 diff --git a/vim/.vimrc b/vim/.vimrc deleted file mode 100644 index 9b58a2e..0000000 --- a/vim/.vimrc +++ /dev/null @@ -1,65 +0,0 @@ -" in case there were any doubt about this being classic vi -set nocompatible - -" load bundles under ~/.vim/bundle/* -execute pathogen#infect() - -" utf8. always utf8. -set fileencoding=utf8 -set fileencodings=utf8 - -" these seem reasonable -filetype plugin on -set tabstop=4 -set softtabstop=4 -set shiftwidth=4 - -" display of whitespace characters -set showbreak=\ ↪ -set list listchars=tab:»\ ,space:∙,nbsp:•,extends:>,precedes:< - -" display list of options when performing tab completion -set wildmenu - -" color settings -set background=dark -let g:gruvbox_contrast_dark='hard' -let g:airline_theme='cool' -colorscheme gruvbox -syntax on - -" remove trailing whitespace when saving -function StripTrailingWhitespace() - if !&binary && &filetype != 'diff' - normal mz - normal Hmy - %s/\s\+$//e - normal 'yz<CR> - normal `z - endif -endfunction - -autocmd BufWritePre * :call StripTrailingWhitespace() - -" display absolute line number for current line, relative offsets for other lines -set number relativenumber - -" ===== BUNDLE CONFIGURATION ===== - -" ctrlp.vim: -let g:ctrlp_map='<c-p>' "display fuzzy buffer search on ^P - -" tabular: -" align equals on 'a=', comma on 'a,' -nnoremap a= :Tabularize /=<cr> -nnoremap a, :Tabularize /,/r0l1<cr> - -" airline -set laststatus=2 " display status line even with no splits -let g:netrw_dirhistmax=0 " without this, it likes to create ~/.vim/.netrwhist - -" nerdtree: -nnoremap <F9> :NERDTreeToggle<cr> - -" tagbar -nnoremap <F12> :TagbarToggle<cr> |