X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=vim%2Fvimrc;h=fc97f823fa763d2603ed56d5c92bb8571f554072;hb=fa4719922ca4877858157963f406303ce5feda10;hp=cb3fef0c050e6f1b17fa22a55ac714a36c6b4c98;hpb=70a12d1c0581e732ee4ef13f0ec9e970017c84bf;p=dotfiles.git

diff --git a/vim/vimrc b/vim/vimrc
index cb3fef0..fc97f82 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -13,7 +13,8 @@ Bundle 'vim-scripts/FuzzyFinder'
 Bundle 'vim-scripts/L9'
 Bundle 'Valloric/YouCompleteMe'
 Bundle 'octol/vim-cpp-enhanced-highlight'
-Bundle 'bling/vim-airline'
+Bundle 'vim-airline/vim-airline'
+Bundle 'vim-airline/vim-airline-themes'
 Bundle 'payneseu/nerdtree'
 Bundle 'Townk/vim-autoclose'
 Bundle 'majutsushi/tagbar'
@@ -92,7 +93,7 @@ if has("gui_running")
 	set macmeta  "" Macvim only
 	colorscheme molokai
 	set guioptions+=c
-	set guifont=Sauce\ Code\ Powerline\ Light:h11
+	set guifont=Source\ Code\ Pro\ Light:h11
 	highlight Cursor guifg=white guibg=green
 	set guicursor=a:blinkon0
 	set guioptions=eac
@@ -166,12 +167,13 @@ nnoremap  :tabprevious<CR>
 "nmap <A-SPACE>	:b#<CR>
 "nmap <Leader>d	:bd<CR>
 "" keymappig for register operations
-nnoremap <Leader>r	:registers<CR>
+""TODO check if this already mapping
+"nnoremap <Leader>r	:registers<CR>
 "noremap <Leader>x	:<C-p>
 nnoremap <Leader>a :
 
 nmap <Leader>p	"*p
-
+" also works :r !pbpaste<CR>
 
 nmap <A-=> :resize<CR>:vertical resize<CR>
 nmap = :resize<CR>:vertical resize<CR>
@@ -374,6 +376,8 @@ endfunction
 "endif
 " }}}
 " NerdTree ---------------------------------------------------------------- {{{
+" Fix keymapping conflict
+nmap <unique> <Leader>, <Plug>MarkClear
 nmap <Leader>n	:NERDTreeToggle<CR>
 nmap <Leader>N	:NERDTreeFind<CR>
 " }}}
@@ -524,7 +528,7 @@ autocmd FileType vim setlocal foldmethod=marker |
 
 autocmd FileType perl setlocal foldmethod=syntax |
     \ let b:AutoClosePairs = AutoClose#DefaultPairsModified("\"", "{}") |
-	\ inoremap <buffer> { {<CR>}<ESC>kA<CR>
+	\ inoremap <buffer> {<CR> {<CR>}<ESC>kA<CR>
 
 autocmd Filetype markdown setlocal textwidth=80
 
@@ -693,3 +697,5 @@ nnoremap <Leader>m  :marks abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<
 "                          \ 'undo', 'line', 'changes', 'mixed', 'bookmarkdir']
 
 
+"" TODO: 
+""