projects
/
dotfiles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perl note
[dotfiles.git]
/
vim
/
vimrc
diff --git
a/vim/vimrc
b/vim/vimrc
index
753ff74
..
fc97f82
100644
(file)
--- 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 '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'
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 macmeta "" Macvim only
colorscheme molokai
set guioptions+=c
- set guifont=S
auce\ Code\ Powerline
\ Light:h11
+ set guifont=S
ource\ Code\ Pro
\ Light:h11
highlight Cursor guifg=white guibg=green
set guicursor=a:blinkon0
set guioptions=eac
highlight Cursor guifg=white guibg=green
set guicursor=a:blinkon0
set guioptions=eac
@@
-166,12
+167,13
@@
nnoremap
\e
\19
:tabprevious<CR>
"nmap <A-SPACE> :b#<CR>
"nmap <Leader>d :bd<CR>
"" keymappig for register operations
"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
"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
\e
= :resize<CR>:vertical resize<CR>
nmap <A-=> :resize<CR>:vertical resize<CR>
nmap
\e
= :resize<CR>:vertical resize<CR>
@@
-374,6
+376,8
@@
endfunction
"endif
" }}}
" NerdTree ---------------------------------------------------------------- {{{
"endif
" }}}
" NerdTree ---------------------------------------------------------------- {{{
+" Fix keymapping conflict
+nmap <unique> <Leader>, <Plug>MarkClear
nmap <Leader>n :NERDTreeToggle<CR>
nmap <Leader>N :NERDTreeFind<CR>
" }}}
nmap <Leader>n :NERDTreeToggle<CR>
nmap <Leader>N :NERDTreeFind<CR>
" }}}