3 files changed, 38 insertions, 11 deletions
diff --git a/lua/lvim/config/_deprecated.lua b/lua/lvim/config/_deprecated.lua
index d71d1c94..75b8daf8 100644
--- a/lua/lvim/config/_deprecated.lua
+++ b/lua/lvim/config/_deprecated.lua
@@ -57,15 +57,7 @@ function M.handle()
   lvim.lsp.float = {}
   setmetatable(lvim.lsp.float, {
     __newindex = function(_, k, _)
-      deprecate("lvim.lsp.float." .. k, "Use `lvim.lsp.handlers` instead.")
-    end,
-  })
-
-  ---@deprecated
-  lvim.lsp.diagnostics = {}
-  setmetatable(lvim.lsp.diagnostics, {
-    __newindex = function(_, k, _)
-      deprecate("lvim.lsp.diagnostics." .. k, "Use `vim.diagnostic.config()` instead.")
+      deprecate("lvim.lsp.float." .. k, "Use `float` option in `vim.diagnostic.config()` instead.")
     end,
   })
 
@@ -75,6 +67,10 @@ function M.handle()
 end
 
 function M.post_load()
+  if lvim.lsp.diagnostics and not vim.tbl_isempty(lvim.lsp.diagnostics) then
+    deprecate("lvim.lsp.diagnostics", "Use `vim.diagnostic.config()` instead")
+  end
+
   if lvim.lsp.override and not vim.tbl_isempty(lvim.lsp.override) then
     deprecate("lvim.lsp.override", "Use `lvim.lsp.automatic_configuration.skipped_servers` instead")
     vim.tbl_map(function(c)
diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua
index 4ed9693f..90c17888 100644
--- a/lua/lvim/config/init.lua
+++ b/lua/lvim/config/init.lua
@@ -29,8 +29,6 @@ function M:init()
   local lvim_lsp_config = require "lvim.lsp.config"
   lvim.lsp = vim.deepcopy(lvim_lsp_config)
 
-  require("lvim.lsp.handlers").load_defaults()
-
   lvim.builtin.luasnip = {
     sources = {
       friendly_snippets = true,
diff --git a/lua/lvim/config/settings.lua b/lua/lvim/config/settings.lua
index 42281ca1..b43b620e 100644
--- a/lua/lvim/config/settings.lua
+++ b/lua/lvim/config/settings.lua
@@ -74,6 +74,39 @@ M.load_default_options = function()
       ["[jt]sconfig.*.json"] = "jsonc",
     },
   }
+
+  local default_diagnostic_config = {
+    signs = {
+      active = true,
+      values = {
+        { name = "DiagnosticSignError", text = lvim.icons.diagnostics.Error },
+        { name = "DiagnosticSignWarn", text = lvim.icons.diagnostics.Warning },
+        { name = "DiagnosticSignHint", text = lvim.icons.diagnostics.Hint },
+        { name = "DiagnosticSignInfo", text = lvim.icons.diagnostics.Information },
+      },
+    },
+    virtual_text = true,
+    update_in_insert = false,
+    underline = true,
+    severity_sort = true,
+    float = {
+      focusable = true,
+      style = "minimal",
+      border = "rounded",
+      source = "always",
+      header = "",
+      prefix = "",
+      format = function(d)
+        local code = d.code or (d.user_data and d.user_data.lsp.code)
+        if code then
+          return string.format("%s [%s]", d.message, code):gsub("1. ", "")
+        end
+        return d.message
+      end,
+    },
+  }
+
+  vim.diagnostic.config(default_diagnostic_config)
 end
 
 M.load_headless_options = function()