nvim: update trouble icons and tweak behavior

chris468 · Jun 18, 2024 · ea327c7 · ea327c7
1 parent 1be3283
commit ea327c7
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 41 deletions.
diff --git a/dotfiles/private_dot_config/nvim/lua/chris468/config/icons.lua b/dotfiles/private_dot_config/nvim/lua/chris468/config/icons.lua
@@ -16,33 +16,44 @@ return {
     newfile = "", -- nf-md-file_question
     modified = "●",
     readonly = "󰌾", -- nf-md-lock
+    folder_closed = "",
+    folder_open = "",
+    folder_empty = "󰉖",
+    folder_empty_open = "󰷏",
   },
-  symbols = {
-    text = "",
-    method = "",
-    ["function"] = "",
-    constructor = "",
-    field = "",
-    variable = "",
-    class = "",
-    interface = "",
-    module = "",
-    property = "",
-    unit = "",
-    value = "",
-    enum = "",
-    keyword = "",
-    snippet = "",
-    color = "",
-    file = "",
-    reference = "",
-    folder = "",
-    enumMember = "",
-    constant = "",
-    struct = "",
-    event = "",
-    operator = "",
-    typeParameter = "",
+  kinds = {
+    Array = "",
+    Boolean = "",
+    Class = "",
+    Color = "",
+    Constant = "",
+    Constructor = "",
+    Enum = "",
+    EnumMember = "",
+    Event = "",
+    Field = "",
+    File = "",
+    Folder = "",
+    Function = "",
+    Interface = "",
+    Key = "",
+    Keyword = "",
+    Method = "",
+    Module = "",
+    Namespace = "",
+    Object = "",
+    Operator = "",
+    Package = "",
+    Property = "",
+    Reference = "",
+    Snippet = "",
+    String = "",
+    Struct = "",
+    Text = "",
+    TypeParameter = "",
+    Unit = "",
+    Value = "",
+    Variable = "",
   },
   history = "",
   command = ">",

diff --git a/dotfiles/private_dot_config/nvim/lua/chris468/plugins/cmp.lua b/dotfiles/private_dot_config/nvim/lua/chris468/plugins/cmp.lua
@@ -15,7 +15,7 @@ function format.default(entry, vim_item)
 end
 
 function format.nvim_lsp(_, vim_item)
-  local icon = (vim_item.kind and icons.symbols[string.lower(vim_item.kind)]) or " "
+  local icon = (vim_item.kind and icons.kinds[vim_item.kind]) or " "
   vim_item.kind = icon
 
   return vim_item
@@ -47,7 +47,7 @@ function format.path(_, vim_item)
 end
 
 function format.buffer(_, vim_item)
-  vim_item.kind = icons.symbols.text
+  vim_item.kind = icons.kinds.text
   return vim_item
 end
 

diff --git a/dotfiles/private_dot_config/nvim/lua/chris468/plugins/neo-tree.lua b/dotfiles/private_dot_config/nvim/lua/chris468/plugins/neo-tree.lua
@@ -1,4 +1,4 @@
-local icons = require("chris468.config.icons").diagnostic
+local icons = require("chris468.config.icons")
 
 local function reveal()
   local buf = vim.bo.filetype == "neo-tree" and "#" or "%"
@@ -86,12 +86,18 @@ return {
     default_component_configs = {
       diagnostics = {
         symbols = {
-          error = icons.error .. " ",
-          warn = icons.warn .. " ",
+          error = icons.diagnostic.error .. " ",
+          warn = icons.diagnostic.warn .. " ",
           info = "",
           hint = "",
         },
       },
+      icon = {
+        folder_closed = icons.file.folder_closed,
+        folder_open = icons.file.folder_open,
+        folder_empty = icons.file.folder_empty,
+        folder_empty_open = icons.file.folder_empty_open,
+      },
     },
     event_handlers = {
       {

diff --git a/dotfiles/private_dot_config/nvim/lua/chris468/plugins/nvim-lspconfig.lua b/dotfiles/private_dot_config/nvim/lua/chris468/plugins/nvim-lspconfig.lua
@@ -1,4 +1,4 @@
-local icons = require("chris468.config.icons").diagnostic
+local icons = require("chris468.config.icons")
 local config = require("chris468.config")
 local util = require("chris468.util")
 
@@ -90,19 +90,19 @@ end)()
 
 local signs = {
   [vim.diagnostic.severity.ERROR] = {
-    icon = icons.error,
+    icon = icons.diagnostic.error,
     hl = "DiagnosticError",
   },
   [vim.diagnostic.severity.WARN] = {
-    icon = icons.warn,
+    icon = icons.diagnostic.warn,
     hl = "DiagnosticWarn",
   },
   [vim.diagnostic.severity.INFO] = {
-    icon = icons.info,
+    icon = icons.diagnostic.info,
     hl = "DiagnosticInfo",
   },
   [vim.diagnostic.severity.HINT] = {
-    icon = icons.hint,
+    icon = icons.diagnostic.hint,
     hl = "DiagnosticHint",
   },
 }
@@ -199,10 +199,10 @@ return {
       signs = {
         severity = { min = vim.diagnostic.severity.WARN },
         text = {
-          [vim.diagnostic.severity.ERROR] = icons.error,
-          [vim.diagnostic.severity.WARN] = icons.warn,
-          [vim.diagnostic.severity.INFO] = icons.info,
-          [vim.diagnostic.severity.HINT] = icons.hint,
+          [vim.diagnostic.severity.ERROR] = icons.diagnostic.error,
+          [vim.diagnostic.severity.WARN] = icons.diagnostic.warn,
+          [vim.diagnostic.severity.INFO] = icons.diagnostic.info,
+          [vim.diagnostic.severity.HINT] = icons.diagnostic.hint,
         },
         numhl = {
           [vim.diagnostic.severity.INFO] = "DiagnosticInfo",
@@ -260,13 +260,22 @@ return {
     {
       "folke/trouble.nvim",
       cmd = { "Trouble" },
-      config = true,
       keys = {
         { "<leader>cd", open_document_diagnostics, desc = "Document diagnostics" },
         { "<leader>cD", open_workspace_diagnostics, desc = "Workspace diagnostics" },
         { "<leader>cx", "<cmd>Trouble close<cr>", desc = "Close trouble" },
       },
       lazy = true,
+      opts = {
+        auto_jump = true,
+        focus = true,
+        follow = false,
+        icons = {
+          folder_closed = icons.file.folder_closed,
+          folder_open = icons.file.folder_open,
+          kinds = icons.kinds,
+        },
+      },
     },
   },
   keys = {