From 64a2579c00ffe939dac69deae3bff0c87de18c21 Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Mon, 7 May 2018 22:10:40 +0100 Subject: [PATCH] moved statusline colours to color scheme file --- vim/colors/monotonous.vim | 56 ++++++++++++++++++++++++++++++++++++--- vimrc.d/statusline.vim | 49 ---------------------------------- 2 files changed, 52 insertions(+), 53 deletions(-) diff --git a/vim/colors/monotonous.vim b/vim/colors/monotonous.vim index ec89083..9821c97 100644 --- a/vim/colors/monotonous.vim +++ b/vim/colors/monotonous.vim @@ -12,8 +12,6 @@ let g:d_normal_bg = has('gui_running') ? '#000000' : 'NONE' let g:l_normal_fg = '#424242' let g:l_normal_bg = '#dddddd' -" call SetColor('', '', '', '', '', '') - call SetColor('Normal', g:d_normal_fg, g:d_normal_bg, g:l_normal_fg, g:l_normal_bg, '') " highlight groups @@ -125,8 +123,58 @@ call SetColor('Error', '#ee0000', '', '#cc0000', '', 'bold') hi! Noise guifg=#333333 "}}} -" TabLine function +" StatusLine function +" colors +hi clear StatusLine"{{{ +hi StatusLine ctermfg=239 guifg=#555555 ctermbg=232 guibg=NONE gui=NONE +hi StatusLineNC ctermfg=238 guifg=#444444 ctermbg=232 guibg=NONE term=none cterm=none gui=NONE +hi StatusLineNormal ctermfg=243 guifg=#777777 ctermbg=234 guibg=#1c1c1c term=none cterm=none +hi StatusLineNormalNoText ctermfg=234 guifg=#1c1c1c ctermbg=234 guibg=#1c1c1c term=none cterm=none +hi StatusLineActive ctermfg=255 guifg=#ffffff ctermbg=239 guibg=#4e4e4e term=none cterm=none +hi StatusLineActiveNoText ctermfg=239 guifg=#4e4e4e ctermbg=239 guibg=#4e4e4e term=none cterm=none +hi StatusLineActiveQuotes ctermfg=244 guifg=#888888 ctermbg=239 guibg=#4e4e4e term=none cterm=none + +hi StatusLineSeparator ctermfg=255 guifg=#ffffff ctermbg=232 guibg=NONE +hi StatusLineDir ctermfg=241 guifg=#666666 ctermbg=234 guibg=#1c1c1c +hi StatusLineDirActive ctermfg=243 guifg=#777777 ctermbg=237 guibg=#3a3a3a +hi StatusLineFile ctermfg=250 guifg=#cccccc ctermbg=234 guibg=#1c1c1c +hi StatusLineFileActive ctermfg=255 guifg=#eeeeee ctermbg=237 guibg=#3a3a3a +hi StatusLineDot ctermfg=241 guifg=#606060 ctermbg=234 guibg=#1c1c1c +hi StatusLineDotActive ctermfg=244 guifg=#808080 ctermbg=237 guibg=#3a3a3a +hi StatusLineExt ctermfg=243 guifg=#777777 ctermbg=234 guibg=#1c1c1c +hi StatusLineExtActive ctermfg=249 guifg=#bbbbbb ctermbg=239 guibg=#3a3a3a +hi StatusLinePercent ctermfg=241 guifg=#555555 ctermbg=233 guibg=#111111 +hi StatusLinePercentActive ctermfg=243 guifg=#777777 ctermbg=233 guibg=#111111 +" hi StatusLineMod ctermfg=255 guifg=#ffffff ctermbg=88 guibg=#490000 + +" TODO get cterm colors same as gui ones for all the following highlights +hi StatusLineDiv ctermfg=233 guifg=#111111 ctermbg=233 guibg=#111111 term=none cterm=none +hi StatusLineDivActive ctermfg=234 guifg=#1c1c1c ctermbg=234 guibg=#1c1c1c term=none cterm=none + +hi StatusLineDivMod ctermfg=234 guifg=#290000 ctermbg=234 guibg=#290000 term=none cterm=none +hi StatusLineDivModActive ctermfg=233 guifg=#450000 ctermbg=233 guibg=#450000 term=none cterm=none + +hi StatusLineDivInput ctermfg=234 guifg=#cccccc ctermbg=234 guibg=#cccccc term=none cterm=none + +hi LinterDash ctermfg=233 guifg=#222222 +hi LinterDashActive ctermfg=238 guifg=#333333 + +hi LinterError ctermfg=196 guifg=#ff0000 gui=bold +hi LinterErrorInactive ctermfg=196 guifg=#999999 gui=bold +hi LinterErrorStyle ctermfg=196 guifg=#aa0000 gui=bold +hi LinterErrorStyleInactive ctermfg=196 guifg=#858585 gui=bold + +hi LinterWarning ctermfg=88 guifg=#870000 gui=bold +hi LinterWarningInactive ctermfg=88 guifg=#717171 gui=bold +hi LinterWarningStyle ctermfg=88 guifg=#660000 gui=bold +hi LinterWarningStyleInactive ctermfg=88 guifg=#585858 gui=bold + +hi LinterInfo ctermfg=52 guifg=#440000 +"}}} + +" TabLine function +"{{{ call SetColor('TabLineFill', '', '#111111', '', '#cccccc', '') call SetColor('tabnum', '#777777', '#111111', '#777777', '#cccccc', 'italic') call SetColor('tabnumsel', '#777777', '#111111', '#222222', '#cccccc', 'italic') @@ -134,7 +182,7 @@ call SetColor('tablineitem', '#777777', '#222222', '#888888', '#cccccc', 'italic call SetColor('tablineitemsel', '#777777', '#222222', '#222222', '#cccccc', 'italic') call SetColor('TabSeparator', '#777777', '#111111', '#999999', '#cccccc', 'italic') call SetColor('TabLineNoise', '', '#111111', '', '#cccccc', '') - +"}}} "" #css, scss definitions "{{{ diff --git a/vimrc.d/statusline.vim b/vimrc.d/statusline.vim index 399f08e..7f2cdcd 100644 --- a/vimrc.d/statusline.vim +++ b/vimrc.d/statusline.vim @@ -10,55 +10,6 @@ augroup status "{{{ augroup END "}}} -" colors -hi clear StatusLine"{{{ -hi StatusLine ctermfg=239 guifg=#555555 ctermbg=232 guibg=NONE gui=NONE -hi StatusLineNC ctermfg=238 guifg=#444444 ctermbg=232 guibg=NONE term=none cterm=none gui=NONE - -hi StatusLineNormal ctermfg=243 guifg=#777777 ctermbg=234 guibg=#1c1c1c term=none cterm=none -hi StatusLineNormalNoText ctermfg=234 guifg=#1c1c1c ctermbg=234 guibg=#1c1c1c term=none cterm=none -hi StatusLineActive ctermfg=255 guifg=#ffffff ctermbg=239 guibg=#4e4e4e term=none cterm=none -hi StatusLineActiveNoText ctermfg=239 guifg=#4e4e4e ctermbg=239 guibg=#4e4e4e term=none cterm=none -hi StatusLineActiveQuotes ctermfg=244 guifg=#888888 ctermbg=239 guibg=#4e4e4e term=none cterm=none - -hi StatusLineSeparator ctermfg=255 guifg=#ffffff ctermbg=232 guibg=NONE -hi StatusLineDir ctermfg=241 guifg=#666666 ctermbg=234 guibg=#1c1c1c -hi StatusLineDirActive ctermfg=243 guifg=#777777 ctermbg=237 guibg=#3a3a3a -hi StatusLineFile ctermfg=250 guifg=#cccccc ctermbg=234 guibg=#1c1c1c -hi StatusLineFileActive ctermfg=255 guifg=#eeeeee ctermbg=237 guibg=#3a3a3a -hi StatusLineDot ctermfg=241 guifg=#606060 ctermbg=234 guibg=#1c1c1c -hi StatusLineDotActive ctermfg=244 guifg=#808080 ctermbg=237 guibg=#3a3a3a -hi StatusLineExt ctermfg=243 guifg=#777777 ctermbg=234 guibg=#1c1c1c -hi StatusLineExtActive ctermfg=249 guifg=#bbbbbb ctermbg=239 guibg=#3a3a3a -hi StatusLinePercent ctermfg=241 guifg=#555555 ctermbg=233 guibg=#111111 -hi StatusLinePercentActive ctermfg=243 guifg=#777777 ctermbg=233 guibg=#111111 -" hi StatusLineMod ctermfg=255 guifg=#ffffff ctermbg=88 guibg=#490000 - -" TODO get cterm colors same as gui ones for all the following highlights -hi StatusLineDiv ctermfg=233 guifg=#111111 ctermbg=233 guibg=#111111 term=none cterm=none -hi StatusLineDivActive ctermfg=234 guifg=#1c1c1c ctermbg=234 guibg=#1c1c1c term=none cterm=none - -hi StatusLineDivMod ctermfg=234 guifg=#290000 ctermbg=234 guibg=#290000 term=none cterm=none -hi StatusLineDivModActive ctermfg=233 guifg=#450000 ctermbg=233 guibg=#450000 term=none cterm=none - -hi StatusLineDivInput ctermfg=234 guifg=#cccccc ctermbg=234 guibg=#cccccc term=none cterm=none - -hi LinterDash ctermfg=233 guifg=#222222 -hi LinterDashActive ctermfg=238 guifg=#333333 - -hi LinterError ctermfg=196 guifg=#ff0000 gui=bold -hi LinterErrorInactive ctermfg=196 guifg=#999999 gui=bold -hi LinterErrorStyle ctermfg=196 guifg=#aa0000 gui=bold -hi LinterErrorStyleInactive ctermfg=196 guifg=#858585 gui=bold - -hi LinterWarning ctermfg=88 guifg=#870000 gui=bold -hi LinterWarningInactive ctermfg=88 guifg=#717171 gui=bold -hi LinterWarningStyle ctermfg=88 guifg=#660000 gui=bold -hi LinterWarningStyleInactive ctermfg=88 guifg=#585858 gui=bold - -hi LinterInfo ctermfg=52 guifg=#440000 -"}}} - " functions function! GetStatus(isactive) "{{{