5 files changed, 31 insertions, 35 deletions
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua
index e9c3f22..38168cd 100644
--- a/.config/nvim/lua/config/lazy.lua
+++ b/.config/nvim/lua/config/lazy.lua
@@ -137,6 +137,11 @@ require('lazy').setup({
 				}
 			}
 		},
+		{
+			'folke/trouble.nvim',
+			opts = {},
+			cmd = "Trouble",
+		},
 		{ import = "plugins" },
 	},
 })
diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua
index 2fceccc..548fb11 100644
--- a/.config/nvim/lua/config/settings.lua
+++ b/.config/nvim/lua/config/settings.lua
@@ -40,10 +40,6 @@ vim.opt.termguicolors = true
 vim.opt.bg = 'dark'
 vim.opt.guicursor:remove { 't:block-blinkon500-blinkoff500-TermCursor' }
 
-vim.g.gruvbox_material_background = 'medium'
-vim.g.gruvbox_material_foreground = 'original'
-vim.g.gruvbox_material_better_performance = 1
-
 vim.cmd [[
 syntax on
 
@@ -92,3 +88,24 @@ vim.api.nvim_create_autocmd('TextYankPost', {
   group = highlight_group,
   pattern = '*',
 })
+
+vim.diagnostic.enable = true
+
+vim.diagnostic.config({
+	virtual_text = {
+		source = "if_many",
+		prefix = "|",
+		spacing = 2,
+	},
+	signs = {
+		text = {
+			[vim.diagnostic.severity.ERROR] = " ",
+			[vim.diagnostic.severity.WARN]  = " ",
+			[vim.diagnostic.severity.INFO]  = " ",
+			[vim.diagnostic.severity.HINT]  = " ",
+		},
+  },
+	underline = true,
+	update_in_insert = true,
+	severity_sort = true,
+})
diff --git a/.config/nvim/lua/plugins/gruvbox.lua b/.config/nvim/lua/plugins/gruvbox.lua
index bf99776..a1ffe02 100644
--- a/.config/nvim/lua/plugins/gruvbox.lua
+++ b/.config/nvim/lua/plugins/gruvbox.lua
@@ -24,6 +24,7 @@ return {
 			contrast = "hard", -- can be "hard", "soft" or empty string
 			palette_overrides = {},
 			overrides = {
+				["@comment"] = { fg = "#928374", italic = false },
 				["@punctuation.delimiter"] = { fg = "#928374" },
 				String                     = { fg = "#8ec07c" },
 			},
diff --git a/.config/nvim/lua/plugins/lspkind.lua b/.config/nvim/lua/plugins/lspkind.lua
index e838f56..4326c76 100644
--- a/.config/nvim/lua/plugins/lspkind.lua
+++ b/.config/nvim/lua/plugins/lspkind.lua
@@ -95,14 +95,14 @@ return {
 						{ name = 'path' },
 					}),
 				window = {
-					completion = cmp.config.window.bordered({
+					completion = {
 						border = 'none',
 						winhighlight = "Normal:CmpNormal,FloatBorder:CmpNormal,CursorLine:PmenuSel,Search:None",
-					}),
-					documentation = cmp.config.window.bordered({
+					},
+					documentation = {
 						border = 'none',
 						winhighlight = "Normal:CmpNormal,FloatBorder:CmpNormal,CursorLine:PmenuSel,Search:None",
-					}),
+					},
 				},
 			})
 		end,
diff --git a/.config/nvim/lua/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua
deleted file mode 100644
index 11c23a3..0000000
--- a/.config/nvim/lua/plugins/trouble.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-return {
-	{
-		'folke/trouble.nvim',
-		requires = {
-			{'nvim-tree/nvim-web-devicons'},
-		},
-		config = function()
-			require('trouble').setup {
-				-- icons = true,
-			}
-
-			-- Diagnostic signs
-			-- https://github.com/folke/trouble.nvim/issues/52
-			local signs = {
-				Error = " ",
-				Warn = " ",
-				Hint = " ",
-				Info = " "
-			}
-
-			for type, icon in pairs(signs) do
-				local hl = "DiagnosticSign" .. type
-				vim.fn.sign_define(hl, {text = icon, texthl = hl, numhl = hl})
-			end
-		end
-	}
-}