From 5a9f2110d7133865564c39f0489e0984a98c5341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Muhammad=20Ahmad=20=F0=9F=8C=8C?= Date: Wed, 8 Dec 2021 01:37:31 +0200 Subject: refactore(gruvbox): sync with gruvbox-community --- lua/gruvbox/base.lua | 17 +-- lua/gruvbox/colors.lua | 72 ++++++------ lua/gruvbox/plugins/airline.lua | 240 ++++++++++++++++++---------------------- 3 files changed, 153 insertions(+), 176 deletions(-) (limited to 'lua') diff --git a/lua/gruvbox/base.lua b/lua/gruvbox/base.lua index 599f394..66311bc 100644 --- a/lua/gruvbox/base.lua +++ b/lua/gruvbox/base.lua @@ -184,7 +184,7 @@ local base_group = { DiffText = { fg = yellow, bg = bg0, gui = styles.inverse }, ErrorMsg = { fg = bg0, bg = red, gui = styles.bold }, VertSplit = { fg = bg3, bg = vert_split }, - Folded = { fg = gray, bg = bg1, gui = styles.italic_strings }, + Folded = { fg = gray, bg = bg1, gui = styles.italic }, FoldColumn = { fg = gray, bg = bg1 }, SignColumn = { bg = sign_column }, IncSearch = { fg = hls_cursor, bg = bg0, gui = styles.inverse }, @@ -196,7 +196,7 @@ local base_group = { NonText = "GruvboxBg2", Normal = { fg = fg1, bg = bg0 }, Pmenu = { fg = fg1, bg = bg2 }, - PmenuSel = { fg = bg2, bg = fg4, gui = styles.bold }, + PmenuSel = { fg = bg2, bg = blue, gui = styles.bold }, PmenuSbar = { bg = bg2 }, PmenuThumb = { bg = bg4 }, Question = "GruvboxOrangeBold", @@ -206,11 +206,14 @@ local base_group = { SpellRare = "GruvboxPurpleUnderline", SpellBad = "GruvboxRedUnderline", SpellLocal = "GruvboxAquaUnderline", - SpellCap = { fg = green, gui = table_concat({ styles.bold, styles.italic }, ",") }, + SpellCap = utils.tobool(vim.g.gruvbox_improved_warnings) and { + fg = green, + gui = table_concat({ styles.bold, styles.italic }, ","), + } or "GruvboxBlueUnderline", StatusLine = { fg = bg2, bg = fg1, gui = styles.inverse }, StatusLineNC = { fg = bg1, bg = fg4, gui = styles.inverse }, TabLineFill = { fg = bg4, bg = bg1, gui = styles.invert_tabline }, - TabLine = { fg = bg4, bg = bg1, gui = styles.invert_tabline }, + TabLine = "TabLineFill", TabLineSel = { fg = tabline_sel, bg = bg1, gui = styles.invert_tabline }, Title = "GruvboxGreenBold", Visual = { bg = bg3, gui = styles.invert_selection }, @@ -236,7 +239,7 @@ local base_group = { Label = "GruvboxRed", Exception = "GruvboxRed", Keyword = "GruvboxRed", - Operator = "GruvboxOrange", + Operator = "GruvboxFg1", PreProc = "GruvboxAqua", Include = "GruvboxAqua", Define = "GruvboxAqua", @@ -255,8 +258,8 @@ local base_group = { Bold = { gui = styles.bold }, Italic = { gui = styles.italic }, Ignore = {}, - Error = { fg = red, gui = table_concat({ styles.bold, styles.underline }, ",") }, - Todo = { fg = fg0, gui = table_concat({ styles.bold, styles.italic_comments }, ",") }, + Error = { fg = red, gui = table_concat({ styles.bold, styles.inverse }, ",") }, + Todo = { fg = fg0, gui = table_concat({ styles.bold, styles.italic }, ",") }, diffAdded = "GruvboxGreen", diffRemoved = "GruvboxRed", diffChanged = "GruvboxAqua", diff --git a/lua/gruvbox/colors.lua b/lua/gruvbox/colors.lua index c9c55a2..36c7f96 100644 --- a/lua/gruvbox/colors.lua +++ b/lua/gruvbox/colors.lua @@ -1,39 +1,39 @@ -- gruvbox palette return { - dark0_hard = "#1d2021", - dark0 = "#282828", - dark0_soft = "#32302f", - dark1 = "#3c3836", - dark2 = "#504945", - dark3 = "#665c54", - dark4 = "#7c6f64", - light0_hard = "#f9f5d7", - light0 = "#fbf1c7", - light0_soft = "#f2e5bc", - light1 = "#ebdbb2", - light2 = "#d5c4a1", - light3 = "#bdae93", - light4 = "#a89984", - bright_red = "#fb4934", - bright_green = "#b8bb26", - bright_yellow = "#fabd2f", - bright_blue = "#83a598", - bright_purple = "#d3869b", - bright_aqua = "#8ec07c", - bright_orange = "#fe8019", - neutral_red = "#cc241d", - neutral_green = "#98971a", - neutral_yellow = "#d79921", - neutral_blue = "#458588", - neutral_purple = "#b16286", - neutral_aqua = "#689d6a", - neutral_orange = "#d65d0e", - faded_red = "#9d0006", - faded_green = "#79740e", - faded_yellow = "#b57614", - faded_blue = "#076678", - faded_purple = "#8f3f71", - faded_aqua = "#427b58", - faded_orange = "#af3a03", - gray = "#928374", + dark0_hard = "#1d2021", + dark0 = "#282828", + dark0_soft = "#32302f", + dark1 = "#3c3836", + dark2 = "#504945", + dark3 = "#665c54", + dark4 = "#7c6f64", + light0_hard = "#f9f5d7", + light0 = "#fbf1c7", + light0_soft = "#f2e5bc", + light1 = "#ebdbb2", + light2 = "#d5c4a1", + light3 = "#bdae93", + light4 = "#a89984", + bright_red = "#fb4934", + bright_green = "#b8bb26", + bright_yellow = "#fabd2f", + bright_blue = "#83a598", + bright_purple = "#d3869b", + bright_aqua = "#8ec07c", + bright_orange = "#fe8019", + neutral_red = "#cc241d", + neutral_green = "#98971a", + neutral_yellow = "#d79921", + neutral_blue = "#458588", + neutral_purple = "#b16286", + neutral_aqua = "#689d6a", + neutral_orange = "#d65d0e", + faded_red = "#9d0006", + faded_green = "#79740e", + faded_yellow = "#b57614", + faded_blue = "#076678", + faded_purple = "#8f3f71", + faded_aqua = "#427b58", + faded_orange = "#af3a03", + gray = "#928374", } diff --git a/lua/gruvbox/plugins/airline.lua b/lua/gruvbox/plugins/airline.lua index b6b558b..da7b46d 100644 --- a/lua/gruvbox/plugins/airline.lua +++ b/lua/gruvbox/plugins/airline.lua @@ -1,180 +1,154 @@ local M = {} M.refresh = function() - vim.api.nvim_err_writeln("refresh called!") - local M0 = vim.fn["airline#themes#get_highlight"]("Identifier") - - local accents_group = vim.fn["airline#themes#get_highlight"]("Special") - local modified_group = {M0[1], "", M0[2], "", ""} - local warning_group = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"Question", "fg"}) - local error_group = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"WarningMsg", "fg"}) - - local N1 = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"StatusLineNC", "fg"}) - local N2 = vim.fn["airline#themes#get_highlight2"]({"StatusLineNC", "bg"}, - {"PMenu", "bg"}) - local N3 = vim.fn["airline#themes#get_highlight2"]({"StatusLineNC", "bg"}, - {"StatusLineNC", "fg"}) + vim.api.nvim_err_writeln "refresh called!" + local M0 = vim.fn["airline#themes#get_highlight"] "Identifier" - -- normal mode vars - vim.g["airline#themes#gruvbox#palette.normal"] = - vim.fn["airline#themes#generate_color_map"](N1, N2, N3) - vim.g["airline#themes#gruvbox#palette.normal_modified"] = {airline_c = modified_group} - vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] = warning_group - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] = - warning_group - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] = - warning_group - vim.g["airline#themes#gruvbox#palette.normal.airline_error"] = error_group - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] = error_group - vim.g["airline#themes#gruvbox#palette.normal.airline_term"] = N3 - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] = N3 + local accents_group = vim.fn["airline#themes#get_highlight"] "Special" + local modified_group = { M0[1], "", M0[2], "", "" } + local warning_group = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "Question", "fg" }) + local error_group = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "WarningMsg", "fg" }) - -- insert mode vars - local I1 = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"Identifier", "fg"}) - local I2 = N2 - local I3 = vim.fn["airline#themes#get_highlight2"]({"GruvboxFg1", "fg"}, - {"Pmenu", "bg"}) + local N1 = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "StatusLineNC", "fg" }) + local N2 = vim.fn["airline#themes#get_highlight2"]({ "StatusLineNC", "bg" }, { "PMenu", "bg" }) + local N3 = vim.fn["airline#themes#get_highlight2"]({ "StatusLineNC", "bg" }, { "StatusLineNC", "fg" }) - vim.g["airline#themes#gruvbox#palette.insert"] = - vim.fn["airline#themes#generate_color_map"](I1, I2, I3) + -- normal mode vars + vim.g["airline#themes#gruvbox#palette.normal"] = vim.fn["airline#themes#generate_color_map"](N1, N2, N3) + vim.g["airline#themes#gruvbox#palette.normal_modified"] = { airline_c = modified_group } + vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] = warning_group + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] = warning_group + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] = warning_group + vim.g["airline#themes#gruvbox#palette.normal.airline_error"] = error_group + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] = error_group + vim.g["airline#themes#gruvbox#palette.normal.airline_term"] = N3 + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] = N3 - vim.g["airline#themes#gruvbox#palette.insert_modified"] = - vim.g["airline#themes#gruvbox#palette.normal_modified"] + -- insert mode vars + local I1 = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "Identifier", "fg" }) + local I2 = N2 + local I3 = vim.fn["airline#themes#get_highlight2"]({ "GruvboxFg1", "fg" }, { "Pmenu", "bg" }) - vim.g["airline#themes#gruvbox#palette.insert.airline_warning"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] + vim.g["airline#themes#gruvbox#palette.insert"] = vim.fn["airline#themes#generate_color_map"](I1, I2, I3) - vim.g["airline#themes#gruvbox#palette.insert_modified.airline_warning"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] + vim.g["airline#themes#gruvbox#palette.insert_modified"] = vim.g["airline#themes#gruvbox#palette.normal_modified"] - vim.g["airline#themes#gruvbox#palette.insert.airline_error"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_error"] + vim.g["airline#themes#gruvbox#palette.insert.airline_warning"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] - vim.g["airline#themes#gruvbox#palette.insert_modified.airline_error"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] + vim.g["airline#themes#gruvbox#palette.insert_modified.airline_warning"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] - vim.g["airline#themes#gruvbox#palette.insert.airline_term"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_term"] + vim.g["airline#themes#gruvbox#palette.insert.airline_error"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_error"] - vim.g["airline#themes#gruvbox#palette.insert_modified.airline_term"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] + vim.g["airline#themes#gruvbox#palette.insert_modified.airline_error"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] - -- replace mode vars - local R1 = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"Structure", "fg"}) - local R2 = I2 - local R3 = I3 + vim.g["airline#themes#gruvbox#palette.insert.airline_term"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_term"] - vim.g["airline#themes#gruvbox#palette.replace"] = - vim.fn["airline#themes#generate_color_map"](R1, R2, R3) + vim.g["airline#themes#gruvbox#palette.insert_modified.airline_term"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] - vim.g["airline#themes#gruvbox#palette.replace_modified"] = - vim.g["airline#themes#gruvbox#palette.normal_modified"] + -- replace mode vars + local R1 = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "Structure", "fg" }) + local R2 = I2 + local R3 = I3 - vim.g["airline#themes#gruvbox#palette.replace.airline_warning"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] + vim.g["airline#themes#gruvbox#palette.replace"] = vim.fn["airline#themes#generate_color_map"](R1, R2, R3) - vim.g["airline#themes#gruvbox#palette.replace_modified.airline_warning"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] + vim.g["airline#themes#gruvbox#palette.replace_modified"] = vim.g["airline#themes#gruvbox#palette.normal_modified"] - vim.g["airline#themes#gruvbox#palette.replace.airline_error"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_error"] + vim.g["airline#themes#gruvbox#palette.replace.airline_warning"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] - vim.g["airline#themes#gruvbox#palette.replace_modified.airline_error"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] + vim.g["airline#themes#gruvbox#palette.replace_modified.airline_warning"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] - vim.g["airline#themes#gruvbox#palette.replace.airline_term"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_term"] + vim.g["airline#themes#gruvbox#palette.replace.airline_error"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_error"] - vim.g["airline#themes#gruvbox#palette.replace_modified.airline_term"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] + vim.g["airline#themes#gruvbox#palette.replace_modified.airline_error"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] - -- visual mode vars - local V1 = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"Question", "fg"}) - local V2 = N2 - local V3 = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"TabLine", "fg"}) + vim.g["airline#themes#gruvbox#palette.replace.airline_term"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_term"] - vim.g["airline#themes#gruvbox#palette.replace"] = - vim.fn["airline#themes#generate_color_map"](V1, V2, V3) + vim.g["airline#themes#gruvbox#palette.replace_modified.airline_term"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] - vim.g["airline#themes#gruvbox#palette.visual_modified"] = - {airline_c = {V3[1], "", V3[3], "", ""}} + -- visual mode vars + local V1 = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "Question", "fg" }) + local V2 = N2 + local V3 = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "TabLine", "fg" }) - vim.g["airline#themes#gruvbox#palette.visual.airline_warning"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] + vim.g["airline#themes#gruvbox#palette.replace"] = vim.fn["airline#themes#generate_color_map"](V1, V2, V3) - vim.g["airline#themes#gruvbox#palette.visual_modified.airline_warning"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] + vim.g["airline#themes#gruvbox#palette.visual_modified"] = { airline_c = { V3[1], "", V3[3], "", "" } } - vim.g["airline#themes#gruvbox#palette.visual.airline_error"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_error"] + vim.g["airline#themes#gruvbox#palette.visual.airline_warning"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] - vim.g["airline#themes#gruvbox#palette.visual_modified.airline_error"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] + vim.g["airline#themes#gruvbox#palette.visual_modified.airline_warning"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] - vim.g["airline#themes#gruvbox#palette.visual.airline_term"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_term"] + vim.g["airline#themes#gruvbox#palette.visual.airline_error"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_error"] - vim.g["airline#themes#gruvbox#palette.visual_modified.airline_term"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] + vim.g["airline#themes#gruvbox#palette.visual_modified.airline_error"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] - local C1 = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"GruvboxGreen", "fg"}) - local C2 = I2 - local C3 = I3 + vim.g["airline#themes#gruvbox#palette.visual.airline_term"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_term"] - vim.g["airline#themes#gruvbox#palette.commandline"] = - vim.fn["airline#themes#generate_color_map"](C1, C2, C3) + vim.g["airline#themes#gruvbox#palette.visual_modified.airline_term"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] - vim.g["airline#themes#gruvbox#palette.commandline_modified"] = - vim.g["airline#themes#gruvbox#palette.normal_modified"] + local C1 = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "GruvboxGreen", "fg" }) + local C2 = I2 + local C3 = I3 - vim.g["airline#themes#gruvbox#palette.commandline.airline_warning"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] + vim.g["airline#themes#gruvbox#palette.commandline"] = vim.fn["airline#themes#generate_color_map"](C1, C2, C3) - vim.g["airline#themes#gruvbox#palette.commandline_modified.airline_warning"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] + vim.g["airline#themes#gruvbox#palette.commandline_modified"] = + vim.g["airline#themes#gruvbox#palette.normal_modified"] - vim.g["airline#themes#gruvbox#palette.commandline.airline_error"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_error"] + vim.g["airline#themes#gruvbox#palette.commandline.airline_warning"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_warning"] - vim.g["airline#themes#gruvbox#palette.commandline_modified.airline_error"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] + vim.g["airline#themes#gruvbox#palette.commandline_modified.airline_warning"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"] - vim.g["airline#themes#gruvbox#palette.commandline.airline_term"] = - vim.g["airline#themes#gruvbox#palette.normal.airline_term"] + vim.g["airline#themes#gruvbox#palette.commandline.airline_error"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_error"] - vim.g["airline#themes#gruvbox#palette.commandline_modified.airline_term"] = - vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] + vim.g["airline#themes#gruvbox#palette.commandline_modified.airline_error"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"] - local IA = vim.fn["airline#themes#get_highlight2"]({"TabLine", "fg"}, - {"CursorLine", "bg"}) - vim.g["airline#themes#gruvbox#palette.inactive"] = - vim.fn["airline#themes#generate_color_map"](IA, IA, IA) + vim.g["airline#themes#gruvbox#palette.commandline.airline_term"] = + vim.g["airline#themes#gruvbox#palette.normal.airline_term"] - vim.g["airline#themes#gruvbox#palette.inactive_modified"] = - {airline_c = modified_group} - vim.g["airline#themes#gruvbox#palette.accents"] = {red = accents_group} + vim.g["airline#themes#gruvbox#palette.commandline_modified.airline_term"] = + vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"] - local TF = vim.fn["airline#themes#get_highlight2"]({"GruvboxBg0", "fg"}, - {"GruvboxBg0", "fg"}) + local IA = vim.fn["airline#themes#get_highlight2"]({ "TabLine", "fg" }, { "CursorLine", "bg" }) + vim.g["airline#themes#gruvbox#palette.inactive"] = vim.fn["airline#themes#generate_color_map"](IA, IA, IA) - vim.g["airline#themes#gruvbox#palette.tabline"] = - { - airline_tab = N2, - airline_tabsel = N1, - airline_tabtype = V1, - airline_tablabel = V1, - airline_tablabel_right = V1, - airline_tabfill = TF, - airline_tabhid = IA, - airline_tabmod = I1, + vim.g["airline#themes#gruvbox#palette.inactive_modified"] = { airline_c = modified_group } + vim.g["airline#themes#gruvbox#palette.accents"] = { red = accents_group } + + local TF = vim.fn["airline#themes#get_highlight2"]({ "GruvboxBg0", "fg" }, { "GruvboxBg0", "fg" }) + + vim.g["airline#themes#gruvbox#palette.tabline"] = { + airline_tab = N2, + airline_tabsel = N1, + airline_tabtype = V1, + airline_tablabel = V1, + airline_tablabel_right = V1, + airline_tabfill = TF, + airline_tabhid = IA, + airline_tabmod = I1, } end -- cgit v1.2.3