From e11638b1ed08dba0f865a33a6dcdee9fb1f589a7 Mon Sep 17 00:00:00 2001
From: Mat Jones <mat@mjones.network>
Date: Thu, 30 May 2024 14:08:51 -0400
Subject: [PATCH] fix(nvim): Update diagnostics signs config

---
 nvim/lua/my/configure/heirline/shared.lua       | 4 ++--
 nvim/lua/my/configure/heirline/statuscolumn.lua | 2 +-
 nvim/lua/my/utils/lsp.lua                       | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/nvim/lua/my/configure/heirline/shared.lua b/nvim/lua/my/configure/heirline/shared.lua
index 6a020406..ab67a50a 100644
--- a/nvim/lua/my/configure/heirline/shared.lua
+++ b/nvim/lua/my/configure/heirline/shared.lua
@@ -57,8 +57,8 @@ function M.Diagnostics(is_winbar, bg)
       :map(function(severity)
         local component = {
           provider = function(self)
-            local sign = vim.fn.sign_getdefined('DiagnosticSign' .. severity_name[severity])[1]
-            return string.format('%s%s ', sign and sign.text, self.counts[severity] or 0)
+            local sign = vim.diagnostic.config().signs.text[severity]
+            return string.format('%s%s ', sign, self.counts[severity] or 0)
           end,
           hl = function()
             return { fg = utils.get_highlight(string.format('DiagnosticSign%s', severity_name[severity])).fg, bg = bg }
diff --git a/nvim/lua/my/configure/heirline/statuscolumn.lua b/nvim/lua/my/configure/heirline/statuscolumn.lua
index e60d9c8b..228f64c5 100644
--- a/nvim/lua/my/configure/heirline/statuscolumn.lua
+++ b/nvim/lua/my/configure/heirline/statuscolumn.lua
@@ -33,7 +33,7 @@ M.DiagnosticSign = {
       -- only show the highest severity sign
       if diagnostics and #diagnostics > 0 then
         self.has_sign = true
-        self.sign = vim.fn.sign_getdefined('DiagnosticSign' .. severity_name[diagnostics[1].severity])[1]
+        self.sign = vim.diagnostic.config().signs.text[diagnostics[1].severity]
       end
     end,
     provider = function(self)
diff --git a/nvim/lua/my/utils/lsp.lua b/nvim/lua/my/utils/lsp.lua
index 383679cc..70b62220 100644
--- a/nvim/lua/my/utils/lsp.lua
+++ b/nvim/lua/my/utils/lsp.lua
@@ -48,10 +48,6 @@ function M.apply_ui_tweaks()
     Hint = ' ',
     Info = ' ',
   }
-  for type, icon in pairs(icons) do
-    local highlight = 'DiagnosticSign' .. type
-    vim.fn.sign_define(highlight, { text = icon, texthl = highlight, numhl = highlight })
-  end
 
   local icon_map = {
     [vim.diagnostic.severity.ERROR] = icons.Error,
@@ -72,7 +68,7 @@ function M.apply_ui_tweaks()
     float = {
       format = diagnostic_format,
     },
-    signs = { priority = 100 },
+    signs = { priority = 100, text = icon_map },
     underline = true,
     update_in_insert = false,
     severity_sort = true,