diff options
| author | Ellison Leão <ellisonleao@gmail.com> | 2021-03-30 18:43:42 -0300 |
|---|---|---|
| committer | Ellison Leão <ellisonleao@gmail.com> | 2021-03-30 18:43:42 -0300 |
| commit | 95c8385ed62fe4bfc24aae50d9123ae4cea8aa27 (patch) | |
| tree | 8112d24ca5f35c7bb03c7024815f32faea361dc1 /lua | |
| parent | 7a38119d1248b22c9ee30acae0c1769716b98d4c (diff) | |
| download | gruvbox-95c8385ed62fe4bfc24aae50d9123ae4cea8aa27.tar.gz gruvbox-95c8385ed62fe4bfc24aae50d9123ae4cea8aa27.tar.xz | |
keeping original color name consistency in color settings
- Fix #31
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/gruvbox/base.lua | 34 | ||||
| -rw-r--r-- | lua/gruvbox/utils.lua | 3 |
2 files changed, 28 insertions, 9 deletions
diff --git a/lua/gruvbox/base.lua b/lua/gruvbox/base.lua index f4c7bea..3a5c69b 100644 --- a/lua/gruvbox/base.lua +++ b/lua/gruvbox/base.lua @@ -61,13 +61,33 @@ if bg == "light" then orange = colors.faded_orange end -local hls_cursor = utils.get_color_from_var(vim.g.gruvbox_hls_cursor, orange) -local hls_highlight = utils.get_color_from_var(vim.g.gruvbox_hls_highlight, yellow) -local number_column = utils.get_color_from_var(vim.g.gruvbox_number_column, nil) -local color_column = utils.get_color_from_var(vim.g.gruvbox_color_column, bg1) -local vert_split = utils.get_color_from_var(vim.g.gruvbox_vert_split, bg0) -local tabline_sel = utils.get_color_from_var(vim.g.gruvbox_tabline_sel, green) -local sign_column = utils.get_color_from_var(vim.g.gruvbox_sign_column, bg1) +-- extending colors table with basic names for easy customization in g:gruvbox_* options +colors.bg0 = bg0 +colors.bg1 = bg1 +colors.bg2 = bg2 +colors.bg3 = bg3 +colors.bg4 = bg4 +colors.fg0 = fg0 +colors.fg1 = fg1 +colors.fg2 = fg2 +colors.fg3 = fg3 +colors.fg4 = fg4 +colors.red = red +colors.green = green +colors.yellow = yellow +colors.blue = blue +colors.purple = purple +colors.aqua = aqua +colors.orange = orange + +local hls_cursor = utils.get_color_from_var(vim.g.gruvbox_hls_cursor, orange, colors) +local hls_highlight = utils.get_color_from_var(vim.g.gruvbox_hls_highlight, yellow, + colors) +local number_column = utils.get_color_from_var(vim.g.gruvbox_number_column, nil, colors) +local color_column = utils.get_color_from_var(vim.g.gruvbox_color_column, bg1, colors) +local vert_split = utils.get_color_from_var(vim.g.gruvbox_vert_split, bg0, colors) +local tabline_sel = utils.get_color_from_var(vim.g.gruvbox_tabline_sel, green, colors) +local sign_column = utils.get_color_from_var(vim.g.gruvbox_sign_column, bg1, colors) local improved_strings_fg = fg1 local improved_strings_bg = bg1 diff --git a/lua/gruvbox/utils.lua b/lua/gruvbox/utils.lua index 28fc7ea..c548f5c 100644 --- a/lua/gruvbox/utils.lua +++ b/lua/gruvbox/utils.lua @@ -1,5 +1,4 @@ -- util functions -local colors = require("gruvbox.colors") local M = {} M.tobool = function(val) @@ -11,7 +10,7 @@ end -- check if vim.g.gruvbox_* color exists in current palette, return default color -- otherwise -M.get_color_from_var = function(color, default) +M.get_color_from_var = function(color, default, colors) if color == nil then return default end |