refactor(nvim): simplify lualine and colorscheme

7 files changed, 39 insertions, 131 deletions

diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index b66970a..aee622c 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -42,7 +42,6 @@
   "nvim-dap-virtual-text": { "branch": "master", "commit": "ab988dbb7d20cdaebf9b3ef7554a89f6895de042" },
   "nvim-jdtls": { "branch": "master", "commit": "aa04fc0e4d8acbfa43efc6a6f7162b01987257a1" },
   "nvim-lspconfig": { "branch": "master", "commit": "5f7a8311dd6e67de74c12fa9ac2f1aa75f72b19e" },
-  "nvim-navic": { "branch": "master", "commit": "83dc174da915f9dbc9b51169e9b62a2e0d42b527" },
   "nvim-neoclip.lua": { "branch": "main", "commit": "591f1b62343efe3e369e4831cd91e1875f3a08f4" },
   "nvim-notify": { "branch": "master", "commit": "159c6cf1be25a933f35e97499314c9faab55c98f" },
   "nvim-texlabconfig": { "branch": "master", "commit": "52d9153f870e92444ca901ee30c1853751be0747" },
diff --git a/nvim/.config/nvim/lua/lualine/themes/gruvbox.lua b/nvim/.config/nvim/lua/lualine/themes/gruvbox.lua
deleted file mode 100644
index b139f9b..0000000
--- a/nvim/.config/nvim/lua/lualine/themes/gruvbox.lua
+++ /dev/null
@@ -1,32 +0,0 @@
-return {
-	normal = {
-		a = "StatusLineNormal",
-		b = "StatusLine",
-		c = "StatusLineNC",
-	},
-	insert = {
-		a = "StatusLineInsert",
-		b = "StatusLine",
-		c = "StatusLineNC",
-	},
-	visual = {
-		a = "StatusLineVisual",
-		b = "StatusLine",
-		c = "StatusLineNC",
-	},
-	replace = {
-		a = "StatusLineReplace",
-		b = "StatusLine",
-		c = "StatusLineNC",
-	},
-	command = {
-		a = "StatusLineCommand",
-		b = "StatusLine",
-		c = "StatusLineNC",
-	},
-	inactive = {
-		a = "StatusLineCommand",
-		b = "StatusLineNC",
-		c = "StatusLineNC",
-	},
-}
diff --git a/nvim/.config/nvim/lua/tobyvin.lua b/nvim/.config/nvim/lua/tobyvin.lua
index 754bdb8..f9ebc7e 100644
--- a/nvim/.config/nvim/lua/tobyvin.lua
+++ b/nvim/.config/nvim/lua/tobyvin.lua
@@ -6,6 +6,8 @@ require("tobyvin.lsp")
 require("tobyvin.lazy")
 require("tobyvin.utils.dashboard")
 
+vim.cmd.colorscheme("gruvbox")
+
 vim.api.nvim_create_autocmd("User", {
 	pattern = "VeryLazy",
 	callback = function()
diff --git a/nvim/.config/nvim/lua/tobyvin/options.lua b/nvim/.config/nvim/lua/tobyvin/options.lua
index 858e5d9..e28ee4d 100644
--- a/nvim/.config/nvim/lua/tobyvin/options.lua
+++ b/nvim/.config/nvim/lua/tobyvin/options.lua
@@ -11,6 +11,7 @@ vim.opt.colorcolumn = "+0"
 vim.opt.completeopt = { "menuone", "noselect", "noinsert" }
 vim.opt.conceallevel = 3
 vim.opt.cursorline = true
+vim.opt.cursorlineopt = "number"
 vim.opt.expandtab = true
 vim.opt.formatoptions = "cqrnj"
 vim.opt.hidden = true
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua b/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua
index 90fe839..699fc9a 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua
@@ -1,59 +1,24 @@
 local M = {
 	"ellisonleao/gruvbox.nvim",
-	lazy = false,
 	priority = 1000,
 	opts = {
 		contrast = "hard",
 		transparent_mode = true,
-		inverse = false,
+		overrides = {
+			CursorLineNr = { bg = "" },
+			DiffDelete = { reverse = false },
+			DiffAdd = { reverse = false },
+			DiffChange = { reverse = false },
+			DiffText = { reverse = false },
+			IndentContext1 = { link = "GruvboxRed" },
+			IndentContext2 = { link = "GruvboxOrange" },
+			IndentContext3 = { link = "GruvboxYellow" },
+			IndentContext4 = { link = "GruvboxGreen" },
+			IndentContext5 = { link = "GruvboxAqua" },
+			IndentContext6 = { link = "GruvboxBlue" },
+			IndentContext7 = { link = "GruvboxViolet" },
+		},
 	},
 }
 
-function M.config(_, opts)
-	require("gruvbox").setup(opts)
-
-	local config = require("gruvbox").config
-	local colors = require("gruvbox.palette").get_base_colors(config.bg, config.contrast)
-
-	config.overrides = {
-		GruvboxNC = { fg = colors.fg4, bg = colors.bg1 },
-		NormalFloat = { bg = "" },
-		FloatBorder = { bg = "" },
-		ColorColumn = { bg = "" },
-		CursorLine = { bg = "" },
-		CursorLineNr = { bg = "" },
-		QuickFixLine = { fg = "", bg = "" },
-		StatusLine = { link = "Pmenu" },
-		StatusLineNC = { link = "GruvboxNC" },
-		StatusLineNCB = { fg = colors.fg4, bg = colors.bg1, bold = config.bold },
-		StatusLineNormal = { fg = colors.bg0, bg = colors.fg4, bold = config.bold },
-		StatusLineOperator = { link = "StatusLineNormal" },
-		StatusLineVisual = { fg = colors.bg0, bg = colors.orange, bold = config.bold },
-		StatusLineVLine = { link = "StatusLineVisual" },
-		StatusLineVBlock = { link = "StatusLineVisual" },
-		StatusLineSelect = { link = "StatusLineVisual" },
-		StatusLineSLine = { link = "StatusLineVisual" },
-		StatusLineSBlock = { link = "StatusLineVisual" },
-		StatusLineInsert = { fg = colors.bg0, bg = colors.blue, bold = config.bold },
-		StatusLineReplace = { fg = colors.bg0, bg = colors.aqua, bold = config.bold },
-		StatusLineCommand = { fg = colors.bg0, bg = colors.green, bold = config.bold },
-		StatusLinePrompt = { link = "StatusLineCommand" },
-		StatusLineConfirm = { link = "StatusLinePrompt" },
-		StatusLineMore = { link = "StatusLinePrompt" },
-		StatusLineEx = { link = "StatusLineCommand" },
-		StatusLineTerminal = { link = "StatusLineEx" },
-		WinBar = { link = "GruvboxNC" },
-		WinBarNC = { link = "GruvboxFg4" },
-		IndentContext1 = { link = "GruvboxRed" },
-		IndentContext2 = { link = "GruvboxOrange" },
-		IndentContext3 = { link = "GruvboxYellow" },
-		IndentContext4 = { link = "GruvboxGreen" },
-		IndentContext5 = { link = "GruvboxAqua" },
-		IndentContext6 = { link = "GruvboxBlue" },
-		IndentContext7 = { link = "GruvboxViolet" },
-	}
-
-	vim.cmd.colorscheme("gruvbox")
-end
-
 return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/init.lua b/nvim/.config/nvim/lua/tobyvin/plugins/init.lua
index d94a4d8..b9732f0 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/init.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/init.lua
@@ -27,7 +27,7 @@ local M = {
 	{
 		"numToStr/Comment.nvim",
 		version = "*",
-		event = "VeryLazy",
+		event = "BufReadPre",
 		config = true,
 	},
 	{
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua b/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua
index 31537ce..5e1a65e 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/lualine.lua
@@ -3,7 +3,6 @@ local M = {
 	event = "VeryLazy",
 	dependencies = {
 		"kyazdani42/nvim-web-devicons",
-		"SmiteshP/nvim-navic",
 	},
 }
 
@@ -12,28 +11,27 @@ function M.config()
 
 	local diagnostic = require("tobyvin.utils.diagnostic")
 
-	local winbar_cond = function()
-		return vim.bo.buflisted and vim.fn.bufname() ~= ""
-	end
-
 	lualine.setup({
 		options = {
 			component_separators = "",
 			section_separators = "",
+			ignore_focus = {
+				"TelescopePrompt",
+				"TelescopeResults",
+			},
 		},
 
 		sections = {
-			lualine_a = { {
-				"mode",
-				fmt = function(str)
-					return str:sub(1, 1)
-				end,
-			} },
-			lualine_b = {
+			lualine_a = {
 				{
-					"branch",
-					color = "StatusLine",
+					"mode",
+					fmt = function(str)
+						return str:sub(1, 1)
+					end,
 				},
+			},
+			lualine_b = {
+				"branch",
 				{
 					"diff",
 					source = function()
@@ -47,7 +45,6 @@ function M.config()
 						end
 					end,
 					padding = { left = 0, right = 1 },
-					color = "StatusLine",
 				},
 			},
 			lualine_c = {
@@ -68,22 +65,12 @@ function M.config()
 						hint = diagnostic.signs.hint.hl,
 					},
 					update_in_insert = true,
-					color = "StatusLineNC",
 				},
 			},
 			lualine_x = {
-				{
-					"encoding",
-					color = "StatusLineNC",
-				},
-				{
-					"fileformat",
-					color = "StatusLineNC",
-				},
-				{
-					"filetype",
-					color = "StatusLineNC",
-				},
+				"encoding",
+				"fileformat",
+				"filetype",
 			},
 		},
 
@@ -92,28 +79,18 @@ function M.config()
 				{
 					"filename",
 					path = 1,
-					color = "StatusLineNC",
 				},
 			},
 			lualine_x = {
-				{
-					"filetype",
-					color = "StatusLineNC",
-				},
-				{
-					"location",
-					color = "StatusLineNC",
-				},
+				"filetype",
+				"location",
 			},
 		},
 		tabline = {
 			lualine_b = {
-				{
-					function()
-						return vim.fn.fnamemodify(vim.fn.getcwd(), ":~")
-					end,
-					color = "StatusLine",
-				},
+				function()
+					return vim.fn.fnamemodify(vim.fn.getcwd(), ":~")
+				end,
 			},
 			lualine_c = {
 				{
@@ -121,14 +98,10 @@ function M.config()
 					path = 1,
 					shorten = true,
 					file_status = false,
-					color = "StatusLineNC",
 				},
 			},
 			lualine_y = {
-				{
-					"tabs",
-					color = "StatusLine",
-				},
+				"tabs",
 			},
 		},