From ffdc68e3360a3bdd6cbef02b49811c0b128d6c98 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Thu, 4 Oct 2012 13:46:33 -0600 Subject: [PATCH 1/8] Adding numbers.vim and vimux --- oh-my-zsh | 2 +- vimrc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/oh-my-zsh b/oh-my-zsh index d05b201..73f7770 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit d05b2010ffd4cd33ff9402c402051b1caf985d97 +Subproject commit 73f777053725ce61d6fada67ff3f174130dd8c94 diff --git a/vimrc b/vimrc index 0aa7751..0a61319 100644 --- a/vimrc +++ b/vimrc @@ -38,6 +38,8 @@ Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} Bundle 'mbbill/undotree' Bundle 'Shougo/neocomplcache' Bundle 'coderifous/textobj-word-column.vim' +Bundle 'myusuf3/numbers.vim' +Bundle 'benmills/vimux' " Snipmate " Bundle 'MarcWeber/vim-addon-mw-utils' From 780b02df59bd2960124f9f4f2dac662aa2b460ed Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 9 Oct 2012 17:07:57 -0500 Subject: [PATCH 2/8] Adding workflowish stuff for vim --- vimrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/vimrc b/vimrc index 0aa7751..eb026e9 100644 --- a/vimrc +++ b/vimrc @@ -38,6 +38,7 @@ Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} Bundle 'mbbill/undotree' Bundle 'Shougo/neocomplcache' Bundle 'coderifous/textobj-word-column.vim' +Bundle 'lukaszkorecki/workflowish' " Snipmate " Bundle 'MarcWeber/vim-addon-mw-utils' @@ -196,3 +197,9 @@ nnoremap l :ls:b " Set the max files let g:ctrlp_max_files = 10000 + +" Workflowish stuff. Search for #todo +nnoremap T :vimgrep /#todo/i %:copen + +" Quickly switch back to quickfix +nnoremap f :copen From fb9da10b3deffceacc1d648c5afd1ec54bf2366c Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 9 Oct 2012 17:29:00 -0500 Subject: [PATCH 3/8] Updating workflowish keymaps to resize quickfix window --- oh-my-zsh | 2 +- vimrc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oh-my-zsh b/oh-my-zsh index d05b201..c2ae9e0 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit d05b2010ffd4cd33ff9402c402051b1caf985d97 +Subproject commit c2ae9e09ca1f33ff1e13e629a0b2e6bdd19f83a9 diff --git a/vimrc b/vimrc index eb026e9..8b94c44 100644 --- a/vimrc +++ b/vimrc @@ -199,7 +199,7 @@ nnoremap l :ls:b let g:ctrlp_max_files = 10000 " Workflowish stuff. Search for #todo -nnoremap T :vimgrep /#todo/i %:copen +nnoremap T :vimgrep /#todo/i %:copen:30wincmd _ " Quickly switch back to quickfix nnoremap f :copen From d118b39074feda037c329b78dc647a699ba5a0d2 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 9 Oct 2012 17:38:16 -0500 Subject: [PATCH 4/8] Only showing non-completed todos now for workflowy --- vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 8b94c44..3d77274 100644 --- a/vimrc +++ b/vimrc @@ -199,7 +199,7 @@ nnoremap l :ls:b let g:ctrlp_max_files = 10000 " Workflowish stuff. Search for #todo -nnoremap T :vimgrep /#todo/i %:copen:30wincmd _ +nnoremap T :vimgrep /\v^\s*\*+.*#todo.*/i %:copen:30wincmd _ " Quickly switch back to quickfix nnoremap f :copen From 6592e4208b4fc0e2d8a4916279ab39937967aa93 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 9 Oct 2012 17:58:16 -0500 Subject: [PATCH 5/8] Adding another #todo searcher for vim workflowish. Also cleaned up some spacing --- vimrc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/vimrc b/vimrc index 3d77274..7778a77 100644 --- a/vimrc +++ b/vimrc @@ -39,6 +39,7 @@ Bundle 'mbbill/undotree' Bundle 'Shougo/neocomplcache' Bundle 'coderifous/textobj-word-column.vim' Bundle 'lukaszkorecki/workflowish' +Bundle 'searchfold.vim' " Snipmate " Bundle 'MarcWeber/vim-addon-mw-utils' @@ -103,7 +104,7 @@ set smartcase " if we include uppercase, it will be case sensitive set showmatch " matching brackets set matchtime=2 " blink brackets " turn off highlighting -nnoremap :noh +nnoremap :noh " regex " thanks stevelosh set magic @@ -152,7 +153,7 @@ colorscheme solarized "let NERDTreeDirArrows=1 " Tagbar -nnoremap t :TagbarToggle +nnoremap t :TagbarToggle " disable tagbar in old Vim if v:version < 703 let g:loaded_tagbar=1 @@ -172,7 +173,7 @@ nnoremap s :SyntasticToggleMode " let g:SuperTabDefaultCompletionType="context" " open the current file for edit in Perforce -nnoremap 4 :! p4 edit % +nnoremap 4 :! p4 edit % " open vsplit and switch to it nnoremap v vl @@ -199,7 +200,5 @@ nnoremap l :ls:b let g:ctrlp_max_files = 10000 " Workflowish stuff. Search for #todo -nnoremap T :vimgrep /\v^\s*\*+.*#todo.*/i %:copen:30wincmd _ - -" Quickly switch back to quickfix -nnoremap f :copen +nnoremap T :vimgrep /\v^\s*\*+.*#todo.*/i %:copen:30wincmd _ +nnoremap TT /\v^\s*\*+.*#todo.*/i From 560c7fca3d643f69584d6f5346d0b85c85b98a90 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Tue, 9 Oct 2012 23:01:35 -0500 Subject: [PATCH 6/8] Commenting out a bunch of unused vimrc stuff --- vimrc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/vimrc b/vimrc index 0a61319..122a1a0 100644 --- a/vimrc +++ b/vimrc @@ -6,7 +6,6 @@ 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' @@ -26,10 +25,10 @@ Bundle 'majutsushi/tagbar' Bundle 'scrooloose/syntastic' Bundle 'scrooloose/nerdcommenter' " Bundle 'scrooloose/nerdtree' -Bundle 'altercation/vim-colors-solarized' +" Bundle 'altercation/vim-colors-solarized' " Bundle 'ervandew/supertab' " Bundle 'sjl/gundo.vim' -Bundle 'sjl/clam.vim' +" Bundle 'sjl/clam.vim' Bundle 'kien/ctrlp.vim' Bundle 'gregsexton/MatchTag' " Bundle 'closetag.vim' @@ -38,8 +37,9 @@ Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} Bundle 'mbbill/undotree' Bundle 'Shougo/neocomplcache' Bundle 'coderifous/textobj-word-column.vim' -Bundle 'myusuf3/numbers.vim' -Bundle 'benmills/vimux' +" Bundle 'myusuf3/numbers' +" Bundle 'benmills/vimux' +" Bundle 'kikijump/tslime.vim' " Snipmate " Bundle 'MarcWeber/vim-addon-mw-utils' @@ -49,7 +49,7 @@ Bundle 'benmills/vimux' filetype plugin indent on " last Vundle requirement -" mouse!!!!! +" mouse set mouse=a set ttymouse=xterm @@ -138,14 +138,14 @@ endif let g:Powerline_symbols='fancy' " Solarized -set background=dark -let g:solarized_termtrans=1 -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 +"set background=dark +"let g:solarized_termtrans=1 +"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 @@ -188,10 +188,10 @@ nnoremap a :Ack nnoremap m :silent !open -a Marked.app '%:p' " Clam -nnoremap ! :Clam +" nnoremap ! :Clam " CtrlP -"nnoremap b :CtrlPBuffer +nnoremap b :CtrlPBuffer " Buffer selection nnoremap l :ls:b From a6f90f07c1beb7071f112d1e391da17a65745501 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Wed, 10 Oct 2012 14:04:41 -0500 Subject: [PATCH 7/8] Adding tabularize vim plugin --- oh-my-zsh | 2 +- vimrc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/oh-my-zsh b/oh-my-zsh index 73f7770..c2ae9e0 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit 73f777053725ce61d6fada67ff3f174130dd8c94 +Subproject commit c2ae9e09ca1f33ff1e13e629a0b2e6bdd19f83a9 diff --git a/vimrc b/vimrc index 2c9530b..4d88885 100644 --- a/vimrc +++ b/vimrc @@ -42,6 +42,7 @@ Bundle 'coderifous/textobj-word-column.vim' " Bundle 'kikijump/tslime.vim' Bundle 'lukaszkorecki/workflowish' Bundle 'searchfold.vim' +Bundle 'godlygeek/tabular' " Snipmate " Bundle 'MarcWeber/vim-addon-mw-utils' From aa6931378623b65e74b783f10a90b862ce0b0cf4 Mon Sep 17 00:00:00 2001 From: Dustin Swan Date: Wed, 10 Oct 2012 16:32:44 -0500 Subject: [PATCH 8/8] Disabling neocomplcache for now, setting dark color scheme now that I've disabled solarized --- vimrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vimrc b/vimrc index 4d88885..a883e09 100644 --- a/vimrc +++ b/vimrc @@ -35,7 +35,7 @@ Bundle 'gregsexton/MatchTag' Bundle 'kana/vim-smartinput' Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} Bundle 'mbbill/undotree' -Bundle 'Shougo/neocomplcache' +" Bundle 'Shougo/neocomplcache' Bundle 'coderifous/textobj-word-column.vim' " Bundle 'myusuf3/numbers' " Bundle 'benmills/vimux' @@ -140,6 +140,10 @@ endif " Powerline let g:Powerline_symbols='fancy' +" Colors +set background=dark +colorscheme default + " Solarized "set background=dark "let g:solarized_termtrans=1