Permalink
Browse files

merging vim type things in from personal MBP

  • Loading branch information...
1 parent 88a09f9 commit 6068df183ea2dfb73f1227042cc61efa23513c54 @joelash committed Nov 27, 2011
Showing with 27 additions and 34 deletions.
  1. 0 vim/bundle/.gitkeep
  2. +1 −0 vim/{bundle → git}/git-repos
  3. +26 −34 vimrc
View
0 vim/bundle/.gitkeep
No changes.
View
1 vim/bundle/git-repos → vim/git/git-repos
@@ -1 +1,2 @@
https://github.com/altercation/vim-colors-solarized.git
+https://github.com/godlygeek/tabular.git
View
60 vimrc
@@ -1,4 +1,6 @@
-" normal color
+" leader
+let mapleader = ","
+
colorscheme desert
" solarized color
@@ -17,14 +19,18 @@ set gfn=Inconsolata:h16
set incsearch
set hlsearch
+set ignorecase
-set nowrap
+set nowrap
set number
set lazyredraw
set ruler
set autoread " auto read updates to file from outside vim
+" pastetoggle
+set pastetoggle=<F5>
+
" highlight the current line
set cursorline
@@ -36,69 +42,46 @@ filetype on
filetype indent on
filetype plugin on
-" run all tests in file
-map <silent> <C-S-F10> :!rake %:r".t"<CR>
-map <silent> <S-C-F10> :!rake %:r".t"<CR>
-
-" choose test to run in file
-map <silent> <C-S-F11> :!rake %:r".it"<CR>
-map <silent> <S-C-F11> :!rake %:r".it"<CR>
-
" USURE IF I WANT THESE
set showmatch
set matchtime=1
-" tab settings
-nnoremap <silent> <C-n> :tabnext<CR>
-nnoremap <silent> <C-p> :tabprevious<CR>
-
-" Remap alt-j alt-k to insert blank lines without going to insert mode
-nnoremap <silent><D-j> :set paste<CR>m`o<Esc>``:set nopaste<CR>
-nnoremap <silent><D-k> :set paste<CR>m`O<Esc>``:set nopaste<CR>
+" Remap ctrl+j ctrl+k to insert blank lines without going to insert mode
+nnoremap <silent> <C-S-j> :set paste<CR>m`o<Esc>``:set nopaste<CR>
+nnoremap <silent> <C-S-k> :set paste<CR>m`O<Esc>``:set nopaste<CR>
" split editing settings
-map <C-J> <C-W>j<C-W>_
-map <C-K> <C-W>k<C-W>_
set wmh=0
" easy to source / edit this file
map ,s :source ~/.vimrc<CR>
map ,v :tabedit ~/.vimrc<CR>
-" NERDCommenter
-" map comments to apple/
-nmap <D-/> ,c<Space>
-vmap <D-/> ,c<Space>
-imap <D-/> <C-O>,c<Space>
-
" Fuzzy Finder
+let mapleader="\\"
+
" fuzzy finder mapping
" file
map <leader>n :FufFile **/<CR>
-"map <C-n> :FufFile **/<CR>
" tag
map <leader>t :FufTag<CR>
-map <C-S-F12> :FufTag<CR>
-map <S-C-F12> :FufTag<CR>
" buffer
map <leader>e :FufBuffer<CR>
" renew finder cache shortcut
map <leader>r :FufRenewCache<CR>
+let mapleader=","
+
" NERDTree
" Make F2 open NERDTree
nmap <silent> <F2> :NERDTreeToggle<CR>
" TAGS
-
-" Remap autocomplete to CTRL+SPACE
-inoremap <C-space> <C-n>
-
" rebuild ctags
map <silent> <LocalLeader>rt :!ctags -R --exclude=".git\|.svn\|log\|tmp\|db\|pkg" --extra=+f<CR>
@@ -109,8 +92,17 @@ let clj_paren_rainbow = 1
let vimclojure#NailgunClient = "/opt/local/vimclojure/ng"
let clj_want_gorilla = 1
-" pastetoggle
-set pastetoggle=<F5>
+" Tabularize
+if exists(":Tabularize")
+ nmap <LocalLeader>a= :Tabularize /=<CR>
+ vmap <LocalLeader>a= :Tabularize /=<CR>
+ nmap <LocalLeader>a. :Tabularize /=><CR>
+ vmap <LocalLeader>a. :Tabularize /=><CR>
+ nmap <LocalLeader>a: :Tabularize /:\zs<CR>
+ vmap <LocalLeader>a: :Tabularize /:\zs<CR>
+endif
+
+let mapleader = ","
" pathogen
call pathogen#runtime_append_all_bundles()

0 comments on commit 6068df1

Please sign in to comment.