From ad7d5b5d8c33720ce3727228bcb2626957235d53 Mon Sep 17 00:00:00 2001 From: HampusM Date: Wed, 14 Sep 2022 19:43:23 +0200 Subject: refactor: remove the light and mirage variants --- autoload/airline/themes/ayu.vim | 82 ++++++++++------------------------ autoload/lightline/colorscheme/ayu.vim | 26 +++++------ 2 files changed, 35 insertions(+), 73 deletions(-) (limited to 'autoload') diff --git a/autoload/airline/themes/ayu.vim b/autoload/airline/themes/ayu.vim index 2818f77..42673fa 100644 --- a/autoload/airline/themes/ayu.vim +++ b/autoload/airline/themes/ayu.vim @@ -3,50 +3,26 @@ " Let's store all the colors in a dictionary. let s:c = {} -let s:ayucolor = get(g:, 'ayucolor', 'dark') - -if s:ayucolor == 'light' - " Base colors. - let s:c.base0 = { 'gui': '#EAEAEA', 'cterm': 0 } - let s:c.base1 = { 'gui': '#FAFAFA', 'cterm': 8 } - let s:c.base2 = { 'gui': '#FAFAFA', 'cterm': 10 } - let s:c.base3 = { 'gui': '#FAFAFA', 'cterm': 12 } - let s:c.base4 = { 'gui': '#313d46', 'cterm': 11 } - let s:c.base5 = { 'gui': '#EF7E46', 'cterm': 14 } - let s:c.base6 = { 'gui': '#FAFAFA', 'cterm': 7 } - let s:c.base7 = { 'gui': '#465764', 'cterm': 15 } - - " Other colors. - let s:c.red = { 'gui': '#FF3333', 'cterm': 1 } - let s:c.orange = { 'gui': '#FF7733', 'cterm': 9 } - let s:c.yellow = { 'gui': '#E7C547', 'cterm': 3 } - let s:c.magenta = { 'gui': '#F07178', 'cterm': 13 } - let s:c.violet = { 'gui': '#A37ACC', 'cterm': 5 } - let s:c.blue = { 'gui': '#36A3D9', 'cterm': 4 } - let s:c.cyan = { 'gui': '#95E6CB', 'cterm': 6 } - let s:c.green = { 'gui': '#B8CC52', 'cterm': 2 } - -else - " Base colors. - let s:c.base0 = { 'gui': '#151a1e', 'cterm': 0 } - let s:c.base1 = { 'gui': '#1c2328', 'cterm': 8 } - let s:c.base2 = { 'gui': '#232b32', 'cterm': 10 } - let s:c.base3 = { 'gui': '#2a343c', 'cterm': 12 } - let s:c.base4 = { 'gui': '#313d46', 'cterm': 11 } - let s:c.base5 = { 'gui': '#384550', 'cterm': 14 } - let s:c.base6 = { 'gui': '#3f4e5a', 'cterm': 7 } - let s:c.base7 = { 'gui': '#465764', 'cterm': 15 } - - " Other colors. - let s:c.red = { 'gui': '#FF3333', 'cterm': 1 } - let s:c.orange = { 'gui': '#FF7733', 'cterm': 9 } - let s:c.yellow = { 'gui': '#E7C547', 'cterm': 3 } - let s:c.magenta = { 'gui': '#F07178', 'cterm': 13 } - let s:c.violet = { 'gui': '#A37ACC', 'cterm': 5 } - let s:c.blue = { 'gui': '#36A3D9', 'cterm': 4 } - let s:c.cyan = { 'gui': '#95E6CB', 'cterm': 6 } - let s:c.green = { 'gui': '#B8CC52', 'cterm': 2 } -endif +" Base colors. +let s:c.base0 = { 'gui': '#151a1e', 'cterm': 0 } +let s:c.base1 = { 'gui': '#1c2328', 'cterm': 8 } +let s:c.base2 = { 'gui': '#232b32', 'cterm': 10 } +let s:c.base3 = { 'gui': '#2a343c', 'cterm': 12 } +let s:c.base4 = { 'gui': '#313d46', 'cterm': 11 } +let s:c.base5 = { 'gui': '#384550', 'cterm': 14 } +let s:c.base6 = { 'gui': '#3f4e5a', 'cterm': 7 } +let s:c.base7 = { 'gui': '#465764', 'cterm': 15 } + +" Other colors. +let s:c.red = { 'gui': '#FF3333', 'cterm': 1 } +let s:c.orange = { 'gui': '#FF7733', 'cterm': 9 } +let s:c.yellow = { 'gui': '#E7C547', 'cterm': 3 } +let s:c.magenta = { 'gui': '#F07178', 'cterm': 13 } +let s:c.violet = { 'gui': '#A37ACC', 'cterm': 5 } +let s:c.blue = { 'gui': '#36A3D9', 'cterm': 4 } +let s:c.cyan = { 'gui': '#95E6CB', 'cterm': 6 } +let s:c.green = { 'gui': '#B8CC52', 'cterm': 2 } + let g:airline#themes#ayu#palette = {} " Just remember: @@ -83,11 +59,7 @@ let g:airline#themes#ayu#palette.normal_modified = { " Colors. let s:I1 = s:Array('base2', 'green') -if s:ayucolor == 'light' - let s:I2 = s:Array('orange', 'base3') -else - let s:I2 = s:Array('base6', 'base3') -endif +let s:I2 = s:Array('base6', 'base3') let s:I3 = s:Array('blue', 'base1') " Override for when increased contrast is enabled @@ -115,11 +87,7 @@ let g:airline#themes#ayu#palette.insert_paste = { " Colors. let s:R1 = s:Array('base2', 'orange') -if s:ayucolor == 'light' - let s:R2 = s:Array('orange', 'base3') -else - let s:R2 = s:Array('base6', 'base3') -endif +let s:R2 = s:Array('base6', 'base3') let s:R3 = s:Array('blue', 'base1') let g:airline#themes#ayu#palette.replace = @@ -136,11 +104,7 @@ let g:airline#themes#ayu#palette.replace_modified = { " Colors. let s:V1 = s:Array('base2', 'magenta') -if s:ayucolor == 'light' - let s:V2 = s:Array('orange', 'base3') -else - let s:V2 = s:Array('base6', 'base3') -endif +let s:V2 = s:Array('base6', 'base3') let s:V3 = s:N3 let g:airline#themes#ayu#palette.visual = diff --git a/autoload/lightline/colorscheme/ayu.vim b/autoload/lightline/colorscheme/ayu.vim index ae528b4..90ab6aa 100644 --- a/autoload/lightline/colorscheme/ayu.vim +++ b/autoload/lightline/colorscheme/ayu.vim @@ -1,20 +1,18 @@ -let s:style = get(g:, 'ayucolor', 'dark') - let s:fg = {} -let s:fg.primary = {'dark': '#E6E1CF', 'light': '#5C6773', 'mirage': '#D9D7CE'}[s:style] -let s:fg.secondary = {'dark': '#14191F', 'light': '#F0F0F0', 'mirage': '#232838'}[s:style] -let s:fg.contrast = {'dark': '#C2D94C', 'light': '#86B300', 'mirage': '#BAE67E'}[s:style] -let s:fg.warning = {'dark': '#FFBD54', 'light': '#F2AE49', 'mirage': '#FFDF80'}[s:style] -let s:fg.error = {'dark': '#FF3333', 'light': '#FFF333', 'mirage': '#FF3333'}[s:style] +let s:fg.primary = '#E6E1CF' +let s:fg.secondary = '#14191F' +let s:fg.contrast = '#C2D94C' +let s:fg.warning = '#FFBD54' +let s:fg.error = '#FF3333' let s:bg = {} -let s:bg.primary = {'dark': '#161F2A', 'light': '#DEE8F1', 'mirage': '#2A3546'}[s:style] -let s:bg.secondary = {'dark': '#14191F', 'light': '#F0F0F0', 'mirage': '#232838'}[s:style] -let s:bg.contrast = {'dark': '#E6B450', 'light': '#FF9940', 'mirage': '#FFCC66'}[s:style] -let s:bg.normal = {'dark': '#01060E', 'light': '#D3D5D7', 'mirage': '#141925'}[s:style] -let s:bg.insert = {'dark': '#39BAE6', 'light': '#55B4D4', 'mirage': '#5CCFE6'}[s:style] -let s:bg.replace = {'dark': '#FF8F40', 'light': '#FA8D3E', 'mirage': '#FFA759'}[s:style] -let s:bg.visual = {'dark': '#A37ACC', 'light': '#A37ACC', 'mirage': '#D4BFFF'}[s:style] +let s:bg.primary = '#161F2A' +let s:bg.secondary = '#14191F' +let s:bg.contrast = '#E6B450' +let s:bg.normal = '#01060E' +let s:bg.insert = '#39BAE6' +let s:bg.replace = '#FF8F40' +let s:bg.visual = '#A37ACC' let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}} let s:p.normal.left = [[s:fg.primary, s:bg.normal], [s:fg.primary, s:bg.primary]] -- cgit v1.2.3-18-g5258