From 277c59392ac85a526a03ecaf79642101ebbaf9ef Mon Sep 17 00:00:00 2001 From: Alpha Chen Date: Sat, 22 Oct 2016 11:46:00 -0700 Subject: [PATCH] [vim] use vim8 packages instead of pathogen --- .gitmodules | 56 +-- .vim/autoload/pathogen.vim | 328 ----------------- .vim/colors/desert256.vim | 338 ------------------ .vim/indent/python.vim | 196 ---------- .vim/{bundle/go => pack/kejadlen/opt/vim-go} | 0 .../kejadlen/start}/argtextobj.vim | 0 .../start}/camelcasemotion/.VimballRecord | 0 .../autoload/camelcasemotion.vim | 0 .../camelcasemotion/doc/camelcasemotion.txt | 0 .../kejadlen/start}/camelcasemotion/doc/tags | 0 .../plugin/camelcasemotion.vim | 0 .vim/{bundle => pack/kejadlen/start}/ctrlp | 0 .vim/{bundle => pack/kejadlen/start}/gundo | 0 .../kejadlen/start}/incsearch.vim | 0 .vim/{bundle => pack/kejadlen/start}/rust.vim | 0 .vim/{bundle => pack/kejadlen/start}/swift | 0 .vim/{bundle => pack/kejadlen/start}/tabular | 0 .../kejadlen/start}/vim-coffee-script | 0 .../kejadlen/start}/vim-colors-solarized | 0 .../kejadlen/start}/vim-commentary | 0 .../kejadlen/start}/vim-dispatch | 0 .../kejadlen/start}/vim-endwise | 0 .../kejadlen/start}/vim-fugitive | 0 .../kejadlen/start}/vim-indent-object | 0 .../kejadlen/start}/vim-projectionist | 0 .vim/{bundle => pack/kejadlen/start}/vim-rake | 0 .../kejadlen/start}/vim-repeat | 0 .vim/{bundle => pack/kejadlen/start}/vim-rsi | 0 .vim/{bundle => pack/kejadlen/start}/vim-ruby | 0 .../kejadlen/start}/vim-sensible | 0 .../kejadlen/start}/vim-sleuth | 0 .../kejadlen/start}/vim-surround | 0 .../kejadlen/start}/vim-textobj-line | 0 .../kejadlen/start}/vim-textobj-rubyblock | 0 .../kejadlen/start}/vim-textobj-user | 0 .../kejadlen/start}/vim-tmux-navigator | 0 .../kejadlen/start}/vim-unimpaired | 0 .vim/{bundle => pack/kejadlen/start}/vinegar | 0 .vim/syntax/applescript.vim | 245 ------------- .vim/syntax/ragel.vim | 149 -------- .vim/syntax/textile.vim | 87 ----- .vimrc | 13 +- 42 files changed, 33 insertions(+), 1379 deletions(-) delete mode 100644 .vim/autoload/pathogen.vim delete mode 100644 .vim/colors/desert256.vim delete mode 100644 .vim/indent/python.vim rename .vim/{bundle/go => pack/kejadlen/opt/vim-go} (100%) rename .vim/{bundle => pack/kejadlen/start}/argtextobj.vim (100%) rename .vim/{bundle => pack/kejadlen/start}/camelcasemotion/.VimballRecord (100%) rename .vim/{bundle => pack/kejadlen/start}/camelcasemotion/autoload/camelcasemotion.vim (100%) rename .vim/{bundle => pack/kejadlen/start}/camelcasemotion/doc/camelcasemotion.txt (100%) rename .vim/{bundle => pack/kejadlen/start}/camelcasemotion/doc/tags (100%) rename .vim/{bundle => pack/kejadlen/start}/camelcasemotion/plugin/camelcasemotion.vim (100%) rename .vim/{bundle => pack/kejadlen/start}/ctrlp (100%) rename .vim/{bundle => pack/kejadlen/start}/gundo (100%) rename .vim/{bundle => pack/kejadlen/start}/incsearch.vim (100%) rename .vim/{bundle => pack/kejadlen/start}/rust.vim (100%) rename .vim/{bundle => pack/kejadlen/start}/swift (100%) rename .vim/{bundle => pack/kejadlen/start}/tabular (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-coffee-script (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-colors-solarized (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-commentary (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-dispatch (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-endwise (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-fugitive (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-indent-object (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-projectionist (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-rake (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-repeat (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-rsi (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-ruby (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-sensible (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-sleuth (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-surround (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-textobj-line (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-textobj-rubyblock (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-textobj-user (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-tmux-navigator (100%) rename .vim/{bundle => pack/kejadlen/start}/vim-unimpaired (100%) rename .vim/{bundle => pack/kejadlen/start}/vinegar (100%) delete mode 100644 .vim/syntax/applescript.vim delete mode 100644 .vim/syntax/ragel.vim delete mode 100644 .vim/syntax/textile.vim diff --git a/.gitmodules b/.gitmodules index 7a43e7b..1f2d739 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,53 +1,53 @@ [submodule ".vim/bundle/vim-textobj-user"] - path = .vim/bundle/vim-textobj-user + path = .vim/pack/kejadlen/start/vim-textobj-user url = git://github.com/kana/vim-textobj-user.git [submodule ".vim/bundle/vim-textobj-line"] - path = .vim/bundle/vim-textobj-line + path = .vim/pack/kejadlen/start/vim-textobj-line url = git://github.com/kana/vim-textobj-line.git [submodule ".vim/bundle/argtextobj.vim"] - path = .vim/bundle/argtextobj.vim + path = .vim/pack/kejadlen/start/argtextobj.vim url = git://github.com/vim-scripts/argtextobj.vim.git [submodule ".vim/bundle/vim-textobj-rubyblock"] - path = .vim/bundle/vim-textobj-rubyblock + path = .vim/pack/kejadlen/start/vim-textobj-rubyblock url = git://github.com/nelstrom/vim-textobj-rubyblock.git [submodule ".vim/bundle/vim-indent-object"] - path = .vim/bundle/vim-indent-object + path = .vim/pack/kejadlen/start/vim-indent-object url = git://github.com/michaeljsmith/vim-indent-object.git [submodule ".vim/bundle/vim-colors-solarized"] - path = .vim/bundle/vim-colors-solarized + path = .vim/pack/kejadlen/start/vim-colors-solarized url = git://github.com/altercation/vim-colors-solarized.git [submodule ".vim/bundle/vim-repeat"] - path = .vim/bundle/vim-repeat + path = .vim/pack/kejadlen/start/vim-repeat url = git://github.com/tpope/vim-repeat.git [submodule ".vim/bundle/vim-surround"] - path = .vim/bundle/vim-surround + path = .vim/pack/kejadlen/start/vim-surround url = git://github.com/tpope/vim-surround.git [submodule ".vim/bundle/tabular"] - path = .vim/bundle/tabular + path = .vim/pack/kejadlen/start/tabular url = git://github.com/godlygeek/tabular.git [submodule ".vim/bundle/vim-ruby"] - path = .vim/bundle/vim-ruby + path = .vim/pack/kejadlen/start/vim-ruby url = git://github.com/vim-ruby/vim-ruby.git [submodule ".vim/bundle/vim-coffee-script"] - path = .vim/bundle/vim-coffee-script + path = .vim/pack/kejadlen/start/vim-coffee-script url = git://github.com/kchmck/vim-coffee-script.git [submodule ".vim/bundle/gundo"] - path = .vim/bundle/gundo + path = .vim/pack/kejadlen/start/gundo url = git://github.com/sjl/gundo.vim.git [submodule ".vim/bundle/vim-dispatch"] - path = .vim/bundle/vim-dispatch + path = .vim/pack/kejadlen/start/vim-dispatch url = git://github.com/tpope/vim-dispatch.git [submodule ".vim/bundle/ctrlp"] - path = .vim/bundle/ctrlp + path = .vim/pack/kejadlen/start/ctrlp url = git://github.com/ctrlpvim/ctrlp.vim.git [submodule ".vim/bundle/vinegar"] - path = .vim/bundle/vinegar + path = .vim/pack/kejadlen/start/vinegar url = git://github.com/tpope/vim-vinegar.git [submodule ".vim/bundle/go"] - path = .vim/bundle/go + path = .vim/pack/kejadlen/opt/vim-go url = git://github.com/fatih/vim-go.git [submodule ".vim/bundle/vim-tmux-navigator"] - path = .vim/bundle/vim-tmux-navigator + path = .vim/pack/kejadlen/start/vim-tmux-navigator url = git://github.com/christoomey/vim-tmux-navigator.git [submodule "src/powerline"] path = src/powerline @@ -56,34 +56,34 @@ path = src/prezto url = git://github.com/kejadlen/prezto.git [submodule ".vim/bundle/vim-endwise"] - path = .vim/bundle/vim-endwise + path = .vim/pack/kejadlen/start/vim-endwise url = git://github.com/tpope/vim-endwise.git [submodule ".vim/bundle/vim-sleuth"] - path = .vim/bundle/vim-sleuth + path = .vim/pack/kejadlen/start/vim-sleuth url = git://github.com/tpope/vim-sleuth.git [submodule ".vim/bundle/vim-rsi"] - path = .vim/bundle/vim-rsi + path = .vim/pack/kejadlen/start/vim-rsi url = git://github.com/tpope/vim-rsi.git [submodule ".vim/bundle/vim-sensible"] - path = .vim/bundle/vim-sensible + path = .vim/pack/kejadlen/start/vim-sensible url = git://github.com/tpope/vim-sensible.git [submodule ".vim/bundle/vim-unimpaired"] - path = .vim/bundle/vim-unimpaired + path = .vim/pack/kejadlen/start/vim-unimpaired url = git://github.com/tpope/vim-unimpaired.git [submodule ".vim/bundle/incsearch.vim"] - path = .vim/bundle/incsearch.vim + path = .vim/pack/kejadlen/start/incsearch.vim url = git://github.com/haya14busa/incsearch.vim [submodule ".vim/bundle/vim-commentary"] - path = .vim/bundle/vim-commentary + path = .vim/pack/kejadlen/start/vim-commentary url = git://github.com/tpope/vim-commentary.git [submodule ".vim/bundle/rust.vim"] - path = .vim/bundle/rust.vim + path = .vim/pack/kejadlen/start/rust.vim url = git://github.com/rust-lang/rust.vim.git [submodule ".vim/bundle/vim-projectionist"] - path = .vim/bundle/vim-projectionist + path = .vim/pack/kejadlen/start/vim-projectionist url = git://github.com/tpope/vim-projectionist.git [submodule ".vim/bundle/vim-rake"] - path = .vim/bundle/vim-rake + path = .vim/pack/kejadlen/start/vim-rake url = git@github.com:tpope/vim-rake.git [submodule "Alfred.alfredpreferences/workflows/emoji.alfredworkflow"] path = Alfred.alfredpreferences/workflows/emoji.alfredworkflow @@ -104,5 +104,5 @@ path = src/swift url = git@github.com:apple/swift.git [submodule ".vim/bundle/vim-fugitive"] - path = .vim/bundle/vim-fugitive + path = .vim/pack/kejadlen/start/vim-fugitive url = git@github.com:tpope/vim-fugitive.git diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim deleted file mode 100644 index 16c21fe..0000000 --- a/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,328 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.2 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `call pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. For maximum ease of reading, -" :set foldmethod=marker - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -function! s:warn(msg) - if &verbose - echohl WarningMsg - echomsg a:msg - echohl NONE - endif -endfunction - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke -" pathogen#surround(). For backwards compatibility purposes, a full path that -" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories() -" instead. -function! pathogen#infect(...) abort " {{{1 - for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}'] - if path =~# '^[^\\/]\+$' - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#incubate(path . '/{}') - elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$' - call pathogen#incubate(path) - elseif path =~# '[\\/]\%({}\|\*\)$' - call pathogen#surround(path) - else - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#surround(path . '/{}') - endif - endfor - call pathogen#cycle_filetype() - return '' -endfunction " }}}1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags')) - helptags `=dir.'/doc'` - endif - endfor - endfor -endfunction " }}}1 - -command! -bar Helptags :call pathogen#helptags() - -" Execute the given command. This is basically a backdoor for --remote-expr. -function! pathogen#execute(...) abort " {{{1 - for command in a:000 - execute command - endfor - return '' -endfunction " }}}1 - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort "{{{1 - 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 " }}}1 - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) abort " {{{1 - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction " }}}1 - -if exists(':Vedit') - finish -endif - -let s:vopen_warning = 0 - -function! s:find(count,cmd,file,lcd) " {{{1 - 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 " }}}1 - -function! s:Findcomplete(A,L,P) " {{{1 - let sep = pathogen#separator() - 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 " }}}1 - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set et sw=2: diff --git a/.vim/colors/desert256.vim b/.vim/colors/desert256.vim deleted file mode 100644 index 7a97742..0000000 --- a/.vim/colors/desert256.vim +++ /dev/null @@ -1,338 +0,0 @@ -" Vim color file -" Maintainer: Henry So, Jr. - -" These are the colors of the "desert" theme by Hans Fugal with a few small -" modifications (namely that I lowered the intensity of the normal white and -" made the normal and nontext backgrounds black), modified to work with 88- -" and 256-color xterms. -" -" The original "desert" theme is available as part of the vim distribution or -" at http://hans.fugal.net/vim/colors/. -" -" The real feature of this color scheme, with a wink to the "inkpot" theme, is -" the programmatic approximation of the gui colors to the palettes of 88- and -" 256- color xterms. The functions that do this (folded away, for -" readability) are calibrated to the colors used for Thomas E. Dickey's xterm -" (version 200), which is available at http://dickey.his.com/xterm/xterm.html. -" -" I struggled with trying to parse the rgb.txt file to avoid the necessity of -" converting color names to #rrggbb form, but decided it was just not worth -" the effort. Maybe someone seeing this may decide otherwise... - -set background=dark -if version > 580 - " no guarantees for version 5.8 and below, but this makes it stop - " complaining - hi clear - if exists("syntax_on") - syntax reset - endif -endif -let g:colors_name="desert256" - -if has("gui_running") || &t_Co == 88 || &t_Co == 256 - " functions {{{ - " returns an approximate grey index for the given grey level - fun grey_number(x) - if &t_Co == 88 - if a:x < 23 - return 0 - elseif a:x < 69 - return 1 - elseif a:x < 103 - return 2 - elseif a:x < 127 - return 3 - elseif a:x < 150 - return 4 - elseif a:x < 173 - return 5 - elseif a:x < 196 - return 6 - elseif a:x < 219 - return 7 - elseif a:x < 243 - return 8 - else - return 9 - endif - else - if a:x < 14 - return 0 - else - let l:n = (a:x - 8) / 10 - let l:m = (a:x - 8) % 10 - if l:m < 5 - return l:n - else - return l:n + 1 - endif - endif - endif - endfun - - " returns the actual grey level represented by the grey index - fun grey_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 46 - elseif a:n == 2 - return 92 - elseif a:n == 3 - return 115 - elseif a:n == 4 - return 139 - elseif a:n == 5 - return 162 - elseif a:n == 6 - return 185 - elseif a:n == 7 - return 208 - elseif a:n == 8 - return 231 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 8 + (a:n * 10) - endif - endif - endfun - - " returns the palette index for the given grey index - fun grey_color(n) - if &t_Co == 88 - if a:n == 0 - return 16 - elseif a:n == 9 - return 79 - else - return 79 + a:n - endif - else - if a:n == 0 - return 16 - elseif a:n == 25 - return 231 - else - return 231 + a:n - endif - endif - endfun - - " returns an approximate color index for the given color level - fun rgb_number(x) - if &t_Co == 88 - if a:x < 69 - return 0 - elseif a:x < 172 - return 1 - elseif a:x < 230 - return 2 - else - return 3 - endif - else - if a:x < 75 - return 0 - else - let l:n = (a:x - 55) / 40 - let l:m = (a:x - 55) % 40 - if l:m < 20 - return l:n - else - return l:n + 1 - endif - endif - endif - endfun - - " returns the actual color level for the given color index - fun rgb_level(n) - if &t_Co == 88 - if a:n == 0 - return 0 - elseif a:n == 1 - return 139 - elseif a:n == 2 - return 205 - else - return 255 - endif - else - if a:n == 0 - return 0 - else - return 55 + (a:n * 40) - endif - endif - endfun - - " returns the palette index for the given R/G/B color indices - fun rgb_color(x, y, z) - if &t_Co == 88 - return 16 + (a:x * 16) + (a:y * 4) + a:z - else - return 16 + (a:x * 36) + (a:y * 6) + a:z - endif - endfun - - " returns the palette index to approximate the given R/G/B color levels - fun color(r, g, b) - " get the closest grey - let l:gx = grey_number(a:r) - let l:gy = grey_number(a:g) - let l:gz = grey_number(a:b) - - " get the closest color - let l:x = rgb_number(a:r) - let l:y = rgb_number(a:g) - let l:z = rgb_number(a:b) - - if l:gx == l:gy && l:gy == l:gz - " there are two possibilities - let l:dgr = grey_level(l:gx) - a:r - let l:dgg = grey_level(l:gy) - a:g - let l:dgb = grey_level(l:gz) - a:b - let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb) - let l:dr = rgb_level(l:gx) - a:r - let l:dg = rgb_level(l:gy) - a:g - let l:db = rgb_level(l:gz) - a:b - let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db) - if l:dgrey < l:drgb - " use the grey - return grey_color(l:gx) - else - " use the color - return rgb_color(l:x, l:y, l:z) - endif - else - " only one possibility - return rgb_color(l:x, l:y, l:z) - endif - endfun - - " returns the palette index to approximate the 'rrggbb' hex string - fun rgb(rgb) - let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0 - let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0 - let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0 - - return color(l:r, l:g, l:b) - endfun - - " sets the highlighting for the given group - fun X(group, fg, bg, attr) - if a:fg != "" - exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . rgb(a:fg) - endif - if a:bg != "" - exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . rgb(a:bg) - endif - if a:attr != "" - exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr - endif - endfun - " }}} - - call X("Normal", "cccccc", "000000", "") - - " highlight groups - call X("Cursor", "708090", "f0e68c", "") - "CursorIM - "Directory - "DiffAdd - "DiffChange - "DiffDelete - "DiffText - "ErrorMsg - call X("VertSplit", "c2bfa5", "7f7f7f", "reverse") - call X("Folded", "ffd700", "4d4d4d", "") - call X("FoldColumn", "d2b48c", "4d4d4d", "") - call X("IncSearch", "708090", "f0e68c", "") - "LineNr - call X("ModeMsg", "daa520", "", "") - call X("MoreMsg", "2e8b57", "", "") - call X("NonText", "addbe7", "000000", "bold") - call X("Question", "00ff7f", "", "") - call X("Search", "f5deb3", "cd853f", "") - call X("SpecialKey", "9acd32", "", "") - call X("StatusLine", "c2bfa5", "000000", "reverse") - call X("StatusLineNC", "c2bfa5", "7f7f7f", "reverse") - call X("Title", "cd5c5c", "", "") - call X("Visual", "6b8e23", "f0e68c", "reverse") - "VisualNOS - call X("WarningMsg", "fa8072", "", "") - "WildMenu - "Menu - "Scrollbar - "Tooltip - - " syntax highlighting groups - call X("Comment", "87ceeb", "", "") - call X("Constant", "ffa0a0", "", "") - call X("Identifier", "98fb98", "", "none") - call X("Statement", "f0e68c", "", "bold") - call X("PreProc", "cd5c5c", "", "") - call X("Type", "bdb76b", "", "bold") - call X("Special", "ffdead", "", "") - "Underlined - call X("Ignore", "666666", "", "") - "Error - call X("Todo", "ff4500", "eeee00", "") - - " delete functions {{{ - delf X - delf rgb - delf color - delf rgb_color - delf rgb_level - delf rgb_number - delf grey_color - delf grey_level - delf grey_number - " }}} -else - " color terminal definitions - hi SpecialKey ctermfg=darkgreen - hi NonText cterm=bold ctermfg=darkblue - hi Directory ctermfg=darkcyan - hi ErrorMsg cterm=bold ctermfg=7 ctermbg=1 - hi IncSearch cterm=NONE ctermfg=yellow ctermbg=green - hi Search cterm=NONE ctermfg=grey ctermbg=blue - hi MoreMsg ctermfg=darkgreen - hi ModeMsg cterm=NONE ctermfg=brown - hi LineNr ctermfg=3 - hi Question ctermfg=green - hi StatusLine cterm=bold,reverse - hi StatusLineNC cterm=reverse - hi VertSplit cterm=reverse - hi Title ctermfg=5 - hi Visual cterm=reverse - hi VisualNOS cterm=bold,underline - hi WarningMsg ctermfg=1 - hi WildMenu ctermfg=0 ctermbg=3 - hi Folded ctermfg=darkgrey ctermbg=NONE - hi FoldColumn ctermfg=darkgrey ctermbg=NONE - hi DiffAdd ctermbg=4 - hi DiffChange ctermbg=5 - hi DiffDelete cterm=bold ctermfg=4 ctermbg=6 - hi DiffText cterm=bold ctermbg=1 - hi Comment ctermfg=darkcyan - hi Constant ctermfg=brown - hi Special ctermfg=5 - hi Identifier ctermfg=6 - hi Statement ctermfg=3 - hi PreProc ctermfg=5 - hi Type ctermfg=2 - hi Underlined cterm=underline ctermfg=5 - hi Ignore ctermfg=darkgrey - hi Error cterm=bold ctermfg=7 ctermbg=1 -endif - -" vim: set fdl=0 fdm=marker: diff --git a/.vim/indent/python.vim b/.vim/indent/python.vim deleted file mode 100644 index 32c773c..0000000 --- a/.vim/indent/python.vim +++ /dev/null @@ -1,196 +0,0 @@ -" Python indent file -" Language: Python -" Maintainer: Eric Mc Sween -" Original Author: David Bustos -" Last Change: 2004 Jun 07 - -" Only load this indent file when no other was loaded. -if exists("b:did_indent") - finish -endif -let b:did_indent = 1 - -setlocal expandtab -setlocal nolisp -setlocal autoindent -setlocal indentexpr=GetPythonIndent(v:lnum) -setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except - -let s:maxoff = 50 - -" Find backwards the closest open parenthesis/bracket/brace. -function! s:SearchParensPair() - let line = line('.') - let col = col('.') - - " Skip strings and comments and don't look too far - let skip = "line('.') < " . (line - s:maxoff) . " ? dummy :" . - \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? ' . - \ '"string\\|comment"' - - " Search for parentheses - call cursor(line, col) - let parlnum = searchpair('(', '', ')', 'bW', skip) - let parcol = col('.') - - " Search for brackets - call cursor(line, col) - let par2lnum = searchpair('\[', '', '\]', 'bW', skip) - let par2col = col('.') - - " Search for braces - call cursor(line, col) - let par3lnum = searchpair('{', '', '}', 'bW', skip) - let par3col = col('.') - - " Get the closest match - if par2lnum > parlnum || (par2lnum == parlnum && par2col > parcol) - let parlnum = par2lnum - let parcol = par2col - endif - if par3lnum > parlnum || (par3lnum == parlnum && par3col > parcol) - let parlnum = par3lnum - let parcol = par3col - endif - - " Put the cursor on the match - if parlnum > 0 - call cursor(parlnum, parcol) - endif - return parlnum -endfunction - -" Find the start of a multi-line statement -function! s:StatementStart(lnum) - let lnum = a:lnum - while 1 - if getline(lnum - 1) =~ '\\$' - let lnum = lnum - 1 - else - call cursor(lnum, 1) - let maybe_lnum = s:SearchParensPair() - if maybe_lnum < 1 - return lnum - else - let lnum = maybe_lnum - endif - endif - endwhile -endfunction - -" Find the block starter that matches the current line -function! s:BlockStarter(lnum, block_start_re) - let lnum = a:lnum - let maxindent = 10000 " whatever - while lnum > 1 - let lnum = prevnonblank(lnum - 1) - if indent(lnum) < maxindent - if getline(lnum) =~ a:block_start_re - return lnum - else - let maxindent = indent(lnum) - " It's not worth going further if we reached the top level - if maxindent == 0 - return -1 - endif - endif - endif - endwhile - return -1 -endfunction - -function! GetPythonIndent(lnum) - - " First line has indent 0 - if a:lnum == 1 - return 0 - endif - - " If we can find an open parenthesis/bracket/brace, line up with it. - call cursor(a:lnum, 1) - let parlnum = s:SearchParensPair() - if parlnum > 0 - let parcol = col('.') - let closing_paren = match(getline(a:lnum), '^\s*[])}]') != -1 - if match(getline(parlnum), '[([{]\s*$', parcol - 1) != -1 - if closing_paren - return indent(parlnum) - else - return indent(parlnum) + &shiftwidth - endif - else - if closing_paren - return parcol - 1 - else - return parcol - endif - endif - endif - - " Examine this line - let thisline = getline(a:lnum) - let thisindent = indent(a:lnum) - - " If the line starts with 'elif' or 'else', line up with 'if' or 'elif' - if thisline =~ '^\s*\(elif\|else\)\>' - let bslnum = s:BlockStarter(a:lnum, '^\s*\(if\|elif\)\>') - if bslnum > 0 - return indent(bslnum) - else - return -1 - endif - endif - - " If the line starts with 'except' or 'finally', line up with 'try' - " or 'except' - if thisline =~ '^\s*\(except\|finally\)\>' - let bslnum = s:BlockStarter(a:lnum, '^\s*\(try\|except\)\>') - if bslnum > 0 - return indent(bslnum) - else - return -1 - endif - endif - - " Examine previous line - let plnum = a:lnum - 1 - let pline = getline(plnum) - let sslnum = s:StatementStart(plnum) - - " If the previous line is blank, keep the same indentation - if pline =~ '^\s*$' - return -1 - endif - - " If this line is explicitly joined, try to find an indentation that looks - " good. - if pline =~ '\\$' - let compound_statement = '^\s*\(if\|while\|for\s.*\sin\|except\)\s*' - let maybe_indent = matchend(getline(sslnum), compound_statement) - if maybe_indent != -1 - return maybe_indent - else - return indent(sslnum) + &sw * 2 - endif - endif - - " If the previous line ended with a colon, indent relative to - " statement start. - if pline =~ ':\s*$' - return indent(sslnum) + &sw - endif - - " If the previous line was a stop-execution statement or a pass - if getline(sslnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>' - " See if the user has already dedented - if indent(a:lnum) > indent(sslnum) - &sw - " If not, recommend one dedent - return indent(sslnum) - &sw - endif - " Otherwise, trust the user - return -1 - endif - - " In all other cases, line up with the start of the previous statement. - return indent(sslnum) -endfunction diff --git a/.vim/bundle/go b/.vim/pack/kejadlen/opt/vim-go similarity index 100% rename from .vim/bundle/go rename to .vim/pack/kejadlen/opt/vim-go diff --git a/.vim/bundle/argtextobj.vim b/.vim/pack/kejadlen/start/argtextobj.vim similarity index 100% rename from .vim/bundle/argtextobj.vim rename to .vim/pack/kejadlen/start/argtextobj.vim diff --git a/.vim/bundle/camelcasemotion/.VimballRecord b/.vim/pack/kejadlen/start/camelcasemotion/.VimballRecord similarity index 100% rename from .vim/bundle/camelcasemotion/.VimballRecord rename to .vim/pack/kejadlen/start/camelcasemotion/.VimballRecord diff --git a/.vim/bundle/camelcasemotion/autoload/camelcasemotion.vim b/.vim/pack/kejadlen/start/camelcasemotion/autoload/camelcasemotion.vim similarity index 100% rename from .vim/bundle/camelcasemotion/autoload/camelcasemotion.vim rename to .vim/pack/kejadlen/start/camelcasemotion/autoload/camelcasemotion.vim diff --git a/.vim/bundle/camelcasemotion/doc/camelcasemotion.txt b/.vim/pack/kejadlen/start/camelcasemotion/doc/camelcasemotion.txt similarity index 100% rename from .vim/bundle/camelcasemotion/doc/camelcasemotion.txt rename to .vim/pack/kejadlen/start/camelcasemotion/doc/camelcasemotion.txt diff --git a/.vim/bundle/camelcasemotion/doc/tags b/.vim/pack/kejadlen/start/camelcasemotion/doc/tags similarity index 100% rename from .vim/bundle/camelcasemotion/doc/tags rename to .vim/pack/kejadlen/start/camelcasemotion/doc/tags diff --git a/.vim/bundle/camelcasemotion/plugin/camelcasemotion.vim b/.vim/pack/kejadlen/start/camelcasemotion/plugin/camelcasemotion.vim similarity index 100% rename from .vim/bundle/camelcasemotion/plugin/camelcasemotion.vim rename to .vim/pack/kejadlen/start/camelcasemotion/plugin/camelcasemotion.vim diff --git a/.vim/bundle/ctrlp b/.vim/pack/kejadlen/start/ctrlp similarity index 100% rename from .vim/bundle/ctrlp rename to .vim/pack/kejadlen/start/ctrlp diff --git a/.vim/bundle/gundo b/.vim/pack/kejadlen/start/gundo similarity index 100% rename from .vim/bundle/gundo rename to .vim/pack/kejadlen/start/gundo diff --git a/.vim/bundle/incsearch.vim b/.vim/pack/kejadlen/start/incsearch.vim similarity index 100% rename from .vim/bundle/incsearch.vim rename to .vim/pack/kejadlen/start/incsearch.vim diff --git a/.vim/bundle/rust.vim b/.vim/pack/kejadlen/start/rust.vim similarity index 100% rename from .vim/bundle/rust.vim rename to .vim/pack/kejadlen/start/rust.vim diff --git a/.vim/bundle/swift b/.vim/pack/kejadlen/start/swift similarity index 100% rename from .vim/bundle/swift rename to .vim/pack/kejadlen/start/swift diff --git a/.vim/bundle/tabular b/.vim/pack/kejadlen/start/tabular similarity index 100% rename from .vim/bundle/tabular rename to .vim/pack/kejadlen/start/tabular diff --git a/.vim/bundle/vim-coffee-script b/.vim/pack/kejadlen/start/vim-coffee-script similarity index 100% rename from .vim/bundle/vim-coffee-script rename to .vim/pack/kejadlen/start/vim-coffee-script diff --git a/.vim/bundle/vim-colors-solarized b/.vim/pack/kejadlen/start/vim-colors-solarized similarity index 100% rename from .vim/bundle/vim-colors-solarized rename to .vim/pack/kejadlen/start/vim-colors-solarized diff --git a/.vim/bundle/vim-commentary b/.vim/pack/kejadlen/start/vim-commentary similarity index 100% rename from .vim/bundle/vim-commentary rename to .vim/pack/kejadlen/start/vim-commentary diff --git a/.vim/bundle/vim-dispatch b/.vim/pack/kejadlen/start/vim-dispatch similarity index 100% rename from .vim/bundle/vim-dispatch rename to .vim/pack/kejadlen/start/vim-dispatch diff --git a/.vim/bundle/vim-endwise b/.vim/pack/kejadlen/start/vim-endwise similarity index 100% rename from .vim/bundle/vim-endwise rename to .vim/pack/kejadlen/start/vim-endwise diff --git a/.vim/bundle/vim-fugitive b/.vim/pack/kejadlen/start/vim-fugitive similarity index 100% rename from .vim/bundle/vim-fugitive rename to .vim/pack/kejadlen/start/vim-fugitive diff --git a/.vim/bundle/vim-indent-object b/.vim/pack/kejadlen/start/vim-indent-object similarity index 100% rename from .vim/bundle/vim-indent-object rename to .vim/pack/kejadlen/start/vim-indent-object diff --git a/.vim/bundle/vim-projectionist b/.vim/pack/kejadlen/start/vim-projectionist similarity index 100% rename from .vim/bundle/vim-projectionist rename to .vim/pack/kejadlen/start/vim-projectionist diff --git a/.vim/bundle/vim-rake b/.vim/pack/kejadlen/start/vim-rake similarity index 100% rename from .vim/bundle/vim-rake rename to .vim/pack/kejadlen/start/vim-rake diff --git a/.vim/bundle/vim-repeat b/.vim/pack/kejadlen/start/vim-repeat similarity index 100% rename from .vim/bundle/vim-repeat rename to .vim/pack/kejadlen/start/vim-repeat diff --git a/.vim/bundle/vim-rsi b/.vim/pack/kejadlen/start/vim-rsi similarity index 100% rename from .vim/bundle/vim-rsi rename to .vim/pack/kejadlen/start/vim-rsi diff --git a/.vim/bundle/vim-ruby b/.vim/pack/kejadlen/start/vim-ruby similarity index 100% rename from .vim/bundle/vim-ruby rename to .vim/pack/kejadlen/start/vim-ruby diff --git a/.vim/bundle/vim-sensible b/.vim/pack/kejadlen/start/vim-sensible similarity index 100% rename from .vim/bundle/vim-sensible rename to .vim/pack/kejadlen/start/vim-sensible diff --git a/.vim/bundle/vim-sleuth b/.vim/pack/kejadlen/start/vim-sleuth similarity index 100% rename from .vim/bundle/vim-sleuth rename to .vim/pack/kejadlen/start/vim-sleuth diff --git a/.vim/bundle/vim-surround b/.vim/pack/kejadlen/start/vim-surround similarity index 100% rename from .vim/bundle/vim-surround rename to .vim/pack/kejadlen/start/vim-surround diff --git a/.vim/bundle/vim-textobj-line b/.vim/pack/kejadlen/start/vim-textobj-line similarity index 100% rename from .vim/bundle/vim-textobj-line rename to .vim/pack/kejadlen/start/vim-textobj-line diff --git a/.vim/bundle/vim-textobj-rubyblock b/.vim/pack/kejadlen/start/vim-textobj-rubyblock similarity index 100% rename from .vim/bundle/vim-textobj-rubyblock rename to .vim/pack/kejadlen/start/vim-textobj-rubyblock diff --git a/.vim/bundle/vim-textobj-user b/.vim/pack/kejadlen/start/vim-textobj-user similarity index 100% rename from .vim/bundle/vim-textobj-user rename to .vim/pack/kejadlen/start/vim-textobj-user diff --git a/.vim/bundle/vim-tmux-navigator b/.vim/pack/kejadlen/start/vim-tmux-navigator similarity index 100% rename from .vim/bundle/vim-tmux-navigator rename to .vim/pack/kejadlen/start/vim-tmux-navigator diff --git a/.vim/bundle/vim-unimpaired b/.vim/pack/kejadlen/start/vim-unimpaired similarity index 100% rename from .vim/bundle/vim-unimpaired rename to .vim/pack/kejadlen/start/vim-unimpaired diff --git a/.vim/bundle/vinegar b/.vim/pack/kejadlen/start/vinegar similarity index 100% rename from .vim/bundle/vinegar rename to .vim/pack/kejadlen/start/vinegar diff --git a/.vim/syntax/applescript.vim b/.vim/syntax/applescript.vim deleted file mode 100644 index 9661084..0000000 --- a/.vim/syntax/applescript.vim +++ /dev/null @@ -1,245 +0,0 @@ -" Vim syntax file -" Language: AppleScript -" Maintainer: Jim Eberle -" Last Change: Mar 18, 2010 -" URL: http://www.fastnlight.com/syntax/applescript.vim - -" Use :syn w/in a buffer to see language element breakdown - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" --- Statement --- -syn keyword scptStmt get set count copy run global local prop property -syn keyword scptStmt close put delete duplicate exists -syn keyword scptStmt launch open print quit make move reopen save -syn keyword scptStmt saving into -hi def link scptStmt Statement - -" --- Type --- -syn keyword scptType text string number integer real color date -hi def link scptType Type - -" --- Operator --- -syn keyword scptOp div mod not and or as -syn match scptOp "[-+*/^&]" -" MacRoman single char :- (divide) -exec 'syn match scptOp "'.nr2char(214).'"' -syn match scptOp "\<\(a \)\?\(ref\( to\)\?\|reference to\)\>" -hi def link scptOp Operator - -" Containment -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -syn match scptIN "\" -hi def link scptIN scptOp - -" Equals -syn match scptEQ "=" -syn match scptEQ "\" -syn match scptEQ "\" -syn match scptEQ "\" -syn match scptEQ "\" -syn match scptEQ "\" -hi def link scptEQ scptOp - -" Not Equals -syn match scptNE "\" -syn match scptNE "\" -syn match scptNE "\" -syn match scptNE "\" -syn match scptNE "\" -syn match scptNE "\" -hi def link scptNE scptOp -" MacRoman single char /= -exec 'syn match scptNE "'.nr2char(173).'"' - -" Less Than -syn match scptLT "<" -syn match scptLT "\" -syn match scptLT "\(is \)\?less than" -syn match scptLT "\" -syn match scptLT "\" -hi def link scptLT scptOp - -" Greater Than -syn match scptGT ">" -syn match scptGT "\" -syn match scptGT "\(is \)\?greater than" -syn match scptGT "\" -syn match scptGT "\" -hi def link scptGT scptOp - -" Less Than or Equals -syn match scptLE "<=" -syn match scptLE "\" -syn match scptLE "\" -syn match scptLE "\(is \)\?less than or equal\( to\)\?" -syn match scptLE "\" -syn match scptLE "\" -hi def link scptLE scptOp -" MacRoman single char <= -exec 'syn match scptLE "'.nr2char(178).'"' - -" Greater Than or Equals -syn match scptGE ">=" -syn match scptGE "\" -syn match scptGE "\" -syn match scptGE "\(is \)\?greater than or equal\( to\)\?" -syn match scptGE "\" -syn match scptGE "\" -hi def link scptGE scptOp -" MacRoman single char >= -exec 'syn match scptGE "'.nr2char(179).'"' - -" --- Constant String --- -syn region scptString start=+"+ skip=+\\\\\|\\"+ end=+"+ -hi def link scptString String - -" --- Constant Number --- -syn match scptNumber "\<-\?\d\+\>" -hi def link scptNumber Number - -" --- Constant Float --- -syn match scptFloat display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=" -syn match scptFloat display contained "\.\d\+\(e[-+]\=\d\+\)\=\>" -syn match scptFloat display contained "\d\+e[-+]\>" -hi def link scptFloat Float - -" --- Constant Boolean --- -syn keyword scptBoolean true false yes no ask -hi def link scptBoolean Boolean - -" --- Other Constants --- -syn keyword scptConst it me version pi result space tab anything -syn match scptConst "\" - -" Considering and Ignoring -syn match scptConst "\" -syn match scptConst "\" -syn match scptConst "\" -syn keyword scptConst case diacriticals expansion hyphens punctuation -hi def link scptConst Constant - -" Style -syn match scptStyle "\" -syn match scptStyle "\" -syn match scptStyle "\" -syn keyword scptStyle bold condensed expanded hidden italic outline plain -syn keyword scptStyle shadow strikethrough subscript superscript underline -hi def link scptStyle scptConst - -" Day -syn keyword scptDay Mon Tue Wed Thu Fri Sat Sun -syn keyword scptDay Monday Tuesday Wednesday Thursday Friday Saturday Sunday -syn keyword scptDay weekday -hi def link scptDay scptConst - -" Month -syn keyword scptMonth Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec -syn keyword scptMonth January February March -syn keyword scptMonth April May June -syn keyword scptMonth July August September -syn keyword scptMonth October November December -syn keyword scptMonth month -hi def link scptMonth scptConst - -" Time -syn keyword scptTime minutes hours days weeks -hi def link scptTime scptConstant - -" --- Conditional --- -syn keyword scptCond if then else -syn match scptCond "\" -hi def link scptCond Conditional - -" --- Repeat --- -syn keyword scptRepeat repeat with from to by continue -syn match scptRepeat "\" -syn match scptRepeat "\" -syn match scptRepeat "\" -syn match scptRepeat "\" -hi def link scptRepeat Repeat - -" --- Exception --- -syn keyword scptException try error -syn match scptException "\" -syn match scptException "\" -syn match scptException "\" -hi def link scptException Exception - -" --- Keyword --- -syn keyword scptKeyword end tell times exit -syn keyword scptKeyword application file alias activate -syn keyword scptKeyword script on return without given -syn keyword scptKeyword considering ignoring items delimiters -syn keyword scptKeyword some each every whose where id index item its -syn keyword scptKeyword first second third fourth fifth sixth seventh -syn keyword scptKeyword eighth ninth tenth container -syn match scptKeyword "\d\+\(st\|nd\|rd\|th\)" -syn keyword scptKeyword last front back middle named thru through -syn keyword scptKeyword before after in of the -syn match scptKeyword "\" -syn match scptKeyword "\" -syn match scptKeyword "\" -syn match scptKeyword "\" -syn match scptKeyword "\" -syn match scptKeyword "\" -syn match scptKeyword "\" -syn match scptKeyword "\" -syn match scptKeyword "\" -syn match scptKeyword "'s" -hi def link scptKeyword Keyword - -" US Units -syn keyword scptUnitUS quarts gallons ounces pounds inches feet yards miles -syn match scptUnitUS "\" -syn match scptUnitUS "\" -syn match scptUnitUS "\" -syn match scptUnitUS "\" -syn match scptUnitUS "\" -syn match scptUnitUS "\" -syn match scptUnitUS "\" -hi def link scptUnitUS scptKey - -" British Units -syn keyword scptUnitBT litres centimetres metres kilometres -syn match scptUnitBT "\" -syn match scptUnitBT "\" -syn match scptUnitBT "\" -syn match scptUnitBT "\" -hi def link scptUnitBT scptKey - -" Metric Units -syn keyword scptUnitMT liters centimeters meters kilometers grams kilograms -syn match scptUnitMT "\" -syn match scptUnitMT "\" -syn match scptUnitMT "\" -syn match scptUnitMT "\" -syn match scptUnitMT "\" -syn match scptUnitMT "\" -hi def link scptUnitMT scptKey - -" --- Comment --- -syn match scptComment "--.*" -syn match scptComment "#.*" -syn region scptComment start="(\*" end="\*)" -hi def link scptComment Comment - -" --- Todo --- -syn keyword scptTodo contained TODO FIXME XXX -hi def link scptTodo Todo - -let b:current_syntax = "applescript" - diff --git a/.vim/syntax/ragel.vim b/.vim/syntax/ragel.vim deleted file mode 100644 index fa77e43..0000000 --- a/.vim/syntax/ragel.vim +++ /dev/null @@ -1,149 +0,0 @@ -" Vim syntax file -" -" Language: Ragel -" Author: Adrian Thurston - -syntax clear - -" -" Outside code -" - -" Comments -syntax region ocComment start="\/\*" end="\*\/" -syntax match ocComment "\/\/.*$" - -" Anything preprocessor -syntax match ocPreproc "#\(.\|\\\n\)*$" -syntax region ocPreproc start="#" end="[^\\]$" - -" Strings -syntax match ocLiteral "'\(\\.\|[^'\\]\)*'" -syntax match ocLiteral "\"\(\\.\|[^\"\\]\)*\"" - -" C/C++ Keywords -syntax keyword ocType unsigned signed void char short int long float double bool -syntax keyword ocType inline static extern register const volatile auto -syntax keyword ocType union enum struct class typedef -syntax keyword ocType namespace template typename mutable -syntax keyword ocKeyword break continue default do else for -syntax keyword ocKeyword goto if return switch while -syntax keyword ocKeyword new delete this using friend public private protected sizeof -syntax keyword ocKeyword throw try catch operator typeid -syntax keyword ocKeyword and bitor xor compl bitand and_eq or_eq xor_eq not not_eq -syntax keyword ocKeyword static_cast dynamic_cast - -" Numbers -syntax match ocNumber "[0-9][0-9]*" -syntax match ocNumber "0x[0-9a-fA-F][0-9a-fA-F]*" - -" Booleans -syntax keyword ocBoolean true false - -" Identifiers -syntax match anyId "[a-zA-Z_][a-zA-Z_0-9]*" - -" Inline code only -syntax keyword fsmType fpc fc fcurs fbuf fblen ftargs fstack -syntax keyword fsmKeyword fhold fgoto fcall fret fentry fnext fexec fbreak - -syntax cluster rlItems contains=rlComment,rlLiteral,rlAugmentOps,rlOtherOps,rlKeywords,rlWrite,rlCodeCurly,rlCodeSemi,rlNumber,anyId,rlLabelColon,rlExprKeywords - -syntax region machineSpec1 matchgroup=beginRL start="%%{" end="}%%" contains=@rlItems -syntax region machineSpec2 matchgroup=beginRL start="%%[^{]"rs=e-1 end="$" keepend contains=@rlItems -syntax region machineSpec2 matchgroup=beginRL start="%%$" end="$" keepend contains=@rlItems - -" Comments -syntax match rlComment "#.*$" contained - -" Literals -syntax match rlLiteral "'\(\\.\|[^'\\]\)*'[i]*" contained -syntax match rlLiteral "\"\(\\.\|[^\"\\]\)*\"[i]*" contained -syntax match rlLiteral /\/\(\\.\|[^\/\\]\)*\/[i]*/ contained -syntax match rlLiteral "\[\(\\.\|[^\]\\]\)*\]" contained - -" Numbers -syntax match rlNumber "[0-9][0-9]*" contained -syntax match rlNumber "0x[0-9a-fA-F][0-9a-fA-F]*" contained - -" Operators -syntax match rlAugmentOps "[>$%@]" contained -syntax match rlAugmentOps "<>\|<" contained -syntax match rlAugmentOps "[>\<$%@][!\^/*~]" contained -syntax match rlAugmentOps "[>$%]?" contained -syntax match rlAugmentOps "<>[!\^/*~]" contained -syntax match rlAugmentOps "=>" contained -syntax match rlOtherOps "->" contained - -syntax match rlOtherOps ":>" contained -syntax match rlOtherOps ":>>" contained -syntax match rlOtherOps "<:" contained - -" Keywords -" FIXME: Enable the range keyword post 5.17. -" syntax keyword rlKeywords machine action context include range contained -syntax keyword rlKeywords machine action context include import export prepush postpop contained -syntax keyword rlExprKeywords when inwhen outwhen err lerr eof from to contained - -" Case Labels -syntax keyword caseLabelKeyword case contained -syntax cluster caseLabelItems contains=ocComment,ocPreproc,ocLiteral,ocType,ocKeyword,caseLabelKeyword,ocNumber,ocBoolean,anyId,fsmType,fsmKeyword -syntax match caseLabelColon "case" contains=@caseLabelItems -syntax match caseLabelColon "case[\t ]\+.*:$" contains=@caseLabelItems -syntax match caseLabelColon "case[\t ]\+.*:[^=:]"me=e-1 contains=@caseLabelItems - -" Labels -syntax match ocLabelColon "^[\t ]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:$" contains=anyLabel -syntax match ocLabelColon "^[\t ]*[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:[^=:]"me=e-1 contains=anyLabel - -syntax match rlLabelColon "[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:$" contained contains=anyLabel -syntax match rlLabelColon "[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:[^=:>]"me=e-1 contained contains=anyLabel -syntax match anyLabel "[a-zA-Z_][a-zA-Z_0-9]*" contained - -" All items that can go in a code block. - -syntax cluster inlineItems contains=rlCodeCurly,ocComment,ocPreproc,ocLiteral,ocType,ocKeyword,ocNumber,ocBoolean,ocLabelColon,anyId,fsmType,fsmKeyword,caseLabelColon - -" Blocks of code. rlCodeCurly is recursive. -syntax region rlCodeCurly matchgroup=NONE start="{" end="}" contained contains=@inlineItems -syntax region rlCodeSemi matchgroup=Type start="\" start="\" start="\" start="\" matchgroup=NONE end=";" contained contains=@inlineItems - -syntax region rlWrite matchgroup=Type start="\" matchgroup=NONE end="[;)]" contained contains=rlWriteKeywords,rlWriteOptions - -syntax keyword rlWriteKeywords init data exec exports start error first_final contained -syntax keyword rlWriteOptions noerror nofinal noprefix noend nocs contained - -" -" Sync at the start of machine specs. -" -" Match The ragel delimiters only if there quotes no ahead on the same line. -" On the open marker, use & to consume the leader. -syntax sync match ragelSyncPat grouphere NONE "^[^\'\"%]*%%{&^[^\'\"%]*" -syntax sync match ragelSyncPat grouphere NONE "^[^\'\"%]*%%[^{]&^[^\'\"%]*" -syntax sync match ragelSyncPat grouphere NONE "^[^\'\"]*}%%" - -" -" Specifying Groups -" -hi link ocComment Comment -hi link ocPreproc Macro -hi link ocLiteral String -hi link ocType Type -hi link ocKeyword Keyword -hi link ocNumber Number -hi link ocBoolean Boolean -hi link rlComment Comment -hi link rlNumber Number -hi link rlLiteral String -hi link rlAugmentOps Keyword -hi link rlExprKeywords Keyword -hi link rlWriteKeywords Keyword -hi link rlWriteOptions Keyword -hi link rlKeywords Type -hi link fsmType Type -hi link fsmKeyword Keyword -hi link anyLabel Label -hi link caseLabelKeyword Keyword -hi link beginRL Type - -let b:current_syntax = "ragel" diff --git a/.vim/syntax/textile.vim b/.vim/syntax/textile.vim deleted file mode 100644 index 48a5d65..0000000 --- a/.vim/syntax/textile.vim +++ /dev/null @@ -1,87 +0,0 @@ -" -" You will have to restart vim for this to take effect. In any case -" it is a good idea to read ":he new-filetype" so that you know what -" is going on, and why the above lines work. -" -" Written originally by Dominic Mitchell, Jan 2006. -" happygiraffe.net -" -" Modified by Aaron Bieber, May 2007. -" blog.aaronbieber.com -" -" Modified by Tim Harper, July 2008 - current -" tim.theenchanter.com -" @(#) $Id$ - -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -" Textile commands like "h1" are case sensitive, AFAIK. -syn case match - -" Textile syntax: - -" Inline elements. -syn match txtEmphasis /_[^_]\+_/ -syn match txtBold /\*[^*]\+\*/ -syn match txtCite /??.\+??/ -syn match txtDeleted /-[^-]\+-/ -syn match txtInserted /+[^+]\++/ -syn match txtSuper /\^[^^]\+\^/ -syn match txtSub /\~[^~]\+\~/ -syn match txtSpan /%[^%]\+%/ -syn match txtFootnoteRef /\[[0-9]\+]/ -syn match txtCode /@[^@]\+@/ - -" Block elements. -syn match txtHeader /^h1\. .\+/ -syn match txtHeader2 /^h2\. .\+/ -syn match txtHeader3 /^h[3-6]\..\+/ -syn match txtBlockquote /^bq\./ -syn match txtFootnoteDef /^fn[0-9]\+\./ -syn match txtListBullet /\v^\*+ / -syn match txtListBullet2 /\v^(\*\*)+ / -syn match txtListNumber /\v^#+ / -syn match txtListNumber2 /\v^(##)+ / - -syn cluster txtBlockElement contains=txtHeader,txtBlockElement,txtFootnoteDef,txtListBullet,txtListNumber - - -" Everything after the first colon is from RFC 2396, with extra -" backslashes to keep vim happy... Original: -" ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))? -" -" Revised the pattern to exclude spaces from the URL portion of the -" pattern. Aaron Bieber, 2007. -syn match txtLink /"[^"]\+":\(\([^:\/?# ]\+\):\)\?\(\/\/\([^\/?# ]*\)\)\?\([^?# ]*\)\(?\([^# ]*\)\)\?\(#\([^ ]*\)\)\?/ - -syn cluster txtInlineElement contains=txtEmphasis,txtBold,txtCite,txtDeleted,txtInserted,txtSuper,txtSub,txtSpan - -if version >= 508 || !exists("did_txt_syn_inits") - if version < 508 - let did_txt_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink txtHeader Title - HiLink txtHeader2 Question - HiLink txtHeader3 Statement - HiLink txtBlockquote Comment - HiLink txtListBullet Operator - HiLink txtListBullet2 Constant - HiLink txtListNumber Operator - HiLink txtListNumber2 Constant - HiLink txtLink String - HiLink txtCode Identifier - hi def txtEmphasis term=underline cterm=underline gui=italic - hi def txtBold term=bold cterm=bold gui=bold - - delcommand HiLink -endif - -" vim: set ai et sw=4 : diff --git a/.vimrc b/.vimrc index 2174b60..5926d1b 100644 --- a/.vimrc +++ b/.vimrc @@ -4,14 +4,6 @@ if filereadable(glob("~/.vimrc.before")) source ~/.vimrc.before endif -" pathogen -filetype off -if empty($GOPATH) - let g:pathogen_disabled = [] - call add(g:pathogen_disabled, 'go') -endif -execute pathogen#infect() - """ mappings let mapleader="\" @@ -207,6 +199,11 @@ let g:rustfmt_autosave = 1 " vim-markdown let g:markdown_fenced_languages = ['ruby'] +" vim-go +if !empty($GOPATH) + packadd vim-go +endif + " gui stuff set guioptions-=T set guifont=Consolas:h9:cANSI