From c4f4df0e97a83b83bb7aba3d63967ce5d9d6af48 Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Sat, 19 May 2012 15:56:52 -0400 Subject: [PATCH] Add some plugins --- gitconfig => .gitconfig | 0 githelpers => .githelpers | 0 .gitmodules | 9 + .vim/autoload/pathogen.vim | 245 +++++++++++++++++++++++++++ .vim/plugins/Command-T | 1 + .vim/plugins/vim-colors-solarized | 1 + .vim/plugins/vim-colorscheme-elrodeo | 1 + vimrc => .vimrc | 41 +++-- 8 files changed, 282 insertions(+), 16 deletions(-) rename gitconfig => .gitconfig (100%) rename githelpers => .githelpers (100%) create mode 100644 .gitmodules create mode 100644 .vim/autoload/pathogen.vim create mode 160000 .vim/plugins/Command-T create mode 160000 .vim/plugins/vim-colors-solarized create mode 160000 .vim/plugins/vim-colorscheme-elrodeo rename vimrc => .vimrc (96%) diff --git a/gitconfig b/.gitconfig similarity index 100% rename from gitconfig rename to .gitconfig diff --git a/githelpers b/.githelpers similarity index 100% rename from githelpers rename to .githelpers diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..08d518e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule ".vim/plugins/Command-T"] + path = .vim/plugins/Command-T + url = https://github.com/wincent/Command-T.git +[submodule ".vim/plugins/vim-colors-solarized"] + path = .vim/plugins/vim-colors-solarized + url = https://github.com/altercation/vim-colors-solarized +[submodule ".vim/plugins/vim-colorscheme-elrodeo"] + path = .vim/plugins/vim-colorscheme-elrodeo + url = https://github.com/chmllr/vim-colorscheme-elrodeo.git diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim new file mode 100644 index 0000000..3accbe6 --- /dev/null +++ b/.vim/autoload/pathogen.vim @@ -0,0 +1,245 @@ +" pathogen.vim - path option manipulation +" Maintainer: Tim Pope +" Version: 2.0 + +" Install in ~/.vim/autoload (or ~\vimfiles\autoload). +" +" For management of individually installed plugins in ~/.vim/bundle (or +" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc +" prior to `filetype plugin indent on` 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 + +" Point of entry for basic default usage. Give a directory name to invoke +" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path +" to invoke pathogen#runtime_prepend_subdirectories(). Afterwards, +" pathogen#cycle_filetype() is invoked. +function! pathogen#infect(...) abort " {{{1 + let source_path = a:0 ? a:1 : 'bundle' + if source_path =~# '[\\/]' + call pathogen#runtime_prepend_subdirectories(source_path) + else + call pathogen#runtime_append_all_bundles(source_path) + endif + call pathogen#cycle_filetype() +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 +endfunction " }}}1 + +command! -bar Helptags :call pathogen#helptags() + +" Like findfile(), but hardcoded to use the runtimepath. +function! pathogen#runtime_findfile(file,count) "{{{1 + let rtp = pathogen#join(1,pathogen#split(&rtp)) + return fnamemodify(findfile(a:file,rtp,a:count),':p') +endfunction " }}}1 + +" Backport of fnameescape(). +function! pathogen#fnameescape(string) " {{{1 + if exists('*fnameescape') + return fnameescape(a:string) + elseif a:string ==# '-' + return '\-' + else + return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') + endif +endfunction " }}}1 + +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'" + elseif a:lcd + let path = file[0:-strlen(a:file)-2] + execute 'lcd `=path`' + return a:cmd.' '.pathogen#fnameescape(a:file) + else + return a:cmd.' '.pathogen#fnameescape(file) + 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 ft=vim ts=8 sw=2 sts=2: diff --git a/.vim/plugins/Command-T b/.vim/plugins/Command-T new file mode 160000 index 0000000..ca5566e --- /dev/null +++ b/.vim/plugins/Command-T @@ -0,0 +1 @@ +Subproject commit ca5566eb312f57b9f4091023cfc03ad8e692bf29 diff --git a/.vim/plugins/vim-colors-solarized b/.vim/plugins/vim-colors-solarized new file mode 160000 index 0000000..528a59f --- /dev/null +++ b/.vim/plugins/vim-colors-solarized @@ -0,0 +1 @@ +Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 diff --git a/.vim/plugins/vim-colorscheme-elrodeo b/.vim/plugins/vim-colorscheme-elrodeo new file mode 160000 index 0000000..df4a357 --- /dev/null +++ b/.vim/plugins/vim-colorscheme-elrodeo @@ -0,0 +1 @@ +Subproject commit df4a357b66bd2b46f682c3780791041b6b4ab963 diff --git a/vimrc b/.vimrc similarity index 96% rename from vimrc rename to .vimrc index d6ed0a1..c9ebece 100644 --- a/vimrc +++ b/.vimrc @@ -1,3 +1,26 @@ +let mapleader="," + +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" PLUGINS +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +call pathogen#infect("plugins") +call pathogen#helptags() + +" Command-T Config +map gR :call ShowRoutes() +map gv :CommandTFlush\|:CommandT app/views +map gc :CommandTFlush\|:CommandT app/controllers +map gm :CommandTFlush\|:CommandT app/models +map gh :CommandTFlush\|:CommandT app/helpers +map gl :CommandTFlush\|:CommandT lib +map gp :CommandTFlush\|:CommandT public +map gs :CommandTFlush\|:CommandT public/stylesheets/sass +map gf :CommandTFlush\|:CommandT features +map gg :topleft 100 :split Gemfile +map gt :CommandTFlush\|:CommandTTag +map f :CommandTFlush\|:CommandT +map F :CommandTFlush\|:CommandT %% + """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " BASIC EDITING CONFIGURATION """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -14,6 +37,7 @@ set autoindent set laststatus=2 set showmatch set incsearch +set number set hlsearch " make searches case-sensitive only if they contain upper-case characters set ignorecase smartcase @@ -48,7 +72,6 @@ filetype plugin indent on set wildmode=longest,list " make tab completion for files/buffers act like bash set wildmenu -let mapleader="," """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " CUSTOM AUTOCMDS @@ -72,7 +95,7 @@ augroup END """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" let mapleader="," -" insert a hash rocket with +" insert a hash rocket with imap => " set esc to @@ -152,20 +175,6 @@ function! ShowRoutes() " Delete empty trailing line :normal dd endfunction -map gR :call ShowRoutes() -map gv :CommandTFlush\|:CommandT app/views -map gc :CommandTFlush\|:CommandT app/controllers -map gm :CommandTFlush\|:CommandT app/models -map gh :CommandTFlush\|:CommandT app/helpers -map gl :CommandTFlush\|:CommandT lib -map gp :CommandTFlush\|:CommandT public -map gs :CommandTFlush\|:CommandT public/stylesheets/sass -map gf :CommandTFlush\|:CommandT features -map gg :topleft 100 :split Gemfile -map gt :CommandTFlush\|:CommandTTag -map f :CommandTFlush\|:CommandT -map F :CommandTFlush\|:CommandT %% - """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " SWITCH BETWEEN TEST AND PRODUCTION CODE