A few changes to .vimrc
7ae2ff5eabaa3b59471099d40494a3c8adf949e7
1 parent
2d7e44d3
.vimrc
+7 -4
| 29 | 29 | set laststatus=3 " Always show status-line |
|
| 30 | 30 | set nocursorline " Highlight current line |
|
| 31 | 31 | set scrolloff=4 |
|
| 32 | 32 | set nofoldenable |
|
| 33 | 33 | set timeoutlen=200 " Set timeout between key sequences |
|
| 34 | - | set background=dark |
|
| 34 | + | set background=light |
|
| 35 | 35 | set mouse=a " Enable mouse in all modes |
|
| 36 | 36 | set directory=~/tmp,/var/tmp,/tmp,. " Keep swap files in one of these |
|
| 37 | 37 | set wmh=0 " Minimum window height = 0 |
|
| 38 | 38 | set showcmd |
|
| 39 | 39 | set updatetime=250 " How long before 'CursorHold' event |
| 45 | 45 | set foldlevel=99 " Open all folds by default |
|
| 46 | 46 | set cmdheight=1 |
|
| 47 | 47 | set matchtime=2 " Shorter brace match time |
|
| 48 | 48 | set virtualedit=block |
|
| 49 | 49 | set tags+=.tags |
|
| 50 | + | set tags+=./tags,tags; |
|
| 50 | 51 | set tags+=codex.tags |
|
| 51 | 52 | set undofile |
|
| 52 | 53 | set gdefault " Always use /g with %s/ |
|
| 53 | 54 | set colorcolumn=80 |
|
| 54 | 55 | set list |
|
| 55 | 56 | set listchars=tab:·\ ,eol:¬,trail:█ |
|
| 56 | 57 | set fillchars=diff:\ ,vert:│ |
|
| 57 | 58 | set diffopt=filler,vertical,foldcolumn:0 |
|
| 58 | 59 | set statusline=%<%f\ (%{gitbranch#name()})\ %h%m%r%=%y\ \ %-14(%{&sw}:%{&sts}:%{&ts}%)%-14.(%l,%c%V%)\ %P |
|
| 60 | + | let &statuscolumn='%=%{v:lnum} ' |
|
| 59 | 61 | set guicursor=n-v-c:block-Cursor/lCursor-blinkon0,i-ci:ver25-Cursor/lCursor,r-cr:hor20-Cursor/lCursor |
|
| 60 | 62 | set spelllang=en_us,en_gb |
|
| 61 | 63 | set completeopt=menu |
|
| 62 | 64 | set shell=/bin/sh |
|
| 63 | 65 | set signcolumn=yes |
| 211 | 213 | au BufWritePost *.hs silent !haskell-tags % '.tags' |
|
| 212 | 214 | au BufWritePost *.hsc silent !haskell-tags % '.tags' |
|
| 213 | 215 | endif |
|
| 214 | 216 | ||
| 215 | 217 | if executable('ctags') |
|
| 216 | - | au BufWritePost *.c,*.cc,*.cpp silent !ctags -f .tags -R . |
|
| 217 | - | au BufWritePost *.h silent !ctags -f .tags -R . |
|
| 218 | + | nnoremap <silent> <Leader>j <C-]> |
|
| 218 | 219 | endif |
|
| 219 | 220 | ||
| 220 | 221 | " File-type |
|
| 221 | 222 | filetype on |
|
| 222 | 223 | filetype plugin on |
| 407 | 408 | endfunction |
|
| 408 | 409 | ||
| 409 | 410 | command! Write setlocal spell | Goyo 100x98% |
|
| 410 | 411 | command! Code setlocal nospell | Goyo! |
|
| 411 | 412 | command! GitAdd silent !git add % |
|
| 413 | + | command! GitStage silent :Gitsigns stage_hunk |
|
| 414 | + | xnoremap <silent> <leader>s :Gitsigns stage_hunk<CR> |
|
| 412 | 415 | ||
| 413 | 416 | " Delete the current file. |
|
| 414 | 417 | command! Delete call delete(expand('%')) | bdelete! |
|
| 415 | 418 | ||
| 416 | 419 | if has("nvim") |
| 450 | 453 | command! CocLspLogs CocCommand workspace.showOutput |
|
| 451 | 454 | ||
| 452 | 455 | " Use custom colors. |
|
| 453 | 456 | " This has to go after plugin initialization. |
|
| 454 | 457 | try |
|
| 455 | - | colorscheme shady |
|
| 458 | + | colorscheme radiant |
|
| 456 | 459 | catch |
|
| 457 | 460 | endtry |