From 3f49ece0b1f1d1da067fec49bf0c87dd5ffc906a Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Thu, 1 Nov 2018 17:57:43 +0000 Subject: [PATCH] update --- vim/colors/monotonous2.erb | 37 ++++++++++++++++++++++++++++ vim/colors/monotonous2.vim | 50 ++++++++++++++++++++++++++++++++++++++ vimrc | 19 ++++++--------- 3 files changed, 94 insertions(+), 12 deletions(-) diff --git a/vim/colors/monotonous2.erb b/vim/colors/monotonous2.erb index 67b84a2..36018b6 100644 --- a/vim/colors/monotonous2.erb +++ b/vim/colors/monotonous2.erb @@ -90,8 +90,14 @@ purple_ui3 = ["#5c4a5a", 126, "magenta"] error = ["#c74444", 196, "red"] + error_ui = ["#833838", 196, "red"] + error_ui_dark = ["#6a2e2e", 196, "red"] warning = ["#a67038", 166, "yellow"] + warning_ui = ["#775538", 166, "yellow"] + warning_ui_dark = ["#553d2b", 166, "yellow"] info = ["#797532", 166, "yellow"] + info_ui = ["#615b41", 166, "yellow"] + info_ui_dark = ["#44402e", 166, "yellow"] menubg = gray1 menufg = gray5 @@ -258,6 +264,37 @@ [ "StatusLineDivMod", red_ui1, red_ui1, "NONE"], [ "StatusLineDivModActive", red_ui4, red_ui4, "NONE"], + [ "StatusLineFileInfo", "NONE", gray4, "italic"], + + [ "StatusLineFile", gray_deco, gray6, "italic"], + [ "StatusLineFileActive", gray_deco, gray7, "italic"], + [ "StatusLineDir", gray_deco, gray4, "italic"], + [ "StatusLineDirActive", gray_deco, gray4, "italic"], + [ "StatusLineExt", gray_deco, gray4, "italic"], + [ "StatusLineExtActive", gray_deco, gray5, "italic"], + [ "StatusLineDot", gray_deco, gray3, "italic"], + [ "StatusLineDotActive", gray_deco, gray3, "italic"], + + [ "StatusLineFileReadOnly", gray_deco, red_ui3, "italic"], + [ "StatusLineFileReadOnlyActive", "NONE", red_ui3, "italic"], + [ "StatusLineWarning", gray_deco, gray5, "bold"], + [ "StatusLineWarningActive", "NONE", red_ui3, "bold"], + + [ "LinterDash", "NONE", gray2, "NONE"], + [ "LinterDashActive", "NONE", gray3, "NONE"], + + [ "LinterError", "NONE", error_ui_dark, "bold"], + [ "LinterErrorActive", "NONE", error_ui, "bold"], + [ "LinterErrorStyle", "NONE", error_ui_dark, "NONE"], + [ "LinterErrorStyleActive", "NONE", error_ui, "NONE"], + + [ "LinterWarning", "NONE", warning_ui_dark, "bold"], + [ "LinterWarningActive", "NONE", warning_ui, "bold"], + [ "LinterWarningStyle", "NONE", warning_ui_dark, "NONE"], + [ "LinterWarningStyleActive", "NONE", warning_ui, "NONE"], + + [ "LinterInfo", "NONE", info_ui_dark, "bold"], + [ "LinterInfoActive", "NONE", info_ui, "bold"], [ "GitGutterDelete", "NONE", red_ui3, "bold"], [ "GitGutterChange", "NONE", blue_ui3, "bold"], diff --git a/vim/colors/monotonous2.vim b/vim/colors/monotonous2.vim index f0ee152..ae97a61 100644 --- a/vim/colors/monotonous2.vim +++ b/vim/colors/monotonous2.vim @@ -98,6 +98,31 @@ if ($TERM =~ '256' || &t_Co >= 256) || has("gui_running") 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 StatusLineFileInfo ctermbg=NONE ctermfg=243 cterm=italic guibg=NONE guifg=#707171 gui=italic + hi StatusLineFile ctermbg=238 ctermfg=247 cterm=italic guibg=#474949 guifg=#999a9a gui=italic + hi StatusLineFileActive ctermbg=238 ctermfg=250 cterm=italic guibg=#474949 guifg=#adaeae gui=italic + hi StatusLineDir ctermbg=238 ctermfg=243 cterm=italic guibg=#474949 guifg=#707171 gui=italic + hi StatusLineDirActive ctermbg=238 ctermfg=243 cterm=italic guibg=#474949 guifg=#707171 gui=italic + hi StatusLineExt ctermbg=238 ctermfg=243 cterm=italic guibg=#474949 guifg=#707171 gui=italic + hi StatusLineExtActive ctermbg=238 ctermfg=244 cterm=italic guibg=#474949 guifg=#848585 gui=italic + hi StatusLineDot ctermbg=238 ctermfg=240 cterm=italic guibg=#474949 guifg=#5c5d5d gui=italic + hi StatusLineDotActive ctermbg=238 ctermfg=240 cterm=italic guibg=#474949 guifg=#5c5d5d gui=italic + hi StatusLineFileReadOnly ctermbg=238 ctermfg=124 cterm=italic guibg=#474949 guifg=#725454 gui=italic + hi StatusLineFileReadOnlyActive ctermbg=NONE ctermfg=124 cterm=italic guibg=NONE guifg=#725454 gui=italic + hi StatusLineWarning ctermbg=238 ctermfg=244 cterm=bold guibg=#474949 guifg=#848585 gui=bold + hi StatusLineWarningActive ctermbg=NONE ctermfg=124 cterm=bold guibg=NONE guifg=#725454 gui=bold + hi LinterDash ctermbg=NONE ctermfg=238 cterm=NONE guibg=NONE guifg=#474949 gui=NONE + hi LinterDashActive ctermbg=NONE ctermfg=240 cterm=NONE guibg=NONE guifg=#5c5d5d gui=NONE + hi LinterError ctermbg=NONE ctermfg=196 cterm=bold guibg=NONE guifg=#6a2e2e gui=bold + hi LinterErrorActive ctermbg=NONE ctermfg=196 cterm=bold guibg=NONE guifg=#833838 gui=bold + hi LinterErrorStyle ctermbg=NONE ctermfg=196 cterm=NONE guibg=NONE guifg=#6a2e2e gui=NONE + hi LinterErrorStyleActive ctermbg=NONE ctermfg=196 cterm=NONE guibg=NONE guifg=#833838 gui=NONE + hi LinterWarning ctermbg=NONE ctermfg=166 cterm=bold guibg=NONE guifg=#553d2b gui=bold + hi LinterWarningActive ctermbg=NONE ctermfg=166 cterm=bold guibg=NONE guifg=#775538 gui=bold + hi LinterWarningStyle ctermbg=NONE ctermfg=166 cterm=NONE guibg=NONE guifg=#553d2b gui=NONE + hi LinterWarningStyleActive ctermbg=NONE ctermfg=166 cterm=NONE guibg=NONE guifg=#775538 gui=NONE + hi LinterInfo ctermbg=NONE ctermfg=166 cterm=bold guibg=NONE guifg=#44402e gui=bold + hi LinterInfoActive ctermbg=NONE ctermfg=166 cterm=bold guibg=NONE guifg=#615b41 gui=bold 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 @@ -190,6 +215,31 @@ elseif &t_Co == 8 || $TERM !~# '^linux' || &t_Co == 16 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 StatusLineFileInfo ctermbg=NONE ctermfg=gray cterm=italic + hi StatusLineFile ctermbg=gray ctermfg=darkgray cterm=italic + hi StatusLineFileActive ctermbg=gray ctermfg=white cterm=italic + hi StatusLineDir ctermbg=gray ctermfg=gray cterm=italic + hi StatusLineDirActive ctermbg=gray ctermfg=gray cterm=italic + hi StatusLineExt ctermbg=gray ctermfg=gray cterm=italic + hi StatusLineExtActive ctermbg=gray ctermfg=darkgray cterm=italic + hi StatusLineDot ctermbg=gray ctermfg=gray cterm=italic + hi StatusLineDotActive ctermbg=gray ctermfg=gray cterm=italic + hi StatusLineFileReadOnly ctermbg=gray ctermfg=red cterm=italic + hi StatusLineFileReadOnlyActive ctermbg=NONE ctermfg=red cterm=italic + hi StatusLineWarning ctermbg=gray ctermfg=darkgray cterm=bold + hi StatusLineWarningActive ctermbg=NONE ctermfg=red cterm=bold + hi LinterDash ctermbg=NONE ctermfg=gray cterm=NONE + hi LinterDashActive ctermbg=NONE ctermfg=gray cterm=NONE + hi LinterError ctermbg=NONE ctermfg=red cterm=bold + hi LinterErrorActive ctermbg=NONE ctermfg=red cterm=bold + hi LinterErrorStyle ctermbg=NONE ctermfg=red cterm=NONE + hi LinterErrorStyleActive ctermbg=NONE ctermfg=red cterm=NONE + hi LinterWarning ctermbg=NONE ctermfg=yellow cterm=bold + hi LinterWarningActive ctermbg=NONE ctermfg=yellow cterm=bold + hi LinterWarningStyle ctermbg=NONE ctermfg=yellow cterm=NONE + hi LinterWarningStyleActive ctermbg=NONE ctermfg=yellow cterm=NONE + hi LinterInfo ctermbg=NONE ctermfg=yellow cterm=bold + hi LinterInfoActive ctermbg=NONE ctermfg=yellow cterm=bold 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 1152067..1f22332 100644 --- a/vimrc +++ b/vimrc @@ -690,8 +690,7 @@ function! GetLinterStatus(key) abort "{{{ if has_key(l:linter, a:key) let l:statuscount = l:linter[a:key] endif - " return l:statuscount - return 3 + return l:statuscount endfunction "}}} @@ -1252,13 +1251,13 @@ function! GetStatus(isactive) abort "{{{ 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} ' + let l:statusline.='%{strlen(&fenc)?&fenc:&enc}' " let l:statusline.=l:separator . l:active - let l:statusline.=' %{&fileformat} ' - let l:statusline.="%{strlen(expand('%:e'))?expand('%:e'):expand('%:e')}" + let l:statusline.=' %{&fileformat}' + let l:statusline.="%{strlen(expand('%:e')) > 1?' ' . expand('%:e'):''}" " let l:statusline.=l:separator . l:active " let l:statusline.=' %{&spelllang} ' - let l:statusline.=l:separator + let l:statusline .= l:separator endif "}}} @@ -1290,7 +1289,7 @@ function! GetStatus(isactive) abort "{{{ let l:statusline.="%{strlen(expand('%:e'))?expand('%:e'):expand('%:e')} " endif else - let l:statusline .= ' %#StatusLineFileReadOnly#%r' + let l:statusline .= ' %#StatusLineWarning#%r' let l:statusline.='%#StatusLineDir# ' let l:statusline.="%{fnamemodify(expand('%:p:h'),':~')}/" let l:statusline.='%#StatusLineFile#' @@ -1395,14 +1394,10 @@ hi def link StatusLineDotActive StatusLineDirActive hi def link StatusLineExt StatusLineDir hi def link StatusLineExtActive StatusLineDirActive -hi def link StatusLineFileReadOnly StatusLineNormal hi def link StatusLineFileReadOnlyActive WarningMsg -hi def link StatusLineWarning Normal +hi def link StatusLineWarning StatusLineNormal hi def link StatusLineWarningActive WarningMsg -hi TESTXX guibg=#ff0000 guifg=#ffffff -hi def link Linter TESTXX - hi def link LinterDash Normal hi def link LinterDashActive Normal