From d454de9e31e3885bc2e2fe53c85176de6b80c2f9 Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Thu, 1 Nov 2018 13:48:28 +0000 Subject: [PATCH] update --- vim/colors/monotonous2.erb | 13 ++++++++++++- vim/colors/monotonous2.vim | 18 ++++++++++++++++-- vimrc | 36 ++++++++++++++++++++++-------------- 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/vim/colors/monotonous2.erb b/vim/colors/monotonous2.erb index 1ddbffc..67b84a2 100644 --- a/vim/colors/monotonous2.erb +++ b/vim/colors/monotonous2.erb @@ -237,16 +237,27 @@ [ "EndOfBuffer", gray_bg, gray_bg, "NONE" ], + [ "TabLineNum", gray_deco, gray4, "bold"], [ "TabLineNumSel", gray_deco, gray5, "bold"], + [ "StatusLineNoise", gray_deco, gray3, "NONE"], + [ "StatusLineNoiseActive", gray_deco, gray4, "NONE"], + + [ "StatusLineBufferNr", gray_deco, gray6, "bold"], + [ "StatusLineBufferNrActive", gray_deco, gray7, "bold"], + + [ "StatusLinePercent", gray_deco, gray4, "bold"], + [ "StatusLinePercentActive", gray_deco, gray6, "bold"], + [ "StatusLineLinecount", gray_deco, gray4, "bold"], + [ "StatusLineLinecountActive", gray_deco, gray5, "bold"], + [ "StatusLineDivActive", gray4, gray4, "NONE"], [ "StatusLineDivInput", blue_bg0, blue_bg0, "NONE"], [ "StatusLineDivMod", red_ui1, red_ui1, "NONE"], [ "StatusLineDivModActive", red_ui4, red_ui4, "NONE"], - [ "StatusLineBufferNrActive", gray_deco, gray6, "NONE"], [ "GitGutterDelete", "NONE", red_ui3, "bold"], [ "GitGutterChange", "NONE", blue_ui3, "bold"], diff --git a/vim/colors/monotonous2.vim b/vim/colors/monotonous2.vim index 5df2045..f0ee152 100644 --- a/vim/colors/monotonous2.vim +++ b/vim/colors/monotonous2.vim @@ -86,11 +86,18 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") hi EndOfBuffer ctermbg=234 ctermfg=234 cterm=NONE guibg=#2a2c2d guifg=#2a2c2d gui=NONE hi TabLineNum ctermbg=238 ctermfg=243 cterm=bold guibg=#474949 guifg=#707171 gui=bold hi TabLineNumSel ctermbg=238 ctermfg=244 cterm=bold guibg=#474949 guifg=#848585 gui=bold + hi StatusLineNoise ctermbg=238 ctermfg=240 cterm=NONE guibg=#474949 guifg=#5c5d5d gui=NONE + hi StatusLineNoiseActive ctermbg=238 ctermfg=243 cterm=NONE guibg=#474949 guifg=#707171 gui=NONE + hi StatusLineBufferNr ctermbg=238 ctermfg=247 cterm=bold guibg=#474949 guifg=#999a9a gui=bold + hi StatusLineBufferNrActive ctermbg=238 ctermfg=250 cterm=bold guibg=#474949 guifg=#adaeae gui=bold + hi StatusLinePercent ctermbg=238 ctermfg=243 cterm=bold guibg=#474949 guifg=#707171 gui=bold + hi StatusLinePercentActive ctermbg=238 ctermfg=247 cterm=bold guibg=#474949 guifg=#999a9a gui=bold + hi StatusLineLinecount ctermbg=238 ctermfg=243 cterm=bold guibg=#474949 guifg=#707171 gui=bold + hi StatusLineLinecountActive ctermbg=238 ctermfg=244 cterm=bold guibg=#474949 guifg=#848585 gui=bold hi StatusLineDivActive ctermbg=243 ctermfg=243 cterm=NONE guibg=#707171 guifg=#707171 gui=NONE hi StatusLineDivInput ctermbg=17 ctermfg=17 cterm=NONE guibg=#384046 guifg=#384046 gui=NONE hi StatusLineDivMod ctermbg=124 ctermfg=124 cterm=NONE guibg=#655757 guifg=#655757 gui=NONE hi StatusLineDivModActive ctermbg=124 ctermfg=124 cterm=NONE guibg=#916c6c guifg=#916c6c gui=NONE - hi StatusLineBufferNrActive ctermbg=238 ctermfg=247 cterm=NONE guibg=#474949 guifg=#999a9a gui=NONE hi GitGutterDelete ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold hi GitGutterChange ctermbg=NONE ctermfg=19 cterm=bold guibg=NONE guifg=#596171 gui=bold hi GitGutterAdd ctermbg=NONE ctermfg=34 cterm=bold guibg=NONE guifg=#496349 gui=bold @@ -171,11 +178,18 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 hi EndOfBuffer ctermbg=black ctermfg=black cterm=NONE hi TabLineNum ctermbg=gray ctermfg=gray cterm=bold hi TabLineNumSel ctermbg=gray ctermfg=darkgray cterm=bold + hi StatusLineNoise ctermbg=gray ctermfg=gray cterm=NONE + hi StatusLineNoiseActive ctermbg=gray ctermfg=gray cterm=NONE + hi StatusLineBufferNr ctermbg=gray ctermfg=darkgray cterm=bold + hi StatusLineBufferNrActive ctermbg=gray ctermfg=white cterm=bold + hi StatusLinePercent ctermbg=gray ctermfg=gray cterm=bold + hi StatusLinePercentActive ctermbg=gray ctermfg=darkgray cterm=bold + hi StatusLineLinecount ctermbg=gray ctermfg=gray cterm=bold + hi StatusLineLinecountActive ctermbg=gray ctermfg=darkgray cterm=bold hi StatusLineDivActive ctermbg=gray ctermfg=gray cterm=NONE hi StatusLineDivInput ctermbg=darkblue ctermfg=darkblue cterm=NONE hi StatusLineDivMod ctermbg=red ctermfg=red cterm=NONE hi StatusLineDivModActive ctermbg=red ctermfg=red cterm=NONE - hi StatusLineBufferNrActive ctermbg=gray ctermfg=darkgray cterm=NONE hi GitGutterDelete ctermbg=NONE ctermfg=red cterm=bold hi GitGutterChange ctermbg=NONE ctermfg=blue cterm=bold hi GitGutterAdd ctermbg=NONE ctermfg=green cterm=bold diff --git a/vimrc b/vimrc index 5c52961..3f09796 100644 --- a/vimrc +++ b/vimrc @@ -1211,10 +1211,10 @@ function! GetStatus(isactive) abort "{{{ " file percentage {{{ if a:isactive let l:statusline .= '%#StatusLinePercentActive#' - let l:statusline .= ' %P %#StatusLineDirActive#of %#StatusLineFileActive#%L ' + let l:statusline .= ' %P %#StatusLineNoiseActive#of %#StatusLineLinecountActive#%L ' else let l:statusline .= '%#StatusLinePercent#' - let l:statusline .= ' %P %#StatusLineDir#of %#StatusLinePercent#%L ' + let l:statusline .= ' %P %#StatusLineNoise#of %#StatusLineLinecount#%L ' endif"}}} " non-empty buftype (help, quickfix, etc) {{{ @@ -1247,7 +1247,7 @@ function! GetStatus(isactive) abort "{{{ " file info{{{ if a:isactive == 1 " let l:statusline.=l:active - let l:statusline.='%#StatusLineFileActive#' + let l:statusline.='%#StatusLineFileInfo#' " let l:statusline.=" %{strlen(&ft)?&ft:'none'} " " let l:statusline.=l:separator . l:active let l:statusline.=' %{strlen(&fenc)?&fenc:&enc} ' @@ -1339,17 +1339,23 @@ endfunction "}}} " highlight groups {{{ -hi TESTXX guifg=#ffffff guibg=#ff0000 - hi def link StatusLineSeparator Ignore hi def link StatusLineNormal StatusLineNC hi def link StatusLineActive StatusLine hi def link StatusLineNormalNoText TabLineFill hi def link StatusLineActiveNoText TabLineFill +hi def link StatusLineNoise StatusLineNormal +hi def link StatusLineNoiseActive StatusLineNormal + hi def link StatusLineBufferNr StatusLineNormal hi def link StatusLineBufferNrActive StatusLineActive +hi def link StatusLinePercent StatusLineNormal +hi def link StatusLinePercentActive StatusLineActive +hi def link StatusLineLinecount StatusLinePercent +hi def link StatusLineLinecountActive StatusLinePercentActive + hi DivActive ctermbg=darkgray ctermfg=darkgray guibg=#666666 guifg=#666666 hi DivMod ctermbg=darkred ctermfg=darkred guibg=#660000 guifg=#660000 hi DivModActive ctermbg=red ctermfg=red guibg=#aa0000 guifg=#aa0000 @@ -1360,18 +1366,20 @@ hi def link StatusLineDivMod DivMod hi def link StatusLineDivModActive DivModActive hi def link StatusLineDivInput DivInput -" hi def link StatusLineFile -" hi def link StatusLineFileActive -" hi def link StatusLineDir -" hi def link StatusLineDirActive -" hi def link StatusLineDot -" hi def link StatusLineDotActive -" hi def link StatusLineExt -" hi def link StatusLineExtActive +hi def link StatusLineFileInfo StatusLineActive + +hi def link StatusLineFile StatusLineNormal +hi def link StatusLineFileActive StatusLineActive +hi def link StatusLineDir StatusLineFile +hi def link StatusLineDirActive StatusLineFileActive +hi def link StatusLineDot StatusLineDir +hi def link StatusLineDotActive StatusLineDirActive +hi def link StatusLineExt StatusLineDir +hi def link StatusLineExtActive StatusLineDirActive " hi def link StatusLineWarning " hi def link StatusLineWarningActive -" hi def link LinterDash +hi def link LinterDash StatusLineNoise " hi def link LinterDashActive " hi def link LinterError " hi def link LinterErrorInactive