Squashed 'common/config/nvim/' changes from 2a8020a..966d12a

966d12a Update/Overhaul

git-subtree-dir: common/config/nvim
git-subtree-split: 966d12ac730c83da90d60ab24eae539b2ea69441

1 files changed, 373 insertions, 317 deletions

diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua
index e817c04..a212eab 100644..100755
--- a/lua/plugins/nvim-tree.lua
+++ b/lua/plugins/nvim-tree.lua
@@ -1,13 +1,126 @@
------------------------------------------------------------
--- Neovim File Tree Configuration
------------------------------------------------------------
+local M = {}
 
---- To see mappings `g?` on nvim-tree
---- To see default mappings `:nvim-tree-default-mappings`
+-- Safe require helper
+local function safe_require(name)
+  local ok, mod = pcall(require, name)
+  return ok and mod or nil
+end
+
+
+local ok, api = pcall(require, 'nvim-tree.api')
+if not ok then return end
+local function on_attach(bufnr)
+  local function opts(desc)
+    return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
+  end
+
+  local mappings = {
+    ["<C-]>"] = { api.tree.change_root_to_node, "CD" },
+    ["<C-e>"] = { api.node.open.replace_tree_buffer, "Open: In Place" },
+    ["<C-k>"] = { api.node.show_info_popup, "Info" },
+    ["<C-r>"] = { api.fs.rename_sub, "Rename: Omit Filename" },
+    ["<C-t>"] = { api.node.open.tab, "Open: New Tab" },
+    ["<C-v>"] = { api.node.open.vertical, "Open: Vertical Split" },
+    ["<C-x>"] = { api.node.open.horizontal, "Open: Horizontal Split" },
+    ["<BS>"] = { api.node.navigate.parent_close, "Close Directory" },
+    -- ["<CR>"] = { api.node.open.edit, "Open" },
+    ["<Tab>"] = { api.node.open.preview, "Open Preview" },
+    [">"] = { api.node.navigate.sibling.next, "Next Sibling" },
+    ["<"] = { api.node.navigate.sibling.prev, "Previous Sibling" },
+    ["."] = { api.node.run.cmd, "Run Command" },
+    ["-"] = { api.tree.change_root_to_parent, "Up" },
+    ["a"] = { api.fs.create, "Create" },
+    ["bmv"] = { api.marks.bulk.move, "Move Bookmarked" },
+    ["B"] = { api.tree.toggle_no_buffer_filter, "Toggle No Buffer" },
+    ["c"] = { api.fs.copy.node, "Copy" },
+    -- ["C"] = { api.tree.toggle_git_clean_filter, "Toggle Git Clean" },
+    ["[c"] = { api.node.navigate.git.prev, "Prev Git" },
+    ["]c"] = { api.node.navigate.git.next, "Next Git" },
+    ["d"] = { api.fs.remove, "Delete" },
+    ["D"] = { api.fs.trash, "Trash" },
+    ["E"] = { api.tree.expand_all, "Expand All" },
+    ["e"] = { api.fs.rename_basename, "Rename: Basename" },
+    ["]e"] = { api.node.navigate.diagnostics.next, "Next Diagnostic" },
+    ["[e"] = { api.node.navigate.diagnostics.prev, "Prev Diagnostic" },
+    ["F"] = { api.live_filter.clear, "Clean Filter" },
+    ["f"] = { api.live_filter.start, "Filter" },
+    ["g?"] = { api.tree.toggle_help, "Help" },
+    ["gy"] = { api.fs.copy.absolute_path, "Copy Absolute Path" },
+    ["H"] = { api.tree.toggle_hidden_filter, "Toggle Dotfiles" },
+    ["I"] = { api.tree.toggle_gitignore_filter, "Toggle Git Ignore" },
+    ["J"] = { api.node.navigate.sibling.last, "Last Sibling" },
+    ["K"] = { api.node.navigate.sibling.first, "First Sibling" },
+    ["m"] = { api.marks.toggle, "Toggle Bookmark" },
+    -- ["o"] = { api.node.open.edit, "Open" },
+    ["O"] = { api.node.open.no_window_picker, "Open: No Window Picker" },
+    ["p"] = { api.fs.paste, "Paste" },
+    ["P"] = { api.node.navigate.parent, "Parent Directory" },
+    ["q"] = { api.tree.close, "Close" },
+    ["r"] = { api.fs.rename, "Rename" },
+    ["R"] = { api.tree.reload, "Refresh" },
+    ["s"] = { api.node.run.system, "Run System" },
+    ["S"] = { api.tree.search_node, "Search" },
+    ["U"] = { api.tree.toggle_custom_filter, "Toggle Hidden" },
+    ["W"] = { api.tree.collapse_all, "Collapse" },
+    ["x"] = { api.fs.cut, "Cut" },
+    ["y"] = { api.fs.copy.filename, "Copy Name" },
+    ["Y"] = { api.fs.copy.relative_path, "Copy Relative Path" },
+    ["<2-LeftMouse>"] = { api.node.open.edit, "Open" },
+    ["<2-RightMouse>"] = { api.tree.change_root_to_node, "CD" },
 
--- Nvim-Tree.lua advises to do this at the start.
-vim.g.loaded_netrw = 1
-vim.g.loaded_netrwPlugin = 1
+    -- Mappings migrated from view.mappings.list
+    ["l"] = { api.node.open.edit, "Open" },
+    ["<CR>"] = { api.node.open.edit, "Open" },
+    ["o"] = { api.node.open.edit, "Open" },
+    ["h"] = { api.node.navigate.parent_close, "Close Directory" },
+    ["v"] = { api.node.open.vertical, "Open: Vertical Split" },
+    ["C"] = { api.tree.change_root_to_node, "CD" },
+  }
+  for keys, mapping in pairs(mappings) do
+    vim.keymap.set("n", keys, mapping[1], opts(mapping[2]))
+  end
+end
+
+---- Icons configuration for nvim-tree
+--local icons = {
+--  webdev_colors = true,
+--  git_placement = "before",
+--  modified_placement = "after",
+--  padding = " ",
+--  symlink_arrow = " ➛ ",
+--  show = {
+--    file = true,
+--    folder = true,
+--    folder_arrow = true,
+--    git = true,
+--    modified = true,
+--  },
+--  glyphs = {
+--    default = "",
+--    symlink = "",
+--    bookmark = "",
+--    modified = "●",
+--    folder = {
+--      arrow_closed = "",
+--      arrow_open = "",
+--      default = "",
+--      open = "",
+--      empty = "",
+--      empty_open = "",
+--      symlink = "",
+--      symlink_open = "",
+--    },
+--    git = {
+--      unstaged = "✗",
+--      staged = "✓",
+--      unmerged = "",
+--      renamed = "➜",
+--      untracked = "★",
+--      deleted = "",
+--      ignored = "◌",
+--    },
+--  },
+--}
 
 local icons = {
   webdev_colors = true,
@@ -39,7 +152,7 @@ local icons = {
     git = {
       deleted = "",
       unmerged = "",
-      untracked = "",
+      untracked = "",
       unstaged = "",
       staged = "",
       renamed = "➜",
@@ -54,6 +167,28 @@ local icons = {
   },
 }
 
+local float = {
+  enable = false,
+  open_win_config = function()
+    local screen_w = vim.o.columns
+    local screen_h = vim.o.lines - vim.o.cmdheight
+    local window_w = screen_w * WIDTH_RATIO
+    local window_h = screen_h * HEIGHT_RATIO
+    local window_w_int = math.floor(window_w)
+    local window_h_int = math.floor(window_h)
+    local center_x = (screen_w - window_w) / 2
+    local center_y = ((vim.o.lines - window_h) / 2) - vim.o.cmdheight
+    return {
+      border = "rounded",
+      relative = "editor",
+      row = center_y,
+      col = center_x,
+      width = window_w_int,
+      height = window_h_int,
+    }
+  end,
+}
+
 local renderer = {
   group_empty = true, -- default: true. Compact folders that only contain a single folder into one node in the file tree.
   highlight_git = false,
@@ -75,33 +210,11 @@ local renderer = {
   },
   icons = icons,
 }
+
 local system_open = { cmd = "zathura" }
 
 local HEIGHT_RATIO = 0.8
 local WIDTH_RATIO = 0.15
-
-local float = {
-  enable = false,
-  open_win_config = function()
-    local screen_w = vim.opt.columns:get()
-    local screen_h = vim.opt.lines:get() - vim.opt.cmdheight:get()
-    local window_w = screen_w * WIDTH_RATIO
-    local window_h = screen_h * HEIGHT_RATIO
-    local window_w_int = math.floor(window_w)
-    local window_h_int = math.floor(window_h)
-    local center_x = (screen_w - window_w) / 2
-    local center_y = ((vim.opt.lines:get() - window_h) / 2) - vim.opt.cmdheight:get()
-    return {
-      border = "rounded",
-      relative = "editor",
-      row = center_y,
-      col = center_x,
-      width = window_w_int,
-      height = window_h_int,
-    }
-  end,
-}
-
 local view = {
   cursorline = true,
   float = float,
@@ -113,311 +226,254 @@ local view = {
   side = "left",
 }
 
-local api = require("nvim-tree.api")
-local function on_attach(bufnr)
-  local function opts(desc)
-    return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
+-- Open nvim-tree when opening a directory
+local function open_nvim_tree(data)
+  -- buffer is a directory
+  local directory = vim.fn.isdirectory(data.file) == 1
+
+  if not directory then
+    return
   end
 
-  local mappings = {
-    ["<C-]>"] = { api.tree.change_root_to_node, "CD" },
-    ["<C-e>"] = { api.node.open.replace_tree_buffer, "Open: In Place" },
-    ["<C-k>"] = { api.node.show_info_popup, "Info" },
-    ["<C-r>"] = { api.fs.rename_sub, "Rename: Omit Filename" },
-    ["<C-t>"] = { api.node.open.tab, "Open: New Tab" },
-    ["<C-v>"] = { api.node.open.vertical, "Open: Vertical Split" },
-    ["<C-x>"] = { api.node.open.horizontal, "Open: Horizontal Split" },
-    ["<BS>"] = { api.node.navigate.parent_close, "Close Directory" },
-    -- ["<CR>"] = { api.node.open.edit, "Open" },
-    ["<Tab>"] = { api.node.open.preview, "Open Preview" },
-    [">"] = { api.node.navigate.sibling.next, "Next Sibling" },
-    ["<"] = { api.node.navigate.sibling.prev, "Previous Sibling" },
-    ["."] = { api.node.run.cmd, "Run Command" },
-    ["-"] = { api.tree.change_root_to_parent, "Up" },
-    ["a"] = { api.fs.create, "Create" },
-    ["bmv"] = { api.marks.bulk.move, "Move Bookmarked" },
-    ["B"] = { api.tree.toggle_no_buffer_filter, "Toggle No Buffer" },
-    ["c"] = { api.fs.copy.node, "Copy" },
-    -- ["C"] = { api.tree.toggle_git_clean_filter, "Toggle Git Clean" },
-    ["[c"] = { api.node.navigate.git.prev, "Prev Git" },
-    ["]c"] = { api.node.navigate.git.next, "Next Git" },
-    ["d"] = { api.fs.remove, "Delete" },
-    ["D"] = { api.fs.trash, "Trash" },
-    ["E"] = { api.tree.expand_all, "Expand All" },
-    ["e"] = { api.fs.rename_basename, "Rename: Basename" },
-    ["]e"] = { api.node.navigate.diagnostics.next, "Next Diagnostic" },
-    ["[e"] = { api.node.navigate.diagnostics.prev, "Prev Diagnostic" },
-    ["F"] = { api.live_filter.clear, "Clean Filter" },
-    ["f"] = { api.live_filter.start, "Filter" },
-    ["g?"] = { api.tree.toggle_help, "Help" },
-    ["gy"] = { api.fs.copy.absolute_path, "Copy Absolute Path" },
-    ["H"] = { api.tree.toggle_hidden_filter, "Toggle Dotfiles" },
-    ["I"] = { api.tree.toggle_gitignore_filter, "Toggle Git Ignore" },
-    ["J"] = { api.node.navigate.sibling.last, "Last Sibling" },
-    ["K"] = { api.node.navigate.sibling.first, "First Sibling" },
-    ["m"] = { api.marks.toggle, "Toggle Bookmark" },
-    -- ["o"] = { api.node.open.edit, "Open" },
-    ["O"] = { api.node.open.no_window_picker, "Open: No Window Picker" },
-    ["p"] = { api.fs.paste, "Paste" },
-    ["P"] = { api.node.navigate.parent, "Parent Directory" },
-    ["q"] = { api.tree.close, "Close" },
-    ["r"] = { api.fs.rename, "Rename" },
-    ["R"] = { api.tree.reload, "Refresh" },
-    ["s"] = { api.node.run.system, "Run System" },
-    ["S"] = { api.tree.search_node, "Search" },
-    ["U"] = { api.tree.toggle_custom_filter, "Toggle Hidden" },
-    ["W"] = { api.tree.collapse_all, "Collapse" },
-    ["x"] = { api.fs.cut, "Cut" },
-    ["y"] = { api.fs.copy.filename, "Copy Name" },
-    ["Y"] = { api.fs.copy.relative_path, "Copy Relative Path" },
-    ["<2-LeftMouse>"] = { api.node.open.edit, "Open" },
-    ["<2-RightMouse>"] = { api.tree.change_root_to_node, "CD" },
+  -- change to the directory
+  vim.cmd.cd(data.file)
 
-    -- Mappings migrated from view.mappings.list
-    ["l"] = { api.node.open.edit, "Open" },
-    ["<CR>"] = { api.node.open.edit, "Open" },
-    ["o"] = { api.node.open.edit, "Open" },
-    ["h"] = { api.node.navigate.parent_close, "Close Directory" },
-    ["v"] = { api.node.open.vertical, "Open: Vertical Split" },
-    ["C"] = { api.tree.change_root_to_node, "CD" },
-  }
-  for keys, mapping in pairs(mappings) do
-    vim.keymap.set("n", keys, mapping[1], opts(mapping[2]))
-  end
+  -- open the tree
+  require("nvim-tree.api").tree.open()
 end
---api.events.subscribe(api.events.Event.FileCreated, function(file)
---  vim.cmd('edit' .. file.fname)
---end)
-
-require("nvim-tree").setup({
-  --auto_reload_on_write = true,
-  --create_in_closed_folder = false,
-  --hijack_cursor = true,
-  --disable_netrw = true,
-  --hijack_netrw = true,
-  --hijack_unnamed_buffer_when_opening = false,
-  --ignore_buffer_on_setup = false,
-  update_focused_file = {
-    enable = true,
+
+
+-- Setup function
+function M.setup()
+  -- Check if nvim-tree is installed
+  --local nvim_tree = safe_require('nvim-tree')
+  --if not nvim_tree then
+  --  return false
+  --end
+
+  local nvim_tree = safe_require('nvim-tree')
+  if type(nvim_tree) ~= "table" or not nvim_tree.setup then
+    --vim.notify("[nvim-tree] Plugin did not load correctly", vim.log.levels.ERROR)
+    return false
+  end
+
+  -- Setup nvim-tree
+  nvim_tree.setup({
+    sync_root_with_cwd = true,
+    respect_buf_cwd = true,
+    disable_netrw = true,
+    hijack_netrw = true,
+    open_on_tab = false,
+    hijack_cursor = false,
     update_cwd = true,
-    update_root = true,
-    ignore_list = {},
-  },
-  root_dirs = {},
-  --prefer_startup_root = true,
-  --hijack_directories = {
-  --  enable = false,
-  --},
-  --respect_buf_cwd = false,
-  sync_root_with_cwd = true,
-  --reload_on_bufenter = false,
-  filesystem_watchers = {
-    enable = true,
-    debounce_delay = 50,
-    ignore_dirs = { "node_modules", ".config/nvm" },
-  },
-  view = view,
-  system_open = system_open,
-  renderer = renderer,
-  on_attach = on_attach,
-  notify = {
-    threshold = vim.log.levels.ERROR,
-  },
-  log = {
-    enable = true,
-    truncate = true,
-    types = {
-      diagnostics = true,
-      git = true,
-      profile = true,
-      watcher = true,
+    hijack_directories = {
+      enable = true,
+      auto_open = true,
     },
-  },
-  git = { ignore = false },
-  diagnostics = {
-    enable = true,
-    show_on_dirs = true,
-    icons = {
-      hint = "⚑",
-      info = "􀅳",
-      warning = "▲",
-      error = "",
+    diagnostics = {
+      enable = true,
+      icons = {
+        error = "✘",
+        warning = "",
+        hint = "◉",
+        info = "",
+      },
     },
-  },
-  trash = {
-    cmd = "gio trash",
-    require_confirm = true,
-  },
-  modified = {
-    enable = true,
-    show_on_dirs = true,
-    show_on_open_dirs = true,
-  },
-  --filters = {
-  --  dotfiles = false,
-  --  git_clean = false,
-  --  no_buffer = false,
-  --  custom = {},
-  --  exclude = {},
-  --},
-  actions = {
-    use_system_clipboard = true,
-    change_dir = {
+    filesystem_watchers = {
+      enable = true,
+      debounce_delay = 50,
+      ignore_dirs = { "node_modules", ".config/nvm" },
+    },
+    update_focused_file = {
       enable = true,
-      global = false,
-      restrict_above_cwd = false,
+      update_cwd = true,
+      --update_root = true,
+      ignore_list = {},
+    },
+    --root_dirs = {},
+    --system_open = {
+    --  --cmd = nil,
+    --  --args = {},
+    --},
+    system_open = system_open,
+    filters = {
+      dotfiles = false,
+      custom = {},
     },
-    remove_file = {
-      close_window = true,
+    --git = {
+    --  enable = true,
+    --  ignore = true,
+    --  timeout = 500,
+    --},
+    git = { ignore = false },
+    view = view,
+    renderer = renderer,
+    --renderer = {
+    --  indent_markers = {
+    --    enable = false,
+    --    icons = {
+    --      corner = "└ ",
+    --      edge = "│ ",
+    --      none = "  ",
+    --    },
+    --  },
+    --  icons = icons,
+    --},
+    on_attach = on_attach,
+    notify = {
+      threshold = vim.log.levels.ERROR,
+    },
+    log = {
+      enable = true,
+      truncate = true,
+      types = {
+        diagnostics = true,
+        git = true,
+        profile = true,
+        watcher = true,
+      },
     },
-    open_file = {
-      quit_on_open = true,
-      --eject = true,
-      resize_window = false,
-      window_picker = {
+    trash = {
+      cmd = "gio trash",
+      require_confirm = true,
+    },
+    modified = {
+      enable = true,
+      show_on_dirs = true,
+      show_on_open_dirs = true,
+    },
+    actions = {
+      use_system_clipboard = true,
+      change_dir = {
         enable = true,
-        chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",
-        exclude = {
-          filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
-          buftype = { "nofile", "terminal", "help" },
+        global = false,
+        restrict_above_cwd = false,
+      },
+      remove_file = {
+        close_window = true,
+      },
+      open_file = {
+        quit_on_open = false,
+        resize_window = true,
+        window_picker = {
+          enable = true,
+          chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890",
+          exclude = {
+            filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" },
+            buftype = { "nofile", "terminal", "help" },
+          },
         },
       },
     },
-  },
-})
-
-local api = require("nvim-tree.api")
-local event = api.events.Event
---api.events.subscribe(event.TreeOpen, function(_)
---  vim.cmd([[setlocal statuscolumn=\ ]])
---  vim.cmd([[setlocal cursorlineopt=number]])
---  vim.cmd([[setlocal fillchars+=vert:🮇]])
---  vim.cmd([[setlocal fillchars+=horizup:🮇]])
---  vim.cmd([[setlocal fillchars+=vertright:🮇]])
---end)
+  })
 
-local function open_nvim_tree(data)
-  vim.cmd.cd(data.file:match("(.+)/[^/]*$"))
-  local directory = vim.fn.isdirectory(data.file) == 1
-  if not directory then
-    return
-  end
-  require("nvim-tree.api").tree.open()
-end
-vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
 
--- Change Root To Global Current Working Directory
-local function change_root_to_global_cwd()
   local api = require("nvim-tree.api")
-  local global_cwd = vim.fn.getcwd(-1, -1)
-  api.tree.change_root(global_cwd)
-end
+  --local event = api.events.Event
+  --api.events.subscribe(event.TreeOpen, function(_)
+  --  vim.cmd([[setlocal statuscolumn=\ ]])
+  --  vim.cmd([[setlocal cursorlineopt=number]])
+  --  vim.cmd([[setlocal fillchars+=vert:🮇]])
+  --  vim.cmd([[setlocal fillchars+=horizup:🮇]])
+  --  vim.cmd([[setlocal fillchars+=vertright:🮇]])
+  --end)
 
-local function copy_file_to(node)
-  local file_src = node["absolute_path"]
-  -- The args of input are {prompt}, {default}, {completion}
-  -- Read in the new file path using the existing file's path as the baseline.
-  local file_out = vim.fn.input("COPY TO: ", file_src, "file")
-  -- Create any parent dirs as required
-  local dir = vim.fn.fnamemodify(file_out, ":h")
-  vim.fn.system({ "mkdir", "-p", dir })
-  -- Copy the file
-  vim.fn.system({ "cp", "-R", file_src, file_out })
-end
+  local function open_nvim_tree(data)
+    vim.cmd.cd(data.file:match("(.+)/[^/]*$"))
+    local directory = vim.fn.isdirectory(data.file) == 1
+    if not directory then
+      return
+    end
+    require("nvim-tree.api").tree.open()
+  end
+
+  -- Auto open nvim-tree when opening a directory
+  vim.api.nvim_create_autocmd({ "VimEnter" }, { pattern = { "*" }, callback = open_nvim_tree })
+
+  -- Change Root To Global Current Working Directory
+  local function change_root_to_global_cwd()
+    local api = require("nvim-tree.api")
+    local global_cwd = vim.fn.getcwd(-1, -1)
+    api.tree.change_root(global_cwd)
+  end
+
+  local function copy_file_to(node)
+    local file_src = node["absolute_path"]
+    -- The args of input are {prompt}, {default}, {completion}
+    -- Read in the new file path using the existing file's path as the baseline.
+    local file_out = vim.fn.input("COPY TO: ", file_src, "file")
+    -- Create any parent dirs as required
+    local dir = vim.fn.fnamemodify(file_out, ":h")
+    vim.fn.system({ "mkdir", "-p", dir })
+    -- Copy the file
+    vim.fn.system({ "cp", "-R", file_src, file_out })
+  end
+
+  local function edit_and_close(node)
+    api.node.open.edit(node, {})
+    api.tree.close()
+  end
 
-local function edit_and_close(node)
-  api.node.open.edit(node, {})
-  api.tree.close()
+  --vim.api.nvim_create_augroup('NvimTreeRefresh', {})
+  --vim.api.nvim_create_autocmd('BufEnter', {
+  --  pattern = 'NvimTree_1',
+  --  command = 'NvimTreeRefresh',
+  --  group = 'NvimTreeRefresh',
+  --})
+
+  vim.api.nvim_create_autocmd({ "CursorHold" }, {
+    pattern = "NvimTree*",
+    callback = function()
+      local def = vim.api.nvim_get_hl_by_name("Cursor", true)
+      vim.api.nvim_set_hl(
+        0,
+        "Cursor",
+        vim.tbl_extend("force", def, {
+          blend = 100,
+        })
+      )
+      vim.opt.guicursor = "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20,a:Cursor/lCursor"
+    end,
+  })
+
+  vim.api.nvim_create_autocmd({ "BufLeave", "WinClosed", "WinLeave" }, {
+    pattern = "NvimTree*",
+    callback = function()
+      local def = vim.api.nvim_get_hl_by_name("Cursor", true)
+      vim.api.nvim_set_hl(
+        0,
+        "Cursor",
+        vim.tbl_extend("force", def, {
+          blend = 0,
+        })
+      )
+      vim.opt.guicursor = "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20"
+    end,
+  })
+
+  vim.api.nvim_command("highlight NvimTreeNormal guibg=NONE ctermbg=NONE")
+  vim.api.nvim_command("highlight NvimTreeNormalNC guibg=NONE ctermbg=NONE guifg=NONE")
+  vim.api.nvim_command("highlight NvimTreeNormalFloat guibg=NONE ctermbg=NONE")
+  vim.api.nvim_command("highlight NvimTreeEndOfBuffer guibg=NONE ctermbg=NONE") --(NonText)
+  vim.api.nvim_command("highlight NvimTreeCursorLine guibg=#50fa7b guifg=#000000")
+  vim.api.nvim_command("highlight NvimTreeSymlinkFolderName guifg=#f8f8f2 guibg=NONE ctermbg=NONE")
+  vim.api.nvim_command("highlight NvimTreeFolderName guifg=#f8f8f2 guibg=NONE ctermbg=NONE")
+  vim.api.nvim_command("highlight NvimTreeRootFolder guifg=#f8f8f2 guibg=NONE ctermbg=NONE")
+  vim.api.nvim_command("highlight NvimTreeEmptyFolderName guifg=#f8f8f2 guibg=NONE ctermbg=NONE")  --(Directory)
+  vim.api.nvim_command("highlight NvimTreeOpenedFolderName guifg=#f8f8f2 guibg=NONE ctermbg=NONE") --(Directory)
+  vim.api.nvim_command("highlight NvimTreeOpenedFile guifg=#50fa7b guibg=NONE ctermbg=NONE")
+  vim.api.nvim_command("highlight NvimTreeExecFile guifg=#ff882a guibg=none gui=NONE")
+
+  return true
 end
 
---vim.api.nvim_create_augroup('NvimTreeRefresh', {})
---vim.api.nvim_create_autocmd('BufEnter', {
---  pattern = 'NvimTree_1',
---  command = 'NvimTreeRefresh',
---  group = 'NvimTreeRefresh',
---})
-
-vim.api.nvim_create_autocmd({ "CursorHold" }, {
-  pattern = "NvimTree*",
-  callback = function()
-    local def = vim.api.nvim_get_hl_by_name("Cursor", true)
-    vim.api.nvim_set_hl(
-      0,
-      "Cursor",
-      vim.tbl_extend("force", def, {
-        blend = 100,
-      })
-    )
-    vim.opt.guicursor:append("a:Cursor/lCursor")
-  end,
-})
-
-vim.api.nvim_create_autocmd({ "BufLeave", "WinClosed", "WinLeave" }, {
-  pattern = "NvimTree*",
-  callback = function()
-    local def = vim.api.nvim_get_hl_by_name("Cursor", true)
-    vim.api.nvim_set_hl(
-      0,
-      "Cursor",
-      vim.tbl_extend("force", def, {
-        blend = 0,
-      })
-    )
-    vim.opt.guicursor = "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20"
-  end,
-})
+---- Set highlights
+--vim.cmd([[highlight NvimTreeNormal guibg=NONE ctermbg=NONE]])
+--vim.cmd([[highlight NvimTreeNormalNC guibg=NONE ctermbg=NONE guifg=NONE]])
+--vim.cmd([[highlight NvimTreeNormalFloat guibg=NONE ctermbg=NONE]])
+--vim.cmd([[highlight NvimTreeEndOfBuffer guibg=NONE ctermbg=NONE]])
+--vim.cmd([[highlight NvimTreeCursorLine guibg=#50fa7b guifg=#000000]])
 
 -- Highlight Groups
-vim.api.nvim_command("highlight NvimTreeNormal guibg=NONE ctermbg=NONE")
-vim.api.nvim_command("highlight NvimTreeNormalNC guibg=NONE ctermbg=NONE guifg=NONE")
-vim.api.nvim_command("highlight NvimTreeNormalFloat guibg=NONE ctermbg=NONE")
-vim.api.nvim_command("highlight NvimTreeEndOfBuffer guibg=NONE ctermbg=NONE") --(NonText)
-vim.api.nvim_command("highlight NvimTreeCursorLine guibg=#50fa7b guifg=#000000")
-vim.api.nvim_command("highlight NvimTreeSymlinkFolderName guifg=#f8f8f2 guibg=NONE ctermbg=NONE")
-vim.api.nvim_command("highlight NvimTreeFolderName guifg=#f8f8f2 guibg=NONE ctermbg=NONE")
-vim.api.nvim_command("highlight NvimTreeRootFolder guifg=#f8f8f2 guibg=NONE ctermbg=NONE")
-vim.api.nvim_command("highlight NvimTreeEmptyFolderName guifg=#f8f8f2 guibg=NONE ctermbg=NONE")  --(Directory)
-vim.api.nvim_command("highlight NvimTreeOpenedFolderName guifg=#f8f8f2 guibg=NONE ctermbg=NONE") --(Directory)
-vim.api.nvim_command("highlight NvimTreeOpenedFile guifg=#50fa7b guibg=NONE ctermbg=NONE")
-
---vim.api.nvim_command("highlight NvimTreeSymlink ")
---vim.api.nvim_command("highlight NvimTreeSymlinkFolderName ")   --(Directory)
---vim.api.nvim_command("highlight NvimTreeFolderName ")          --(Directory)
---vim.api.nvim_command("highlight NvimTreeRootFolder ")
---vim.api.nvim_command("highlight NvimTreeFolderIcon ")
---vim.api.nvim_command("highlight NvimTreeOpenedFolderIcon ")    --(NvimTreeFolderIcon)
---vim.api.nvim_command("highlight NvimTreeClosedFolderIcon ")    --(NvimTreeFolderIcon)
---vim.api.nvim_command("highlight NvimTreeFileIcon ")
---vim.api.nvim_command("highlight NvimTreeEmptyFolderName ")     --(Directory)
---vim.api.nvim_command("highlight NvimTreeOpenedFolderName ")    --(Directory)
---vim.api.nvim_command("highlight NvimTreeExecFile ")
-vim.api.nvim_command("highlight NvimTreeExecFile guifg=#ff882a guibg=none gui=NONE")
---vim.api.nvim_command("highlight NvimTreeOpenedFile ")
---vim.api.nvim_command("highlight NvimTreeModifiedFile ")
---vim.api.nvim_command("highlight NvimTreeSpecialFile ")
---vim.api.nvim_command("highlight NvimTreeImageFile ")
---vim.api.nvim_command("highlight NvimTreeIndentMarker ")
---vim.api.nvim_command("highlight NvimTreeLspDiagnosticsError ")         --(DiagnosticError)
---vim.api.nvim_command("highlight NvimTreeLspDiagnosticsWarning ")       --(DiagnosticWarn)
---vim.api.nvim_command("highlight NvimTreeLspDiagnosticsInformation ")   --(DiagnosticInfo)
---vim.api.nvim_command("highlight NvimTreeLspDiagnosticsHint ")          --(DiagnosticHint)
---vim.api.nvim_command("highlight NvimTreeGitDirty ")
---vim.api.nvim_command("highlight NvimTreeGitStaged ")
---vim.api.nvim_command("highlight NvimTreeGitMerge ")
---vim.api.nvim_command("highlight NvimTreeGitRenamed ")
---vim.api.nvim_command("highlight NvimTreeGitNew ")
---vim.api.nvim_command("highlight NvimTreeGitDeleted ")
---vim.api.nvim_command("highlight NvimTreeGitIgnored ")      --(Comment)
---vim.api.nvim_command("highlight NvimTreeNormal ")
---vim.api.nvim_command("highlight NvimTreeEndOfBuffer ")     --(NonText)
---vim.api.nvim_command("highlight NvimTreeCursorColumn ")    --(CursorColumn)
---vim.api.nvim_command("highlight NvimTreeFileDirty ")       --(NvimTreeGitDirty)
---vim.api.nvim_command("highlight NvimTreeFileStaged ")      --(NvimTreeGitStaged)
---vim.api.nvim_command("highlight NvimTreeFileMerge ")       --(NvimTreeGitMerge)
---vim.api.nvim_command("highlight NvimTreeFileRenamed ")     --(NvimTreeGitRenamed)
---vim.api.nvim_command("highlight NvimTreeFileNew ")         --(NvimTreeGitNew)
---vim.api.nvim_command("highlight NvimTreeFileDeleted ")     --(NvimTreeGitDeleted)
---vim.api.nvim_command("highlight NvimTreeFileIgnored ")     --(NvimTreeGitIgnored)
---vim.api.nvim_command("highlight NvimTreeLiveFilterPrefix ")
---vim.api.nvim_command("highlight NvimTreeLiveFilterValue ")
---vim.api.nvim_command("highlight NvimTreeBookmark ")
+
+return M