diff options
-rw-r--r-- | doc/git | 2 | ||||
-rw-r--r-- | vimrc-full | 15 |
2 files changed, 10 insertions, 7 deletions
@@ -0,0 +1,2 @@ | |||
1 | undo last commit: git reset HEAD~ | ||
2 | diff two branches: git diff branch1 branch2 path/to/file | ||
@@ -252,7 +252,7 @@ if has("autocmd") | |||
252 | augroup set_window_title " { | 252 | augroup set_window_title " { |
253 | " autocmd BufWinEnter quickfix setl statusline=%t | 253 | " autocmd BufWinEnter quickfix setl statusline=%t |
254 | " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]" | 254 | " autocmd BufEnter * let &titlestring = hostname() . "[vim(" . expand("%:t") . ")]" |
255 | autocmd CursorHold * let &titlestring = "%t|".$USER."@".hostname().":%{expand(\"%:~:.:h\")}%=%y" | 255 | autocmd CursorHold * let &titlestring = "%y %t | ".$USER."@".hostname().":%{expand(\"%:~:.:h\")}" |
256 | set title | 256 | set title |
257 | " autocmd CursorHold * let &titlestring = "Vim (".airline#extensions#tagbar#currenttag().")" | 257 | " autocmd CursorHold * let &titlestring = "Vim (".airline#extensions#tagbar#currenttag().")" |
258 | 258 | ||
@@ -366,7 +366,7 @@ if has("autocmd") | |||
366 | 366 | ||
367 | augroup CurrentFileName | 367 | augroup CurrentFileName |
368 | " highlight the current files name inside the document... | 368 | " highlight the current files name inside the document... |
369 | let @g = ":exe ':match IncSearch /'.escape(expand('%:t'), '.').'/'" | 369 | let @g = ":exe ':match SpellBad /'.escape(expand('%:t'), '.').'/'" |
370 | " put the current files name after the cursor... | 370 | " put the current files name after the cursor... |
371 | let @f = ":exe ':normal a'.expand('%:t')" | 371 | let @f = ":exe ':normal a'.expand('%:t')" |
372 | 372 | ||
@@ -398,11 +398,11 @@ if has("autocmd") | |||
398 | \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.')<CR>:stopinsert<CR>:set readonly<CR> | 398 | \ :execute ':!nvr --servername /tmp/nvimsocket --remote % +'.line('.')<CR>:stopinsert<CR>:set readonly<CR> |
399 | 399 | ||
400 | menu &Verify.&Textwidth\ and\ white\ space | 400 | menu &Verify.&Textwidth\ and\ white\ space |
401 | \ :execute ':match ColorColumn /\%>'.&textwidth.'v./'<CR> | 401 | \ :execute ':match SpellBad /\%>'.&textwidth.'v./'<CR> |
402 | \ :2match IncSearch /\s\+$/<CR> | 402 | \ :2match SpellBad /\s\+$/<CR> |
403 | 403 | ||
404 | menu &Verify.Highlight\ current\ file\ name | 404 | menu &Verify.Highlight\ current\ file\ name |
405 | \ :execute ':match ColorColumn /'.escape(expand('%:t'), '.').'/'<CR> | 405 | \ :execute ':match SpellBad /'.escape(expand('%:t'), '.').'/'<CR> |
406 | menu &Window.-Sep- : | 406 | menu &Window.-Sep- : |
407 | 407 | ||
408 | menu &Window.Quickfix\ List | 408 | menu &Window.Quickfix\ List |
@@ -585,7 +585,7 @@ let g:lightline_buffer_minfextlen = 3 | |||
585 | let g:lightline_buffer_reservelen = 20 | 585 | let g:lightline_buffer_reservelen = 20 |
586 | 586 | ||
587 | let g:lightline = { | 587 | let g:lightline = { |
588 | \ 'colorscheme': 'Tomorrow_Night_Blue', | 588 | \ 'colorscheme': 'Tomorrow_Night_Bright', |
589 | \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, | 589 | \ 'separator': { 'left': "\ue0b0", 'right': "\ue0b2" }, |
590 | \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, | 590 | \ 'subseparator': { 'left': "\ue0b1", 'right': "\ue0b3" }, |
591 | \ 'active': { | 591 | \ 'active': { |
@@ -804,4 +804,5 @@ set background=light | |||
804 | set scrolloff=0 | " keeps cursor centered | 804 | set scrolloff=0 | " keeps cursor centered |
805 | autocmd VimEnter,WinEnter * exec ':set scrolljump='.winheight(0)/2 | 805 | autocmd VimEnter,WinEnter * exec ':set scrolljump='.winheight(0)/2 |
806 | 806 | ||
807 | 807 | " display highlight group under the cursor | |
808 | map <leader>h :echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")') | ||