1 files changed, 77 insertions, 27 deletions

diff --git a/nvim/init.vim b/nvim/init.vim
index 5f6a6fa..cddc0aa 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -2,29 +2,21 @@ set runtimepath^=~/.vim runtimepath+=~/.vim/after
 let &packpath = &runtimepath
 source ~/.vimrc
 
-source ~/.config/nvim/nvim-tree.vim
-
-lua <<EOF
-require'nvim-tree'.setup {
+lua << EOF
+require('nvim-tree').setup({
   disable_netrw       = true,
   hijack_netrw        = true,
-  open_on_setup       = false,
-  ignore_ft_on_setup  = {},
-  auto_close          = false,
-  open_on_tab         = false,
+  open_on_tab         = true,
   hijack_cursor       = false,
   update_cwd          = false,
-  update_to_buf_dir   = {
-    enable = true,
-    auto_open = true,
-  },
+  respect_buf_cwd     = true,
   diagnostics = {
     enable = false,
     icons = {
       hint = "",
       info = "",
       warning = "",
-      error = "",
+      error = ""
     }
   },
   update_focused_file = {
@@ -43,18 +35,12 @@ require'nvim-tree'.setup {
   git = {
     enable = true,
     ignore = true,
-    timeout = 500,
+    timeout = 500
   },
   view = {
     width = 30,
-    height = 30,
     hide_root_folder = false,
     side = 'left',
-    auto_resize = false,
-    mappings = {
-      custom_only = false,
-      list = {}
-    },
     number = false,
     relativenumber = false,
     signcolumn = "yes"
@@ -62,24 +48,88 @@ require'nvim-tree'.setup {
   trash = {
     cmd = "trash",
     require_confirm = true
+  },
+  actions = {
+    open_file = {
+      quit_on_open = false,
+      resize_window = true,
+      window_picker = {
+        enable = false,
+        exclude = {
+          filetype = {
+            notify = 1,
+            packer = 1,
+            qf = 1
+          },
+          buftype = {'terminal'}
+        }
+      }
+    },
+    change_dir = {
+      global = false
+    }
+  },
+  renderer = {
+    indent_markers = {enable = true},
+    highlight_git = true,
+    highlight_opened_files = "icon",
+    root_folder_modifier = ":~",
+    add_trailing = true,
+    group_empty = true,
+    special_files = {
+      README = 1,
+      Makefile = 1
+    },
+    icons = {
+      padding = " ",
+      symlink_arrow = " >> ",
+      show = {
+        git = true,
+        folder = true,
+        file = true,
+        folder_arrow = true
+      },
+      glyphs = {
+        default = "",
+        symlink = "",
+        git = {
+          unstaged = "✗",
+          staged = "✓",
+          unmerged = "",
+          renamed = "➜",
+          untracked = "★",
+          deleted = "",
+          ignored = "◌"
+        },
+        folder = {
+          arrow_open = "",
+          arrow_closed = "",
+          default = "",
+          open = "",
+          empty = "",
+          empty_open = "",
+          symlink = "",
+          symlink_open = ""
+        }
+      }
+    }
   }
-}
-EOF
+})
 
-lua <<EOF
-require'nvim-treesitter.configs'.setup {
+require('nvim-treesitter.configs').setup({
   -- One of "all", "maintained" (parsers with maintainers), or a list of languages
-  ensure_installed = "maintained",
+  ensure_installed = "all",
   
   -- Install languages synchronously (only applied to `ensure_installed`)
   sync_install = false,
   
   -- List of parsers to ignore installing
-  ignore_install = {},
+  ignore_install = {"phpdoc"},
   
   highlight = {
     -- `false` will disable the whole extension
     enable = true,
+    disable = {},
     -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
     -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
     -- Using this option may slow down your editor, and you may see some duplicate highlights.
@@ -96,5 +146,5 @@ require'nvim-treesitter.configs'.setup {
       node_decremental = "grm",
     },
   },
-}
+})
 EOF