From 0d6c1ab0eef8d4e6726a3e69e5a721dae8f443a4 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Wed, 7 Mar 2012 00:09:08 -0600 Subject: [PATCH] Trying out Vundle instead of Pathogen. --- .gitignore | 1 + oh-my-zsh | 2 +- tmux.conf | 1 + vim/bundle/nerdcommenter | 2 +- vim/bundle/snipmate-snippets | 2 +- vim/bundle/syntastic | 2 +- vim/bundle/tagbar | 2 +- vim/bundle/vim-jade | 2 +- vim/bundle/vim-powerline | 2 +- vim/bundle/vim-rails | 2 +- vimrc | 145 ++++++++++++++++++----------------- zshrc | 2 +- 12 files changed, 86 insertions(+), 79 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f027e0d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vim diff --git a/oh-my-zsh b/oh-my-zsh index 7a41498..1120f97 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit 7a41498b0d4f68c537d494b5f849913361315fde +Subproject commit 1120f973054836eeb53750f57d69fbec41a340dc diff --git a/tmux.conf b/tmux.conf index 1e1236b..ff05584 100644 --- a/tmux.conf +++ b/tmux.conf @@ -19,3 +19,4 @@ set-window-option -g mode-keys vi # vi key set-option -g status-keys vi set-window-option -g utf8 on # utf8 support +set -g default-terminal "screen-256color" diff --git a/vim/bundle/nerdcommenter b/vim/bundle/nerdcommenter index f4d9f99..98cec44 160000 --- a/vim/bundle/nerdcommenter +++ b/vim/bundle/nerdcommenter @@ -1 +1 @@ -Subproject commit f4d9f99f67189aa5725fdfc4c13fd33089446ccc +Subproject commit 98cec44ef6e8c93f89fb7911a03d7eaa75fe1249 diff --git a/vim/bundle/snipmate-snippets b/vim/bundle/snipmate-snippets index 57daa7b..0122ba5 160000 --- a/vim/bundle/snipmate-snippets +++ b/vim/bundle/snipmate-snippets @@ -1 +1 @@ -Subproject commit 57daa7bfa737a12c7157cbdd828b669faf885925 +Subproject commit 0122ba5e07ed53d42cf07810bc60bbb74e1afe7c diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index 2616623..7a5bca3 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 2616623bb9208c4bf2559b6aa5c1eff53644a0f7 +Subproject commit 7a5bca349c19bf7a43b316193748ca46d76ed716 diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar index 81cfb3f..a9209b4 160000 --- a/vim/bundle/tagbar +++ b/vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit 81cfb3f9038ca6de5716dc170212e29dfb0bf94f +Subproject commit a9209b43675b333451e673774509c37eca0defae diff --git a/vim/bundle/vim-jade b/vim/bundle/vim-jade index 981b39b..77d83ab 160000 --- a/vim/bundle/vim-jade +++ b/vim/bundle/vim-jade @@ -1 +1 @@ -Subproject commit 981b39bd2dcd839746509328e69c5053b8871d04 +Subproject commit 77d83abc6c8e6c18fc91446c7cf2deebd4848a29 diff --git a/vim/bundle/vim-powerline b/vim/bundle/vim-powerline index 90c1755..99277d9 160000 --- a/vim/bundle/vim-powerline +++ b/vim/bundle/vim-powerline @@ -1 +1 @@ -Subproject commit 90c17556d79689697c43df5c94ae9e00dbc73fdf +Subproject commit 99277d9eed97a59cacc1db8c1dece2bcfd96d877 diff --git a/vim/bundle/vim-rails b/vim/bundle/vim-rails index e45164c..b6720d6 160000 --- a/vim/bundle/vim-rails +++ b/vim/bundle/vim-rails @@ -1 +1 @@ -Subproject commit e45164cbba5beee4bd65096dad31f31124a2cc18 +Subproject commit b6720d68c2d315fc1f6f4d78ee7d7a97475571e1 diff --git a/vimrc b/vimrc index bb01370..605fa1b 100644 --- a/vimrc +++ b/vimrc @@ -1,19 +1,62 @@ -" pathogen -call pathogen#runtime_append_all_bundles() -call pathogen#helptags() - -" turn off vi compatability, although i hear when vimrc exists this is set -" automatically set nocompatible -" allow hidden buffers -set hidden +" Vundle stuff +filetype off +set rtp+=~/.vim/bundle/vundle/ +call vundle#rc() +Bundle 'gmarik/vundle' + +" Custom Bundles: +Bundle 'groenewege/vim-less' +Bundle 'digitaltoad/vim-jade' +Bundle 'pangloss/vim-javascript' +Bundle 'kchmck/vim-coffee-script' +Bundle 'jQuery' +Bundle 'tpope/vim-rails' +Bundle 'tpope/vim-repeat' +Bundle 'tpope/vim-surround' +Bundle 'tpope/vim-fugitive' +Bundle 'tpope/vim-endwise' +Bundle 'Lokaltog/vim-powerline' +Bundle 'Lokaltog/vim-easymotion' +Bundle 'bkad/CamelCaseMotion' +Bundle 'majutsushi/tagbar' +Bundle 'scrooloose/syntastic' +Bundle 'scrooloose/nerdcommenter' +" Bundle 'scrooloose/nerdtree' +Bundle 'altercation/vim-colors-solarized' +" Bundle 'ervandew/supertab' +" Bundle 'sjl/gundo.vim' +Bundle 'kien/ctrlp.vim' +Bundle 'gregsexton/MatchTag' +Bundle 'closetag.vim' + +" Snipmate +Bundle 'MarcWeber/vim-addon-mw-utils' +Bundle 'tomtom/tlib_vim' +Bundle 'snipmate-snippets' +Bundle 'garbas/vim-snipmate' + +filetype plugin indent on " last Vundle requirement -" longer history -set history=1000 +syntax enable +set hidden " allow hidden buffers +set history=1000 " longer history +set noswapfile " turn off swapfiles +set nu " line numbers +set sc " show the command as it is typed +set wildmenu +set wildmode=longest:full +let mapleader = "," +set autoread " when a file is changed externally +set mat=2 +set ruler +set cursorline " Highlight current line +set encoding=utf-8 " Necessary to show unicode glyphs +set laststatus=2 " Always show the statusline -" turn off swapfiles -set noswapfile +" Powerline +let g:Powerline_symbols='fancy' " persistent undo if v:version > 703 @@ -21,22 +64,6 @@ if v:version > 703 set undofile endif -" line numbers -set nu - -" wild menu -set wildmenu -set wildmode=longest:full - -" show the command as it is typed -set sc - -" remap the leader to ,. hate doing this but \ is so far away -let mapleader = "," - -" when a file is changed externally -set autoread - " indentation filetype plugin on filetype indent on @@ -46,35 +73,35 @@ set smartindent " search set hlsearch set incsearch -set showmatch +set smartcase +set showmatch " matching brackets +set matchtime=2 " blink brackets " tab stops -set expandtab -set smarttab set tabstop=4 +set softtabstop=4 set shiftwidth=4 - -set mat=2 -set ruler +set expandtab +set smarttab " so we get html goodies in php files au BufRead *.php set ft=php.html au BufNewFile *.php set ft=php.html -syntax enable - -" solarized colors +" Solarized set background=dark let g:solarized_termtrans=1 -let g:solarized_termcolors=256 -let g:solarized_contrast="high" -let g:solarized_visibility="high" +let g:solarized_termcolors=256 "default value is 16 +let g:solarized_contrast="high" "default value is normal +let g:solarized_visibility="high" "default value is normal +let g:solarized_diffmode="high" "default value is normal +let g:solarized_hitrail=1 "default value is 0 colorscheme solarized " NERDTree -nnoremap n :NERDTreeToggle -let NERDTreeMinimalUI=1 -let NERDTreeDirArrows=1 +"nnoremap n :NERDTreeToggle +"let NERDTreeMinimalUI=1 +"let NERDTreeDirArrows=1 " Tagbar nnoremap t :TagbarToggle @@ -84,33 +111,16 @@ if has("gui_running") set go=-t endif -" status line. stolen from here: -" https://github.com/lukaszkorecki/DotFiles/blob/master/vimrc -set statusline= -set statusline+=%f\ %2*%m\ %1*%h -set statusline+=%#warningmsg# -if v:version > 700 - set statusline+=%{SyntasticStatuslineFlag()} -endif -set statusline+=%{fugitive#statusline()} -set statusline+=%* -set statusline+=%r%=[%{&encoding}\ %{&fileformat}\ %{strlen(&ft)?&ft:'none'}] -set statusline+=%15.(%c:%l/%L%)\ %P -set laststatus=2 - " Syntastic if v:version > 700 let g:syntastic_enable_signs=1 let g:syntastic_auto_loc_list=1 else - let g:loaded_syntastic_plugin = 1 + let g:loaded_syntastic_plugin=1 endif " Supertab -let g:SuperTabDefaultCompletionType = "context" - -" Highlight current line -set cursorline +" let g:SuperTabDefaultCompletionType="context" " Highlight column 80 if version > 702 @@ -120,18 +130,13 @@ endif " pretty line endings and trailing spaces set list listchars=tab:»·,trail:·,eol:↪ -" fine I'll try it -inoremap jk -inoremap kj - -" stop hitting Esc or c-[! -inoremap -nnoremap :noh +" turn off highlighting +" nnoremap :noh " open the current file for edit in Perforce nnoremap p :! p4 edit % " disable tagbar in old Vim if v:version < 703 - let g:loaded_tagbar = 1 + let g:loaded_tagbar=1 endif diff --git a/zshrc b/zshrc index d7bb271..9092000 100644 --- a/zshrc +++ b/zshrc @@ -31,7 +31,7 @@ source $ZSH/oh-my-zsh.sh # Customize to your needs... alias vi=vim -export TERM="screen-256color" +# export TERM="screen-256color" export EDITOR=vim export PATH="/usr/local/bin:$PATH"