From 8f08dd330f9431b39f13a7816f144ab4b341e90b Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Thu, 15 Apr 2021 18:20:46 +0200 Subject: [PATCH] gruvbox-dark-hard: allow old style again Set let g:airline_base16_gruvbox_dark_hard_old = 1 to allow the old base16_gruvbox_dark_hard style again. closes #250 --- .../themes/base16_gruvbox_dark_hard.vim | 109 ++++++++++++++---- doc/airline-themes.txt | 11 +- 2 files changed, 95 insertions(+), 25 deletions(-) diff --git a/autoload/airline/themes/base16_gruvbox_dark_hard.vim b/autoload/airline/themes/base16_gruvbox_dark_hard.vim index 58934c7..8fc0e2d 100644 --- a/autoload/airline/themes/base16_gruvbox_dark_hard.vim +++ b/autoload/airline/themes/base16_gruvbox_dark_hard.vim @@ -25,30 +25,79 @@ let s:gui0E = '#d3869b' let s:gui0F = '#d65d0e' " Terminal color definitions -let s:cterm00 = "00" -let s:cterm03 = "08" -let s:cterm05 = "07" -let s:cterm07 = "15" -let s:cterm08 = "01" -let s:cterm0A = "03" -let s:cterm0B = "02" -let s:cterm0C = "06" -let s:cterm0D = "04" -let s:cterm0E = "05" -if exists("base16colorspace") && base16colorspace == "256" - let s:cterm01 = "18" - let s:cterm02 = "19" - let s:cterm04 = "20" - let s:cterm06 = "21" - let s:cterm09 = "16" - let s:cterm0F = "17" +if get(g:, 'airline_base16_gruvbox_dark_hard_old', 0) + let s:cterm00 = 234 + let s:cterm01 = 235 + let s:cterm02 = 236 + let s:cterm03 = 240 + let s:cterm04 = 143 + let s:cterm05 = 187 + let s:cterm06 = 223 + let s:cterm07 = 230 + let s:cterm08 = 203 + let s:cterm09 = 208 + let s:cterm0A = 214 + let s:cterm0B = 142 + let s:cterm0C = 108 + let s:cterm0D = 108 + let s:cterm0E = 175 + let s:cterm0F = 166 + + let s:N1 = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ] + let s:N2 = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ] + let s:N3 = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ] + let g:airline#themes#base16_gruvbox_dark_hard#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3) + + let s:I1 = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ] + let s:I2 = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ] + let s:I3 = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ] + let g:airline#themes#base16_gruvbox_dark_hard#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3) + + let s:R1 = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ] + let s:R2 = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ] + let s:R3 = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ] + let g:airline#themes#base16_gruvbox_dark_hard#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3) + + let s:V1 = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ] + let s:V2 = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ] + let s:V3 = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ] + let g:airline#themes#base16_gruvbox_dark_hard#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3) + + let s:IA1 = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ] + let s:IA2 = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ] + let s:IA3 = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ] + let g:airline#themes#base16_gruvbox_dark_hard#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3) + + let g:airline#themes#base16_gruvbox_dark_hard#palette.terminal = airline#themes#generate_color_map(s:I1, s:I2, s:I3) + let g:airline#themes#base16_gruvbox_dark_hard#palette.normal.airline_term = s:N3 + let g:airline#themes#base16_gruvbox_dark_hard#palette.terminal.airline_term = s:N3 + let g:airline#themes#base16_gruvbox_dark_hard#palette.visual.airline_term = s:N3 else - let s:cterm01 = "10" - let s:cterm02 = "11" - let s:cterm04 = "12" - let s:cterm06 = "13" - let s:cterm09 = "09" - let s:cterm0F = "14" + let s:cterm00 = "00" + let s:cterm03 = "08" + let s:cterm05 = "07" + let s:cterm07 = "15" + let s:cterm08 = "01" + let s:cterm0A = "03" + let s:cterm0B = "02" + let s:cterm0C = "06" + let s:cterm0D = "04" + let s:cterm0E = "05" + if exists("base16colorspace") && base16colorspace == "256" + let s:cterm01 = "18" + let s:cterm02 = "19" + let s:cterm04 = "20" + let s:cterm06 = "21" + let s:cterm09 = "16" + let s:cterm0F = "17" + else + let s:cterm01 = "10" + let s:cterm02 = "11" + let s:cterm04 = "12" + let s:cterm06 = "13" + let s:cterm09 = "09" + let s:cterm0F = "14" + endif endif let g:airline#themes#base16_{s:scheme_slug}#palette.normal = airline#themes#generate_color_map( @@ -83,3 +132,17 @@ let g:airline#themes#base16_{s:scheme_slug}#palette.inactive = airline#themes#ge \ [ s:gui01, s:gui01, s:cterm01, s:cterm01 ], \ [ s:gui04, s:gui01, s:cterm04, s:cterm01 ], \ [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]) + + + +" Here we define the color map for ctrlp. We check for the g:loaded_ctrlp +" variable so that related functionality is loaded iff the user is using +" ctrlp. Note that this is optional, and if you do not define ctrlp colors +" they will be chosen automatically from the existing palette. +if !get(g:, 'loaded_ctrlp', 0) + finish +endif +let g:airline#themes#base16_{s:scheme_slug}#palette.ctrlp = airline#themes#generate_color_map( + \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ], + \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ], + \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ]) diff --git a/doc/airline-themes.txt b/doc/airline-themes.txt index 59d136c..2cfc692 100644 --- a/doc/airline-themes.txt +++ b/doc/airline-themes.txt @@ -116,7 +116,7 @@ Currently this repository contains the following themes: * base16_grayscale_dark * base16_grayscale_light * base16_greenscreen - * base16_gruvbox_dark_hard + * base16_gruvbox_dark_hard (|airline-theme-base-gruvbox-dark-hard|) * base16_gruvbox_dark_medium * base16_gruvbox_dark_pale * base16_gruvbox_dark_soft @@ -320,6 +320,13 @@ the different modes, so should bring some performance improvements because airline does not have to redefine highlighting groups after they have been setup once. However, it won't change colors if e.g. the mode changes. +*airline-theme-base-gruvbox-dark-hard* +------------------------------------------------------------------------------ + +If you want to use the old version of the base16-gruvbox-dark-hard theme, use +this: > + let g:airline_base16_gruvbox_dark_hard_old = 1 + *airline-theme-deus* ------------------------------------------------------------------------------ *g:deus_termcolors* @@ -332,7 +339,7 @@ Has no effect if using true/24-bit color. To enable 16-color mode: > ------------------------------------------------------------------------------ *g:airline_minimalist_showmod* -Highlight when the buffer is modified. +Highlight when the buffer is modified. > let g:airline_minimalist_showmod = 1 < *airline-theme-onedark*