|
|
|
@ -201,10 +201,8 @@ if &t_Co > 2 || has("gui_running")
|
|
|
|
|
try
|
|
|
|
|
colorscheme jellybeans
|
|
|
|
|
catch
|
|
|
|
|
silent! colorscheme delek
|
|
|
|
|
silent! colorscheme habamax
|
|
|
|
|
endtry
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
|
|
|
|
|
@ -306,6 +304,9 @@ noremap <C-n><C-n> :tabnew %<CR>
|
|
|
|
|
noremap <C-n><o> :tab term<CR>
|
|
|
|
|
noremap <C-n><C-o> :tab term<CR>
|
|
|
|
|
|
|
|
|
|
tnoremap <C-b><b> :bnext<CR>
|
|
|
|
|
tnoremap <C-b><C-b> :bnext<CR>
|
|
|
|
|
|
|
|
|
|
" move by visual lines when moving instead of physical lines
|
|
|
|
|
noremap <buffer> <silent> k gk
|
|
|
|
|
noremap <buffer> <silent> j gj
|
|
|
|
@ -317,7 +318,9 @@ noremap <buffer> <silent> $ g$
|
|
|
|
|
" Normal Mode ---------------------------------------------------------------{{{
|
|
|
|
|
" toggle line numbering with <leader>n
|
|
|
|
|
nnoremap <leader>n :set number!<CR>
|
|
|
|
|
set number
|
|
|
|
|
|
|
|
|
|
" line numbers should be hidden by default
|
|
|
|
|
set nonumber
|
|
|
|
|
|
|
|
|
|
" Shortcut to show invisible characters
|
|
|
|
|
nnoremap <leader>l :set list!<CR>
|
|
|
|
@ -333,6 +336,12 @@ noremap <Leader>ci NERDComInvertComment
|
|
|
|
|
|
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
|
|
|
|
|
|
" Buffers -------------------------------------------------------------------{{{
|
|
|
|
|
"
|
|
|
|
|
" nmap
|
|
|
|
|
|
|
|
|
|
" ---------------------------------------------------------------------------}}}
|
|
|
|
|
|
|
|
|
|
" Git -----------------------------------------------------------------------{{{
|
|
|
|
|
let g:signify_disable_by_default = 1
|
|
|
|
|
|
|
|
|
@ -349,6 +358,8 @@ nmap <leader>vc :Git commit<CR>
|
|
|
|
|
nmap <leader>vp :Git push<CR>
|
|
|
|
|
nmap <leader>va :Git add %<CR>
|
|
|
|
|
|
|
|
|
|
" fart
|
|
|
|
|
|
|
|
|
|
nmap <leader>vj <plug>(signify-next-hunk)
|
|
|
|
|
nmap <leader>vk <plug>(signify-prev-hunk)
|
|
|
|
|
|
|
|
|
|