diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | autoload/pathogen.vim | 353 | ||||
| l--------- | basic.vim | 1 | ||||
| l--------- | basic.vim.txt | 1 | ||||
| -rwxr-xr-x | gen-setup.sh | 1 | ||||
| -rw-r--r-- | init.vim | 9 | ||||
| -rw-r--r-- | plugin/airline.vim (renamed from inc/airline.vim) | 0 | ||||
| -rw-r--r-- | plugin/basics.vim | 49 | ||||
| -rw-r--r-- | plugin/ctrlp.vim (renamed from inc/ctrlp.vim) | 0 | ||||
| -rw-r--r-- | plugin/filetype-options.vim (renamed from inc/filetype-options.vim) | 0 | ||||
| -rw-r--r-- | plugin/gundo.vim (renamed from inc/gundo.vim) | 0 | ||||
| -rw-r--r-- | plugin/rebinds.vim (renamed from inc/rebinds.vim) | 0 | ||||
| -rw-r--r-- | plugin/undo.vim (renamed from inc/undo.vim) | 0 | ||||
| -rwxr-xr-x | setup.sh | 57 |
14 files changed, 88 insertions, 384 deletions
@@ -1,3 +1,4 @@ /bundle /themes .netrwhist +/pack diff --git a/autoload/pathogen.vim b/autoload/pathogen.vim deleted file mode 100644 index 59a75c1..0000000 --- a/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/basic.vim b/basic.vim deleted file mode 120000 index c530766..0000000 --- a/basic.vim +++ /dev/null @@ -1 +0,0 @@ -inc/basics.vim
\ No newline at end of file diff --git a/basic.vim.txt b/basic.vim.txt deleted file mode 120000 index c530766..0000000 --- a/basic.vim.txt +++ /dev/null @@ -1 +0,0 @@ -inc/basics.vim
\ No newline at end of file diff --git a/gen-setup.sh b/gen-setup.sh index e8d9cdf..23eec5b 100755 --- a/gen-setup.sh +++ b/gen-setup.sh @@ -40,6 +40,7 @@ clone() { git clone --depth=1 "$URL" . fi cd $WD + printf "\033[0m" }' > setup.sh for _repo in $REPOS; do @@ -1,12 +1,3 @@ -execute pathogen#infect('bundle/{}', 'themes/{}') - -source ~/.vim/inc/basics.vim -source ~/.vim/inc/rebinds.vim -source ~/.vim/inc/undo.vim -source ~/.vim/inc/filetype-options.vim -source ~/.vim/inc/airline.vim -source ~/.vim/inc/ctrlp.vim -source ~/.vim/inc/gundo.vim " Omni completion filetype plugin on diff --git a/inc/airline.vim b/plugin/airline.vim index 4486d50..4486d50 100644 --- a/inc/airline.vim +++ b/plugin/airline.vim diff --git a/plugin/basics.vim b/plugin/basics.vim new file mode 100644 index 0000000..1ac112a --- /dev/null +++ b/plugin/basics.vim @@ -0,0 +1,49 @@ +" Basic vimrc for systems you don't want to copy the full one to +set encoding=utf-8 " The encoding displayed. +set fileencoding=utf-8 " The encoding written to file. +set background=dark " Since most terminals I have dark backgrounds +set nu " Line 'nu'mbers +set listchars=tab:▸\ ,eol:¬,trail:• " Listchars are used to show normally + " invisible chars such as tabs, EOL and + " trailing whitespace +" set listchars=tab:\|\ " Alternative listchars w/o special chars. +set colorcolumn=80 " Sets a "coloured" coloumn to tell you where your line + " breaks should be so you don't piss off people using + " a terminal. +set ic " Case insensitive search by default +set hls " Highlight my searches by default +set updatecount=0 " Do not write swap files +set nocompatible " Don't be compatbile with 'vi' +set tabstop=4 " Tab width +set shiftwidth=4 +set noexpandtab " Do **NOT** turn tabs into spaces by default +" Be smart about the mouse +set mouse+=a +if &term =~ '^screen' + " tmux knows the extended mouse mode + set ttymouse=xterm2 +endif +syntax on " Syntax highlighting by default + + +set nomodeline " I know how to setup my editor, I don't need your + " changes to my vim configuration. + +" Use \-n in normal mode to toggle line numbers +nmap <leader>n :set invnu<CR> +" Use \-l in normal mode to toggle listchars +nmap <leader>l :set list!<CR> + +" Use \-s to pop open a spelling menu. use ]s to search forwards and [s to go +" backwards. +" Apparently this also doesn't work if spell checking isn't enabled +" at the time you enable it. +set spell +nnoremap \s ea<C-X><C-S> +set nospell + +" set hidden " This will allow you to change buffers w/o saving + +" Omni completion, c-x c-o in insert/append mode +" filetype plugin on +" set omnifunc=syntaxcomplete#Complete diff --git a/inc/ctrlp.vim b/plugin/ctrlp.vim index 515a5d2..515a5d2 100644 --- a/inc/ctrlp.vim +++ b/plugin/ctrlp.vim diff --git a/inc/filetype-options.vim b/plugin/filetype-options.vim index f0cbb37..f0cbb37 100644 --- a/inc/filetype-options.vim +++ b/plugin/filetype-options.vim diff --git a/inc/gundo.vim b/plugin/gundo.vim index bdcb82a..bdcb82a 100644 --- a/inc/gundo.vim +++ b/plugin/gundo.vim diff --git a/inc/rebinds.vim b/plugin/rebinds.vim index cacef62..cacef62 100644 --- a/inc/rebinds.vim +++ b/plugin/rebinds.vim diff --git a/inc/undo.vim b/plugin/undo.vim index 78c7e48..78c7e48 100644 --- a/inc/undo.vim +++ b/plugin/undo.vim @@ -3,47 +3,64 @@ WD="$(pwd)" clone() { - printf "\033[0mWorking dir: \033[1;34m%s\033[0;33m\n" $DIR + printf "[0mWorking dir: [1;34m%s[0;33m +" $DIR if [ -d "$DIR" ] ; then cd $DIR git pull --ff-only origin master elif ! [ -d "$DIR" ] ; then mkdir -p "$DIR" cd "$DIR" - git clone "$URL" . + git clone --depth=1 "$URL" . fi cd $WD + printf "[0m" } -DIR="bundle/ag.vim" +DIR="pack/plugins/start/vim-go" +URL="https://github.com/fatih/vim-go.git" +clone +DIR="pack/plugins/start/ag.vim" URL="https://github.com/rking/ag.vim.git" clone -DIR="bundle/ctrlp.vim" +DIR="pack/plugins/start/ctrlp.vim" URL="https://github.com/ctrlpvim/ctrlp.vim" clone -DIR="bundle/emmet-vim" +DIR="pack/plugins/start/emmet-vim" URL="https://github.com/mattn/emmet-vim.git" clone -DIR="bundle/l9" -URL="https://git.riedstra.us/vim/vim-l9.git" +DIR="pack/plugins/start/gundo" +URL="https://github.com/sjl/gundo.vim" clone -DIR="bundle/vim-airline-themes" -URL="https://github.com/vim-airline/vim-airline-themes/" +DIR="pack/plugins/start/nerdtree" +URL="https://github.com/scrooloose/nerdtree" clone -DIR="bundle/vim-airline" +DIR="pack/plugins/start/vim-airline" URL="https://github.com/vim-airline/vim-airline.git" clone -DIR="bundle/vim-autocomplpop" -URL="https://git.riedstra.us/vim/vim-autocomplpop.git" +DIR="pack/plugins/start/vim-airline-themes" +URL="https://github.com/vim-airline/vim-airline-themes/" clone -DIR="bundle/vim-go" -URL="https://github.com/fatih/vim-go.git" +DIR="pack/plugins/start/dracula" +URL="https://github.com/dracula/vim.git" clone -DIR="bundle/nerdtree" -URL="https://github.com/scrooloose/nerdtree" +DIR="pack/plugins/start/l9" +URL="git:~/vim/vim-l9.git" clone -DIR="bundle/gundo" -URL="https://github.com/sjl/gundo.vim" +DIR="pack/plugins/start/vim-autocomplpop" +URL="git:~/vim/vim-autocomplpop.git" +clone +DIR="pack/themes/start/mitch" +URL="git@rygel.us:~/vim/mitch.git" +clone +DIR="pack/themes/start/solarized" +URL="https://github.com/altercation/vim-colors-solarized" +clone +DIR="pack/themes/start/orbital" +URL="https://github.com/fcpg/vim-orbital" +clone +DIR="pack/themes/start/monotone" +URL="https://github.com/Lokaltog/vim-monotone" clone -DIR="themes/mitch" -URL="https://git.riedstra.us/vim/mitch.git" +DIR="pack/themes/start/gruvbox" +URL="https://github.com/morhetz/gruvbox" clone |