Merge changes from main

nvim/base.lua

@@ -131,3 +131,40 @@ vim.api.nvim_create_user_command('TrimWhiteSpace', function()
    vim.cmd('%s/\\s\\+$//e')
 end, {})
 
+
+---------------------------
+------- DIAGNOSTICS -------
+---------------------------
+
+vim.diagnostic.config({
+  update_in_insert = true,
+  signs = true,
+  virtual_text = {
+    prefix = '● ',
+    current_line = false,
+    severity = {
+      -- min = vim.diagnostic.severity.INFO,
+      max = vim.diagnostic.severity.INFO,
+    },
+  },
+  virtual_lines = {
+    current_line = false,
+    severity = {
+      min = vim.diagnostic.severity.WARN,
+      -- max = vim.diagnostic.severity.WARN,
+    },
+  },
+  float = {
+    prefix = '',
+    focusable = false,
+    style = "minimal",
+    border = "rounded",
+    source = "always",
+    header = "",
+  },
+})
+
+vim.cmd([[highlight DiagnosticUnderlineError gui=undercurl guifg=Red]])
+vim.cmd([[highlight DiagnosticUnderlineWarn gui=undercurl guifg=Yellow]])
+vim.cmd([[highlight DiagnosticUnderlineInfo gui=undercurl guifg=Blue]])
+vim.cmd([[highlight DiagnosticUnderlineHint gui=undercurl guifg=Cyan]])