diff options
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/options.lua | 1 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins.lua | 13 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/gruvbox-flat.lua | 17 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua | 35 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua | 41 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/plugins/transparent.lua | 30 |
6 files changed, 38 insertions, 99 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/options.lua b/nvim/.config/nvim/lua/tobyvin/options.lua index 78e3d06..01011e0 100644 --- a/nvim/.config/nvim/lua/tobyvin/options.lua +++ b/nvim/.config/nvim/lua/tobyvin/options.lua @@ -10,6 +10,7 @@ M.setup = function() vim.g.netrw_altfile = 1 vim.opt.termguicolors = true + vim.opt.background = "dark" vim.opt.laststatus = 3 vim.opt.undofile = true vim.opt.swapfile = false diff --git a/nvim/.config/nvim/lua/tobyvin/plugins.lua b/nvim/.config/nvim/lua/tobyvin/plugins.lua index 3732be8..30bd4e1 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins.lua @@ -43,18 +43,10 @@ M.plugins = function(use) end, }) - -- TODO: implement custom hls using base-16-gruvbox and remove this use({ - "eddyekofo94/gruvbox-flat.nvim", + "ellisonleao/gruvbox.nvim", config = function() - require("tobyvin.plugins.gruvbox-flat").setup() - end, - }) - - use({ - "xiyaowong/nvim-transparent", - config = function() - require("tobyvin.plugins.transparent").setup() + require("tobyvin.plugins.gruvbox").setup() end, }) @@ -77,7 +69,6 @@ M.plugins = function(use) use({ "williamboman/mason.nvim", - requires = {}, config = function() require("tobyvin.plugins.mason").setup() end, diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox-flat.lua b/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox-flat.lua deleted file mode 100644 index 6fa37b7..0000000 --- a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox-flat.lua +++ /dev/null @@ -1,17 +0,0 @@ -local M = {} - -M.setup = function() - vim.opt.background = "dark" - vim.g.gruvbox_flat_style = "hard" - vim.g.gruvbox_transparent = true - - local theme = require("gruvbox.theme").setup({}) - - vim.g.gruvbox_theme = { - debugBreakpoint = { bg = theme.base.SignColumn.bg, fg = "error" }, - } - - vim.cmd([[colorscheme gruvbox-flat]]) -end - -return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua b/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua new file mode 100644 index 0000000..8d3bbc1 --- /dev/null +++ b/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua @@ -0,0 +1,35 @@ +local M = {} + +M.setup = function() + local status_ok, gruvbox = pcall(require, "gruvbox") + if not status_ok then + vim.notify("Failed to load module 'gruvbox'", vim.log.levels.ERROR) + return + end + + gruvbox.setup({ + bold = false, + italic = false, + inverse = false, + overrides = { + NormalFloat = { bg = "" }, + FloatBorder = { bg = "" }, + ColorColumn = { bg = "" }, + CursorLine = { bg = "" }, + CursorLineNr = { bg = "" }, + SignColumn = { bg = "" }, + GruvboxRedSign = { bg = "" }, + GruvboxGreenSign = { bg = "" }, + GruvboxYellowSign = { bg = "" }, + GruvboxBlueSign = { bg = "" }, + GruvboxPurpleSign = { bg = "" }, + GruvboxAquaSign = { bg = "" }, + GruvboxOrangeSign = { bg = "" }, + }, + transparent_mode = true, + }) + + vim.cmd([[colorscheme gruvbox]]) +end + +return M diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua index 6eecad6..ada021d 100644 --- a/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua +++ b/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua @@ -20,46 +20,6 @@ M.diff_source = function() end end -M.theme = function() - local config = require("gruvbox.config") - local colors = require("gruvbox.colors").setup(config) - - local theme = { - normal = { - a = { bg = colors.info, fg = colors.black }, - b = { bg = colors.bg_highlight, fg = colors.info }, - c = { bg = "none", fg = colors.fg_sidebar, gui = "none" }, - }, - - insert = { - a = { bg = colors.gitSigns.add, fg = colors.black }, - b = { bg = colors.bg_highlight, fg = colors.gitSigns.add }, - }, - command = { - a = { bg = colors.warning, fg = colors.black }, - b = { bg = colors.bg_highlight, fg = colors.warning }, - }, - - visual = { - a = { bg = colors.warning, fg = colors.black }, - b = { bg = colors.bg_highlight, fg = colors.warning }, - }, - - replace = { - a = { bg = colors.error, fg = colors.black }, - b = { bg = colors.bg_highlight, fg = colors.error }, - }, - - inactive = { - a = { bg = "none", fg = colors.info, gui = "none" }, - b = { bg = "none", fg = colors.comment, gui = "none" }, - c = { bg = "none", fg = colors.comment, gui = "none" }, - }, - } - - return theme -end - M.setup = function() local status_ok, lualine = pcall(require, "lualine") if not status_ok then @@ -145,7 +105,6 @@ M.setup = function() lualine.setup({ options = { - theme = M.theme(), refresh = { statusline = 200, }, diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/transparent.lua b/nvim/.config/nvim/lua/tobyvin/plugins/transparent.lua deleted file mode 100644 index 915642c..0000000 --- a/nvim/.config/nvim/lua/tobyvin/plugins/transparent.lua +++ /dev/null @@ -1,30 +0,0 @@ -local M = {} - -M.highlights = function() - require("transparent").setup({ - enable = true, - extra_groups = { - "Normal", - "NormalNC", - "StatusLine", - "StatusLineNC", - "WhichKeyFloat", - "CursorLine", - "ColorColumn", - }, - }) -end - -M.setup = function() - local status_ok, _ = pcall(require, "transparent") - if not status_ok then - vim.notify("failed to load module 'transparent'", vim.log.levels.ERROR) - return - end - - vim.api.nvim_create_autocmd("ColorScheme", { - callback = M.highlights, - }) -end - -return M |