commit 30350c9e6de63f0b009e572e1f531c2aca1818c2
parent 3e37dbd61d2af256f55a6f3bcca3fa1427cb3be3
Author: pyratebeard <root@pyratebeard.net>
Date: Sun, 12 Sep 2021 22:46:58 +0100
lots of updates to mutiny theme. add gitv plugin, set nerdtree window size. change signify symbols
Diffstat:
2 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/vim/.vim/colors/mutiny.vim b/vim/.vim/colors/mutiny.vim
@@ -25,24 +25,25 @@ hi Comment term=NONE cterm=NONE ctermfg=5 ctermbg=NONE
hi Constant term=NONE cterm=NONE ctermfg=3 ctermbg=NONE
hi Conditional term=NONE cterm=NONE ctermfg=255 ctermbg=NONE
hi Cursor term=NONE cterm=NONE ctermfg=242 ctermbg=NONE
-hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=234
-hi DiffAdd term=NONE cterm=NONE ctermfg=2 ctermbg=NONE
-hi DiffChange term=NONE cterm=NONE ctermfg=11 ctermbg=0
-hi DiffDelete term=NONE cterm=NONE ctermfg=1 ctermbg=0
-hi DiffText term=NONE cterm=NONE ctermfg=1 ctermbg=8
+hi CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=235
+hi DiffAdd term=NONE cterm=NONE ctermfg=2 ctermbg=235
+hi DiffChange term=NONE cterm=NONE ctermfg=11 ctermbg=235
+hi DiffDelete term=NONE cterm=NONE ctermfg=1 ctermbg=235
+hi DiffText term=NONE cterm=NONE ctermfg=1 ctermbg=235
hi Directory term=NONE cterm=NONE ctermfg=7 ctermbg=NONE
hi Error term=NONE cterm=NONE ctermfg=238 ctermbg=1
hi ErrorMsg term=NONE cterm=NONE ctermfg=1 ctermbg=16
hi FoldColumn term=NONE cterm=NONE ctermfg=238 ctermbg=NONE
hi Folded term=NONE cterm=NONE ctermfg=238 ctermbg=NONE
hi Function term=NONE cterm=NONE ctermfg=14 ctermbg=NONE
-hi Identifier term=NONE cterm=NONE ctermfg=1 ctermbg=NONE
+hi Identifier term=NONE cterm=NONE ctermfg=13 ctermbg=NONE
hi IncSearch term=NONE cterm=NONE ctermfg=0 ctermbg=3
hi MatchParen term=NONE cterm=NONE ctermfg=0 ctermbg=1
hi NonText term=NONE cterm=NONE ctermfg=238 ctermbg=NONE
hi Normal term=NONE cterm=NONE ctermfg=249 ctermbg=NONE
hi PreProc term=NONE cterm=NONE ctermfg=10 ctermbg=NONE
hi Search term=NONE cterm=NONE ctermfg=0 ctermbg=11
+hi SignColumn term=NONE cterm=NONE ctermfg=NONE ctermbg=235
hi Special term=NONE cterm=NONE ctermfg=2 ctermbg=NONE
hi SpecialKey term=NONE cterm=NONE ctermfg=3 ctermbg=NONE
hi SpellBad term=NONE cterm=NONE ctermfg=15 ctermbg=1
@@ -54,13 +55,13 @@ hi Todo term=NONE cterm=NONE ctermfg=3 ctermbg=5
hi Type term=NONE cterm=NONE ctermfg=4 ctermbg=NONE
hi VertSplit term=NONE cterm=NONE ctermfg=236 ctermbg=0
hi Visual term=NONE cterm=NONE ctermfg=16 ctermbg=11
-hi WarningMsg term=NONE cterm=NONE ctermfg=13 ctermbg=NONE
-hi LineNr term=NONE cterm=NONE ctermfg=237 ctermbg=0
-hi CursorLineNr term=NONE cterm=NONE ctermfg=16 ctermbg=237
-hi Pmenu term=NONE cterm=NONE ctermfg=249 ctermbg=16
+hi WarningMsg term=NONE cterm=NONE ctermfg=1 ctermbg=NONE
+hi LineNr term=NONE cterm=NONE ctermfg=241 ctermbg=235
+hi CursorLineNr term=NONE cterm=NONE ctermfg=241 ctermbg=233
+hi Pmenu term=NONE cterm=NONE ctermfg=249 ctermbg=NONE
hi PmenuSel term=NONE cterm=NONE ctermfg=3 ctermbg=5
-hi PmenuSbar term=NONE cterm=NONE ctermfg=238 ctermbg=5
-hi PmenuThumb term=NONE cterm=NONE ctermfg=238 ctermbg=5
+hi PmenuSbar term=NONE cterm=NONE ctermfg=238 ctermbg=241
+hi PmenuThumb term=NONE cterm=NONE ctermfg=238 ctermbg=13
hi Underlined term=underline cterm=underline ctermfg=NONE ctermbg=NONE
hi! link diffAdded DiffAdd
diff --git a/vim/.vimrc b/vim/.vimrc
@@ -152,27 +152,14 @@ if 1 " boolean for plugin loading
Plugin 'ajh17/VimCompletesMe'
Plugin 'mhinz/vim-signify'
Plugin 'junegunn/goyo.vim'
+ Plugin 'gregsexton/gitv'
call vundle#end()
" nerdtree - workaround for https://github.com/scrooloose/nerdtree/issues/643
let g:NERDTreeDirArrows = 1
let g:NERDTreeShowHidden = 1
-
- " git-gutter http://git.io/vimgitgutter
- let g:gitgutter_realtime = 1
- let g:gitgutter_eager = 1
- let g:gitgutter_diff_args = '-w'
- let g:gitgutter_sign_added = '+'
- let g:gitgutter_sign_modified = '~'
- let g:gitgutter_sign_removed = '-'
- let g:gitgutter_sign_removed_first_line = '^'
- let g:gitgutter_sign_modified_removed = ':'
- let g:gitgutter_max_signs = 1500
- highlight clear SignColumn
- highlight GitGutterAdd ctermfg=green ctermbg=237
- highlight GitGutterChange ctermfg=yellow ctermbg=237
- highlight GitGutterDelete ctermfg=red ctermbg=237
- highlight GitGutterChangeDelete ctermfg=red ctermbg=237
+ " smaller default window size
+ let g:NERDTreeWinSize = 25
" ag, the silver searcher http://git.io/AEu3dQ + http://git.io/d9N0MA
let g:ag_prg="ag -i --vimgrep"
@@ -189,6 +176,11 @@ if 1 " boolean for plugin loading
let g:vimwiki_list = [pyratewiki]
+ " vim-signify (diffs)
+ let g:signify_sign_add = '░'
+ let g:signify_sign_change = '░'
+ let g:signify_sign_delete = '░'
+
" lightline
set laststatus=2
let g:lightline = {