change folder icons, folder colors

README.md

@@ -73,13 +73,13 @@ let g:lua_tree_icons = {
     \ 'git': {
     \   'unstaged': "✗",
     \   'staged': "✓",
-    \   'unmerged': "═",
+    \   'unmerged': "",
     \   'renamed': "➜",
     \   'untracked': "★"
     \   },
     \ 'folder': {
-    \   'default': "",
-    \   'open': ""
+    \   'default': "",
+    \   'open': ""
     \   }
     \ }
 

doc/nvim-tree-lua.txt

@@ -95,9 +95,13 @@ when no icon is found for a file.
       \ 'git': {
       \   'unstaged': "✗",
       \   'staged': "✓",
-      \   'unmerged': "═",
+      \   'unmerged': "",
       \   'renamed': "➜",
       \   'untracked': "★"
+      \   },
+      \ 'folder': {
+      \   'default': "",
+      \   'open': ""
       \  }
       \ }
 
@@ -237,7 +241,6 @@ LuaTreeImageFile
 LuaTreeMarkdownFile
 LuaTreeIndentMarker
 
-<<<<<<< HEAD
 LuaTreeLicenseIcon
 LuaTreeYamlIcon
 LuaTreeTomlIcon

lua/lib/colors.lua

@@ -29,9 +29,9 @@ local function get_hl_groups()
   local colors = get_colors()
 
   return {
-    IndentMarker = { fg = '#90a4ae' },
+    IndentMarker = { fg = '#8094b4' },
     Symlink = { gui = 'bold', fg = colors.cyan },
-    FolderIcon = { fg = '#90a4ae' },
+    FolderIcon = { fg = '#8094b4' },
 
     ExecFile = { gui = 'bold', fg = colors.green },
     SpecialFile = { gui = 'bold,underline', fg = colors.yellow },

lua/lib/config.lua

@@ -7,13 +7,13 @@ function M.get_icon_state()
     git_icons = {
       unstaged = "✗",
       staged = "✓",
-      unmerged = "═",
+      unmerged = "",
       renamed = "➜",
       untracked = "★"
     },
     folder_icons = {
-      default = "",
-      open = ""
+      default = "",
+      open = ""
     }
   }