From e36e2a78faab054aadde558ab4d349c8616f1935 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Wed, 19 Jul 2023 18:58:36 -0400
Subject: [PATCH] better icons for nvim-tree

---
 nix/base-system/flake.nix |  1 -
 nix/base-system/init.lua  | 72 ++++++++++++++++++++++++++++-----------
 nix/darwin/flake.lock     |  6 ++--
 3 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index e276e73..14027c6 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -59,7 +59,6 @@
             packages.myVimPackage = with pkgs.vimPlugins; {
               start = [
                 nvim-tree-lua
-                nvim-web-devicons
                 nvim-lspconfig
                 packer-nvim
                 vim-lsp
diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua
index dcd7b96..4524beb 100644
--- a/nix/base-system/init.lua
+++ b/nix/base-system/init.lua
@@ -1,7 +1,7 @@
 -- theming
 -- Default options
 vim.opt.termguicolors = true
-vim.cmd.colorscheme 'melange'
+vim.cmd.colorscheme 'duskfox'
 
 --https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
 
@@ -26,7 +26,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
   callback = function(args)
   	local opts = { buffer = args.buf }
     vim.keymap.set("n", '<C-Space>', function()
-		vim.notify("triggering hover")
 		vim.lsp.buf.hover()
 	end, opts)
     vim.keymap.set({"n", "v"}, "<Leader>a", vim.lsp.buf.code_action, opts)
@@ -35,7 +34,6 @@ vim.api.nvim_create_autocmd('LspAttach', {
     vim.keymap.set("n", "<Leader>f", vim.lsp.buf.format, opts)
     -- We use F2 to rename things
     vim.keymap.set("n", "<F2>", vim.lsp.buf.rename, opts)
-    --vim.keymap.set("n", "", vim.lsp.buf.implementation, { buffer = args.buf })
   end,
 })
 
@@ -78,6 +76,7 @@ let g:coq_settings = { 'auto_start': 'shut-up', 'display.icons.mode': "none" }
 ]])
 
 require("coq")
+
 --Set completeopt to have a better completion experience
 -- :help completeopt
 -- menuone: popup even when there's only one match
@@ -118,23 +117,55 @@ vim.g.loaded_netrwPlugin = 1
 -- set termguicolors to enable highlight groups
 vim.opt.termguicolors = true
 
--- Ensure nvim-web-deicons is loaded
-require'nvim-web-devicons'.setup{}
-
 -- setup nvim-tree
-require("nvim-tree").setup{}
---({
---  sort_by = "case_sensitive",
---  view = {
---    width = 30,
---  },
---  renderer = {
---    group_empty = true,
---  },
---  filters = {
---    dotfiles = false,
---  },
---})
+require("nvim-tree").setup{
+    hijack_unnamed_buffer_when_opening = true,
+    update_focused_file = {
+        enable = true,
+    },
+    renderer = {
+         icons = {
+            show = {
+                file = false,
+            },
+            glyphs = {
+              default = "-",
+              symlink = "S",
+              bookmark = "🎗",
+              modified = "●",
+              folder = {
+                arrow_closed = "→",
+                arrow_open = "↓",
+                default = "📁",
+                open = "📂",
+                empty = "📁",
+                empty_open = "📂",
+                symlink = "S",
+                symlink_open = "S",
+              },
+              git = {
+                unstaged = "✗",
+                staged = "✓",
+                unmerged = "∦",
+                renamed = "➜",
+                untracked = "★",
+                deleted = "X",
+                ignored = "◌",
+              },
+            },
+         },
+    }, 
+    diagnostics = {
+        enable = true,
+        show_on_dirs = true,
+        icons = {
+            hint = "➡️",
+            info = "🗒️",
+            warning = "⚠️",
+            error = "🔥",
+        },
+    },
+}
 
 vim.keymap.set("n", "<C-p>", function()
     require("nvim-tree.api").tree.toggle()
@@ -145,4 +176,5 @@ vim.keymap.set("i", "<C-j>", function()
     vim.notify("Handling C-J")
 end)
 
---require("nvim-tree.api").tree.toggle()
+-- Show whatever errors we have in our trouble pane
+vim.keymap.set("n", "<Leader>se", "<cmd>TroubleToggle<cr>", { silent = true, noremap = true })
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index 982a7a2..f5f910b 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -34,12 +34,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-NlOk51ujCXm2QHrWO2DOmtVCUtzZOXas4pTW7g4fkTk=",
-        "path": "/nix/store/y4lmj3z90jh5ix429z2xq7n8my0fi7gq-source/nix/base-system",
+        "narHash": "sha256-YrrxHkALyausm0D+AM11ASh69rin9vjriAiqN/rJyEY=",
+        "path": "/nix/store/2nxf006c1lj38nalx661gpv1c8wc36bq-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/y4lmj3z90jh5ix429z2xq7n8my0fi7gq-source/nix/base-system",
+        "path": "/nix/store/2nxf006c1lj38nalx661gpv1c8wc36bq-source/nix/base-system",
         "type": "path"
       }
     },