chore(gruvbox): sync with upstream

5 files changed, 109 insertions, 159 deletions

diff --git a/autoload/airline/themes/gruvbox.vim b/autoload/airline/themes/gruvbox.vim
index 07a2ef3..2219b21 100644
--- a/autoload/airline/themes/gruvbox.vim
+++ b/autoload/airline/themes/gruvbox.vim
@@ -1,5 +1,98 @@
-function! airflow#themes#gruvbox#refresh()
-    lua require("gruvbox.plugins.airline").refresh()
+" -----------------------------------------------------------------------------
+" File: gruvbox.vim
+" Description: Retro groove color scheme for Airline
+" Author: morhetz <morhetz@gmail.com>
+" Source: https://github.com/gruvbox-community/gruvbox
+" -----------------------------------------------------------------------------
+
+let g:airline#themes#gruvbox#palette = {}
+
+function! airline#themes#gruvbox#refresh()
+
+  let M0 = airline#themes#get_highlight('Identifier')
+  let accents_group = airline#themes#get_highlight('Special')
+  let modified_group = [M0[0], '', M0[2], '', '']
+  let warning_group = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['Question', 'fg'])
+  let error_group = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['WarningMsg', 'fg'])
+
+  let s:N1 = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['StatusLineNC', 'bg'])
+  let s:N2 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['Pmenu', 'bg'])
+  let s:N3 = airline#themes#get_highlight2(['StatusLineNC', 'bg'], ['StatusLineNC', 'fg'])
+  let g:airline#themes#gruvbox#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let g:airline#themes#gruvbox#palette.normal_modified = { 'airline_c': modified_group }
+  let g:airline#themes#gruvbox#palette.normal.airline_warning = warning_group
+  let g:airline#themes#gruvbox#palette.normal_modified.airline_warning = warning_group
+  let g:airline#themes#gruvbox#palette.normal.airline_error = error_group
+  let g:airline#themes#gruvbox#palette.normal_modified.airline_error = error_group
+  let g:airline#themes#gruvbox#palette.normal.airline_term = s:N3
+  let g:airline#themes#gruvbox#palette.normal_modified.airline_term = s:N3
+
+  let s:I1 = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['Identifier', 'fg'])
+  let s:I2 = s:N2
+  let s:I3 = airline#themes#get_highlight2(['GruvboxFg1', 'fg'], ['Pmenu', 'bg'])
+  let g:airline#themes#gruvbox#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#gruvbox#palette.insert_modified = g:airline#themes#gruvbox#palette.normal_modified
+  let g:airline#themes#gruvbox#palette.insert.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
+  let g:airline#themes#gruvbox#palette.insert_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
+  let g:airline#themes#gruvbox#palette.insert.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
+  let g:airline#themes#gruvbox#palette.insert_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
+  let g:airline#themes#gruvbox#palette.insert.airline_term = g:airline#themes#gruvbox#palette.normal.airline_term
+  let g:airline#themes#gruvbox#palette.insert_modified.airline_term = g:airline#themes#gruvbox#palette.normal_modified.airline_term
+
+  let s:R1 = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['Structure', 'fg'])
+  let s:R2 = s:I2
+  let s:R3 = s:I3
+  let g:airline#themes#gruvbox#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+  let g:airline#themes#gruvbox#palette.replace_modified = g:airline#themes#gruvbox#palette.normal_modified
+  let g:airline#themes#gruvbox#palette.replace.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
+  let g:airline#themes#gruvbox#palette.replace_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
+  let g:airline#themes#gruvbox#palette.replace.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
+  let g:airline#themes#gruvbox#palette.replace_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
+  let g:airline#themes#gruvbox#palette.replace.airline_term = g:airline#themes#gruvbox#palette.normal.airline_term
+  let g:airline#themes#gruvbox#palette.replace_modified.airline_term = g:airline#themes#gruvbox#palette.normal_modified.airline_term
+
+  let s:V1 = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['Question', 'fg'])
+  let s:V2 = s:N2
+  let s:V3 = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['TabLine', 'fg'])
+  let g:airline#themes#gruvbox#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#gruvbox#palette.visual_modified = { 'airline_c': [ s:V3[0], '', s:V3[2], '', '' ] }
+  let g:airline#themes#gruvbox#palette.visual.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
+  let g:airline#themes#gruvbox#palette.visual_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
+  let g:airline#themes#gruvbox#palette.visual.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
+  let g:airline#themes#gruvbox#palette.visual_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
+  let g:airline#themes#gruvbox#palette.visual.airline_term = g:airline#themes#gruvbox#palette.normal.airline_term
+  let g:airline#themes#gruvbox#palette.visual_modified.airline_term =  g:airline#themes#gruvbox#palette.normal_modified.airline_term
+
+  let s:C1 = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['GruvboxGreen', 'fg'])
+  let s:C2 = s:I2
+  let s:C3 = s:I3
+  let g:airline#themes#gruvbox#palette.commandline = airline#themes#generate_color_map(s:C1, s:C2, s:C3)
+  let g:airline#themes#gruvbox#palette.commandline_modified = g:airline#themes#gruvbox#palette.normal_modified
+  let g:airline#themes#gruvbox#palette.commandline.airline_warning = g:airline#themes#gruvbox#palette.normal.airline_warning
+  let g:airline#themes#gruvbox#palette.commandline_modified.airline_warning = g:airline#themes#gruvbox#palette.normal_modified.airline_warning
+  let g:airline#themes#gruvbox#palette.commandline.airline_error = g:airline#themes#gruvbox#palette.normal.airline_error
+  let g:airline#themes#gruvbox#palette.commandline_modified.airline_error = g:airline#themes#gruvbox#palette.normal_modified.airline_error
+  let g:airline#themes#gruvbox#palette.commandline.airline_term = g:airline#themes#gruvbox#palette.normal.airline_term
+  let g:airline#themes#gruvbox#palette.commandline_modified.airline_term = g:airline#themes#gruvbox#palette.normal.airline_term
+
+  let s:IA = airline#themes#get_highlight2(['TabLine', 'fg'], ['CursorLine', 'bg'])
+  let g:airline#themes#gruvbox#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#gruvbox#palette.inactive_modified = { 'airline_c': modified_group }
+
+  let g:airline#themes#gruvbox#palette.accents = { 'red': accents_group }
+
+  let s:TF = airline#themes#get_highlight2(['GruvboxBg0', 'fg'], ['GruvboxBg0', 'fg'])
+  let g:airline#themes#gruvbox#palette.tabline = {
+    \ 'airline_tab':  s:N2,
+    \ 'airline_tabsel':  s:N1,
+    \ 'airline_tabtype':  s:V1,
+    \ 'airline_tablabel':  s:V1,
+    \ 'airline_tablabel_right':  s:V1,
+    \ 'airline_tabfill':  s:TF,
+    \ 'airline_tabhid':  s:IA,
+    \ 'airline_tabmod':  s:I1
+    \ }
+
 endfunction
 
-call airflow#themes#gruvbox#refresh()
+call airline#themes#gruvbox#refresh()
diff --git a/lua/gruvbox/languages.lua b/lua/gruvbox/languages.lua
index ee4bbe8..1765c5a 100644
--- a/lua/gruvbox/languages.lua
+++ b/lua/gruvbox/languages.lua
@@ -68,7 +68,12 @@ local elixir = {
 }
 
 local markdown = {
-  markdownItalic = { fg = base.GruvboxFg3.fg, gui = styles.italic_strings },
+  markdownItalic = { fg = base.GruvboxFg3.fg, gui = styles.italic },
+  markdownBold = { fg = base.GruvboxFg3.fg, gui = styles.bold },
+  markdownBoldItalic = {
+    fg = base.GruvboxFg3.fg,
+    gui = table.concat({ styles.bold, styles.italic }, ","),
+  },
   markdownH1 = base.GruvboxGreenBold,
   markdownH2 = "markdownH1",
   markdownH3 = base.GruvboxYellowBold,
diff --git a/lua/gruvbox/plugins/airline.lua b/lua/gruvbox/plugins/airline.lua
deleted file mode 100644
index 8f80701..0000000
--- a/lua/gruvbox/plugins/airline.lua
+++ /dev/null
@@ -1,154 +0,0 @@
-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" })
-
-  -- 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
-
-  -- 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"] = vim.fn["airline#themes#generate_color_map"](I1, I2, I3)
-
-  vim.g["airline#themes#gruvbox#palette.insert_modified"] = vim.g["airline#themes#gruvbox#palette.normal_modified"]
-
-  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_warning"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"]
-
-  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_error"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"]
-
-  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_modified.airline_term"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"]
-
-  -- 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"] = vim.fn["airline#themes#generate_color_map"](R1, R2, R3)
-
-  vim.g["airline#themes#gruvbox#palette.replace_modified"] = vim.g["airline#themes#gruvbox#palette.normal_modified"]
-
-  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_warning"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"]
-
-  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_error"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"]
-
-  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_modified.airline_term"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"]
-
-  -- 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"] = vim.fn["airline#themes#generate_color_map"](V1, V2, V3)
-
-  vim.g["airline#themes#gruvbox#palette.visual_modified"] = { airline_c = { V3[1], "", V3[3], "", "" } }
-
-  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_warning"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"]
-
-  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_error"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"]
-
-  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_modified.airline_term"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"]
-
-  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"] = vim.fn["airline#themes#generate_color_map"](C1, C2, C3)
-
-  vim.g["airline#themes#gruvbox#palette.commandline_modified"] = vim.g["airline#themes#gruvbox#palette.normal_modified"]
-
-  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_warning"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_warning"]
-
-  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_error"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_error"]
-
-  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_modified.airline_term"] =
-    vim.g["airline#themes#gruvbox#palette.normal_modified.airline_term"]
-
-  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.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
-
-return M
diff --git a/lua/gruvbox/settings.lua b/lua/gruvbox/settings.lua
index 90c14ed..3cd1078 100644
--- a/lua/gruvbox/settings.lua
+++ b/lua/gruvbox/settings.lua
@@ -12,7 +12,7 @@ local settings = {
   improved_strings = false,
   improved_warnings = false,
   invert_signs = false,
-  invert_selection = true,
+  invert_selection = false,
   invert_tabline = false,
   italicize_comments = true,
   italicize_strings = false,
diff --git a/lua/stylua.toml b/lua/stylua.toml
new file mode 100644
index 0000000..0fd4cb5
--- /dev/null
+++ b/lua/stylua.toml
@@ -0,0 +1,6 @@
+column_width = 120
+line_endings = "Unix"
+indent_type = "Spaces"
+indent_width = 2
+quote_style = "AutoPreferDouble"
+no_call_parentheses = false