From 3c68ad5074d2215476390ab739dea84830d3b8b0 Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Sat, 12 May 2018 14:46:12 +0100 Subject: [PATCH] wal colours begun --- vim/colors/monotonous.vim | 59 +++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/vim/colors/monotonous.vim b/vim/colors/monotonous.vim index 431250f..18ac7f6 100644 --- a/vim/colors/monotonous.vim +++ b/vim/colors/monotonous.vim @@ -13,14 +13,25 @@ if exists('syntax_on') endif let g:colors_name = 'monotonous' +let g:wal_enable = 1 let g:d_normal_fg = '#555555' -let g:d_normal_bg = has('gui_running') ? '#000000' : 'NONE' +let g:d_normal_bg = '#000000' let g:l_normal_fg = '#707070' let g:l_normal_bg = '#f6f6f6' call SetColor('Normal', g:d_normal_fg, g:d_normal_bg, g:l_normal_fg, g:l_normal_bg, '') +" ui colours + +if g:wal_enable == 1 && exists('g:wal_loaded') + let g:ui_bg = g:wal_color6 + let g:ui_bg__active = g:wal_color6 +else + let g:ui_bg = '#cccccc' + let g:ui_bg__active = '#cccccc' +endif + " highlight groups "{{{ call SetColor('ColorColumn', '', '#1d0808', '', '#f0ebeb', '') @@ -36,9 +47,9 @@ call SetColor('DiffDelete', '#333333', '#200000', '', '', '') call SetColor('DiffText', '#cccccc', '#101010', '', '', '') call SetColor('EndOfBuffer', '#121212', '', '#bbbbbb', '', '') call SetColor('ErrorMsg', '#ff0000', '', '#222222', '#ffaaaa', 'bold') -call SetColor('VertSplit', '#090909', '#090909', '#cccccc', '#cccccc', '') +call SetColor('VertSplit', '#090909', '#090909', g:ui_bg, g:ui_bg, '') call SetColor('Folded', '#666666', '', '#999999', '', 'bold') -call SetColor('FoldColumn', '#262626', '#111111', '#a6a6a6', '#cccccc', '') +call SetColor('FoldColumn', '#262626', '#111111', '#a6a6a6', g:ui_bg, '') call SetColor('SignColumn', '#eeeeee', '', '#555555', '', '') call SetColor('LineNr', '#3a3a3a', '', '#999999', '', '') call SetColor('CursorLineNr', '#767676', '', '#777777', '', 'bold') @@ -47,7 +58,7 @@ call SetColor('ModeMsg', '#c6c6c6', '', '#333333', '', 'itali call SetColor('MoreMsg', '#c6c6c6', '', '#333333', '', 'italic') call SetColor('NonText', '#767676', '', '#555555', '', '') -call SetColor('Pmenu', '#585858', '#121212', '#666666', '#cccccc', '') +call SetColor('Pmenu', '#585858', '#121212', '#666666', g:ui_bg, '') call SetColor('PmenuSel', '#b2b2b2', '#121212', '#333333', '#c7c7c7', '') call SetColor('PmenuSbar', '#333333', '#121212', '', '#c0c0c0', '') call SetColor('PmenuThumb', '#333333', '#121212', '', '#aaaaaa', '') @@ -61,7 +72,7 @@ call SetColor('SpellBad', '#aa0000', '#220000', '', '#b37f7f', '') call SetColor('SpellCap', '#550000', '#220000', '', '#c2acac', '') " SpellLocal " SpellRare -call SetColor('TabLine', '#777777', '#111111', '#777777', '#cccccc', 'italic') +call SetColor('TabLine', '#777777', '#111111', '#777777', g:ui_bg, 'italic') call SetColor('Title', '#a8a8a8', 'none', '#222222', 'none', 'italic') call SetColor('Visual', '#eeeeee', '#262626', '', '#c1e7f4', 'bold') @@ -137,22 +148,22 @@ call SetColor('StatusLineNC', '#444444', '', '#777777', '', call SetColor('StatusLineNormal', '#777777', '#1c1c1c', '#cccccc', '#555555', 'italic') call SetColor('StatusLineNormalNoText', '#1c1c1c', '#1c1c1c', '#555555', '#555555', '') call SetColor('StatusLineActive', '#ffffff', '#4e4e4e', '#333334', '#aaaaaa', 'italic') -call SetColor('StatusLineActiveNoText', '#4e4e4e', '#4e4e4e', '#cccccc', '#cccccc', '') -call SetColor('StatusLineActiveQuotes', '#888888', '#4e4e4e', '', '#cccccc', '') +call SetColor('StatusLineActiveNoText', '#4e4e4e', '#4e4e4e', g:ui_bg__active, g:ui_bg__active, '') +call SetColor('StatusLineActiveQuotes', '#888888', '#4e4e4e', '', g:ui_bg__active, '') -call SetColor('StatusLinePercent', '#555555', '#111111', '#999999', '#cccccc', 'italic') -call SetColor('StatusLinePercentActive', '#777777', '#111111', '#333333', '#cccccc', 'italic') +call SetColor('StatusLinePercent', '#555555', '#111111', '#999999', g:ui_bg, 'italic') +call SetColor('StatusLinePercentActive', '#777777', '#111111', '#333333', g:ui_bg__active, 'italic') call SetColor('StatusLineSeparator', '', '', '', '', '') -call SetColor('StatusLineDir', '#666666', '#1c1c1c', '#999999', '#cccccc', 'italic') -call SetColor('StatusLineDirActive', '#777777', '#3a3a3a', '#777777', '#cccccc', 'italic') -call SetColor('StatusLineFile', '#cccccc', '#1c1c1c', '#666666', '#cccccc', 'italic') -call SetColor('StatusLineFileActive', '#eeeeee', '#3a3a3a', '#444444', '#cccccc', 'italic') -call SetColor('StatusLineDot', '#606060', '#1c1c1c', '#666666', '#cccccc', '') -call SetColor('StatusLineDotActive', '#808080', '#3a3a3a', '#999999', '#cccccc', '') -call SetColor('StatusLineExt', '#777777', '#1c1c1c', '#888888', '#cccccc', 'italic') -call SetColor('StatusLineExtActive', '#bbbbbb', '#3a3a3a', '#666666', '#cccccc', 'italic') +call SetColor('StatusLineDir', '#666666', '#1c1c1c', '#999999', g:ui_bg, 'italic') +call SetColor('StatusLineDirActive', '#777777', '#3a3a3a', '#777777', g:ui_bg__active, 'italic') +call SetColor('StatusLineFile', '#cccccc', '#1c1c1c', '#666666', g:ui_bg, 'italic') +call SetColor('StatusLineFileActive', '#eeeeee', '#3a3a3a', '#444444', g:ui_bg__active, 'italic') +call SetColor('StatusLineDot', '#606060', '#1c1c1c', '#666666', g:ui_bg, '') +call SetColor('StatusLineDotActive', '#808080', '#3a3a3a', '#999999', g:ui_bg__active, '') +call SetColor('StatusLineExt', '#777777', '#1c1c1c', '#888888', g:ui_bg, 'italic') +call SetColor('StatusLineExtActive', '#bbbbbb', '#3a3a3a', '#666666', g:ui_bg__active, 'italic') " hi StatusLineMod ctermfg=255 guifg=#ffffff ctermbg=88 guibg=#490000 @@ -183,13 +194,13 @@ call SetColor('LinterInfo', '#440000', '', '#777777', '', " TabLine function "{{{ -call SetColor('TabLineFill', '', '#111111', '', '#cccccc', '') -call SetColor('tabnum', '#777777', '#111111', '#777777', '#cccccc', 'italic') -call SetColor('tabnumsel', '#777777', '#111111', '#222222', '#cccccc', 'italic') -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', '') +call SetColor('TabLineFill', '', '#111111', '', g:ui_bg, '') +call SetColor('tabnum', '#777777', '#111111', '#777777', g:ui_bg, 'italic') +call SetColor('tabnumsel', '#777777', '#111111', '#222222', g:ui_bg, 'italic') +call SetColor('tablineitem', '#777777', '#222222', '#888888', g:ui_bg, 'italic') +call SetColor('tablineitemsel', '#777777', '#222222', '#222222', g:ui_bg, 'italic') +call SetColor('TabSeparator', '#777777', '#111111', '#999999', g:ui_bg, 'italic') +call SetColor('TabLineNoise', '', '#111111', '', g:ui_bg, '') "}}} "" #css, scss definitions