Merge branch 'master' of git.barakmich.com:barak/dotfiles

This commit is contained in:
Barak Michener 2014-07-24 17:34:49 -04:00
commit d97e001b89
53 changed files with 2020 additions and 191 deletions

59
.vimrc
View file

@ -66,18 +66,56 @@ set t_Sb=ESC[4%dm
" ** FILETYPE SETTINGS **
filetype off
"call pathogen#runtime_append_all_bundles()
execute pathogen#infect()
let g:ft_ignore_pat = '.org'
filetype plugin indent on
"let g:ft_ignore_pat = '.org'
"filetype plugin indent on
" If you prefer the Omni-Completion tip window to close when a selection is
" made, these lines close it on movement in insert mode or when leaving
" insert mode
autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
autocmd InsertLeave * if pumvisible() == 0|pclose|endif
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
Plugin 'vim-scripts/DrawIt'
Plugin 'vim-scripts/EasyGrep'
Plugin 'chrisbra/NrrwRgn'
Plugin 'jceb/vim-orgmode'
Plugin 'mileszs/ack.vim'
Plugin 'mattn/calendar-vim'
Plugin 'vim-scripts/fish-syntax'
Plugin 'sjbach/lusty'
Plugin 'scrooloose/nerdcommenter'
Plugin 'scrooloose/nerdtree'
Plugin 'rstacruz/sparkup'
Plugin 'scrooloose/syntastic'
Plugin 'kchmck/vim-coffee-script'
Plugin 'tpope/vim-fugitive'
Plugin 'airblade/vim-gitgutter'
Plugin 'lunaru/vim-less'
Plugin 'terryma/vim-multiple-cursors'
Plugin 'rodjek/vim-puppet'
Plugin 'tpope/vim-unimpaired'
Plugin 'Valloric/YouCompleteMe'
Plugin 'b4winckler/vim-angry'
Plugin 'tristen/vim-sparkup'
Plugin 'bling/vim-airline'
Plugin 'kien/ctrlp.vim'
Plugin 'Blackrush/vim-gocode'
Plugin 'bling/vim-bufferline'
Plugin 'majutsushi/tagbar'
Plugin 'Raimondi/delimitMate'
Plugin 'eagletmt/neco-ghc'
Plugin 'eagletmt/ghcmod-vim'
Plugin 'Shougo/vimproc.vim'
Plugin 'SirVer/ultisnips'
Bundle 'honza/vim-snippets'
Plugin 'JuliaLang/julia-vim'
Plugin 'tpope/vim-surround'
"https://git.wincent.com/command-t.git
call vundle#end()
filetype plugin indent on " required
" Sources
"source ~/.vim/supertab.vim
"source ~/.vim/charm.vim
@ -94,10 +132,10 @@ autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags
"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
"au BufEnter *.org call org#SetOrgFileType()
au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
au BufEnter *.org call org#SetOrgFileType()
command! OrgCapture :call org#CaptureBuffer()
command! OrgCaptureFile :call org#OpenCaptureFile()
"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
"au BufEnter *.org call org#SetOrgFileType()
"command! OrgCapture :call org#CaptureBuffer()
"command! OrgCaptureFile :call org#OpenCaptureFile()
" Cull trailing whitespace for all files.
autocmd BufWritePre * :call AutoTrimWhitespace()
@ -182,6 +220,7 @@ let g:ConqueTerm_SendVisKey = '<Leader>ss'
let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
let g:ycm_confirm_extra_conf = 0
let g:ycm_key_invoke_completion = "<Leader><Tab>"
let g:ycm_use_ultisnips_completer = 1
"let g:ycm_add_preview_to_completeopt = 1
"let g:ycm_autoclose_preview_window_after_completion = 1
@ -209,8 +248,8 @@ let g:CommandTMaxDepth = 7
" let g:org_todo_setup='TODO | DONE'
" while g:org_tag_setup is itself a string
"let g:org_tag_setup='{@home(h) @work(w) @tennisclub(t)} \n {easy(e) hard(d)} \n {computer(c) phone(p)}'
au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
au BufEnter *.org call org#SetOrgFileType()
"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
"au BufEnter *.org call org#SetOrgFileType()
" * Airline
set noshowmode