diff options
| -rw-r--r-- | autoload/lightline/colorscheme/gruvbox.vim | 2 | ||||
| -rw-r--r-- | lua/gruvbox/init.lua | 2 | ||||
| -rw-r--r-- | lua/gruvbox/plugins/lightline.lua | 123 |
3 files changed, 56 insertions, 71 deletions
diff --git a/autoload/lightline/colorscheme/gruvbox.vim b/autoload/lightline/colorscheme/gruvbox.vim new file mode 100644 index 0000000..1bc987d --- /dev/null +++ b/autoload/lightline/colorscheme/gruvbox.vim @@ -0,0 +1,2 @@ +let s:palette = v:lua.require('gruvbox.plugins.lightline') +let g:lightline#colorscheme#gruvbox#palette = lightline#colorscheme#fill(s:palette) diff --git a/lua/gruvbox/init.lua b/lua/gruvbox/init.lua index 2013d8d..eb9ff71 100644 --- a/lua/gruvbox/init.lua +++ b/lua/gruvbox/init.lua @@ -11,6 +11,4 @@ M.load = function() utils.highlights(spec) end -require("gruvbox.plugins.lightline").init(spec) - return M diff --git a/lua/gruvbox/plugins/lightline.lua b/lua/gruvbox/plugins/lightline.lua index 1a2a5e1..3e3991e 100644 --- a/lua/gruvbox/plugins/lightline.lua +++ b/lua/gruvbox/plugins/lightline.lua @@ -1,72 +1,57 @@ -- lightline support -local M = {} +local theme = require("gruvbox.base") +local bg0 = theme.GruvboxBg0.fg +local bg1 = theme.GruvboxBg1.fg +local bg2 = theme.GruvboxBg2.fg +local bg4 = theme.GruvboxBg4.fg +local fg1 = theme.GruvboxFg1.fg +local fg4 = theme.GruvboxFg4.fg -M.init = function(theme) - if vim.g.lightline == nil then - return - end +local yellow = theme.GruvboxYellow.fg +local blue = theme.GruvboxBlue.fg +local aqua = theme.GruvboxAqua.fg +local orange = theme.GruvboxOrange.fg +local red = theme.GruvboxRed.fg +local green = theme.GruvboxGreen.fg - local bg0 = theme.GruvboxBg0.fg - local bg1 = theme.GruvboxBg1.fg - local bg2 = theme.GruvboxBg2.fg - local bg4 = theme.GruvboxBg4.fg - local fg1 = theme.GruvboxFg1.fg - local fg4 = theme.GruvboxFg4.fg - - local yellow = theme.GruvboxYellow.fg - local blue = theme.GruvboxBlue.fg - local aqua = theme.GruvboxAqua.fg - local orange = theme.GruvboxOrange.fg - local red = theme.GruvboxRed.fg - local green = theme.GruvboxGreen.fg - - local lightline_theme = { - normal = { - left = { { bg0, fg4, "bold" }, { fg4, bg2 } }, - middle = { { fg4, bg1 } }, - right = { { bg0, fg4 }, { fg4, bg2 } }, - error = { { bg0, red } }, - warning = { { bg0, yellow } }, - }, - insert = { - left = { { bg0, blue, "bold" }, { fg1, bg2 } }, - middle = { { fg4, bg1 } }, - right = { { bg0, blue }, { fg1, bg2 } }, - }, - inactive = { - left = { { bg4, bg1 } }, - middle = { { bg4, bg1 } }, - right = { { bg4, bg1 }, { bg4, bg1 } }, - }, - terminal = { - left = { { bg0, green, "bold" }, { fg1, bg2 } }, - middle = { { fg4, bg1 } }, - right = { { bg0, green }, { fg1, bg2 } }, - }, - replace = { - left = { { bg0, aqua, "bold" }, { fg1, bg2 } }, - middle = { { fg4, bg1 } }, - right = { { bg0, aqua }, { fg1, bg2 } }, - }, - visual = { - left = { { bg0, orange, "bold" }, { bg0, bg4 } }, - middle = { { fg4, bg1 } }, - right = { { bg0, orange }, { bg0, bg4 } }, - }, - tabline = { - left = { { fg4, bg2 } }, - middle = { { bg0, bg4 } }, - right = { { bg0, orange } }, - tabsel = { { bg0, fg4 } }, - }, - } - - local ll_filled = vim.fn["lightline#colorscheme#fill"](lightline_theme) - vim.g["lightline#colorscheme#gruvbox#palette"] = ll_filled - vim.schedule(function() - vim.fn["lightline#disable"]() - vim.fn["lightline#enable"]() - end) -end - -return M +local lightline_theme = { + normal = { + left = { { bg0, fg4, "bold" }, { fg4, bg2 } }, + middle = { { fg4, bg1 } }, + right = { { bg0, fg4 }, { fg4, bg2 } }, + error = { { bg0, red } }, + warning = { { bg0, yellow } }, + }, + insert = { + left = { { bg0, blue, "bold" }, { fg1, bg2 } }, + middle = { { fg4, bg1 } }, + right = { { bg0, blue }, { fg1, bg2 } }, + }, + inactive = { + left = { { bg4, bg1 } }, + middle = { { bg4, bg1 } }, + right = { { bg4, bg1 }, { bg4, bg1 } }, + }, + terminal = { + left = { { bg0, green, "bold" }, { fg1, bg2 } }, + middle = { { fg4, bg1 } }, + right = { { bg0, green }, { fg1, bg2 } }, + }, + replace = { + left = { { bg0, aqua, "bold" }, { fg1, bg2 } }, + middle = { { fg4, bg1 } }, + right = { { bg0, aqua }, { fg1, bg2 } }, + }, + visual = { + left = { { bg0, orange, "bold" }, { bg0, bg4 } }, + middle = { { fg4, bg1 } }, + right = { { bg0, orange }, { bg0, bg4 } }, + }, + tabline = { + left = { { fg4, bg2 } }, + middle = { { bg0, bg4 } }, + right = { { bg0, orange } }, + tabsel = { { bg0, fg4 } }, + }, +} +return lightline_theme |