diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 659bc5f..8f01c71 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -22,8 +22,6 @@
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "menu": { "branch": "main", "commit": "ea606f6ab2430db0aece8075e62c14132b815ae1" },
   "mini.nvim": { "branch": "main", "commit": "e52ac74bd4e9c0ce6a182ee551eb099236b5a89d" },
-  "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
-  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-ansible": { "branch": "main", "commit": "9c3b4a771b8c8d7b4f2171466464d978cb3846f7" },
   "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
@@ -33,6 +31,7 @@
   "nvim-lspconfig": { "branch": "master", "commit": "04680101ff79e99b4e33a4386ec27cbd0d360c75" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
+  "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" },
   "nvim-treesitter": { "branch": "master", "commit": "45e0d66246f31306d890b91301993fa1623e79f1" },
   "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" },
   "outline.nvim": { "branch": "main", "commit": "6c44527837ff7ac1cd054dc365a721e881020a2e" },
diff --git a/nvim/lua/plugins/indent-blankline.lua b/nvim/lua/plugins/indent-blankline.lua
index cec449c..2577d63 100644
--- a/nvim/lua/plugins/indent-blankline.lua
+++ b/nvim/lua/plugins/indent-blankline.lua
@@ -24,7 +24,7 @@ return {
           filetypes = {
             'help',
             'dashboard',
-            'neo-tree',
+            'NvimTree',
             'lazy',
             'mason',
             'toggleterm',
diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua
index 9b286ed..5a86d8f 100644
--- a/nvim/lua/plugins/lualine.lua
+++ b/nvim/lua/plugins/lualine.lua
@@ -33,7 +33,7 @@ return {
         extensions = {
           'lazy',
           'mason',
-          'neo-tree',
+          'nvim-tree',
           'nvim-dap-ui',
           'toggleterm',
         },
diff --git a/nvim/lua/plugins/neo-tree.lua b/nvim/lua/plugins/neo-tree.lua
deleted file mode 100644
index 65dd366..0000000
--- a/nvim/lua/plugins/neo-tree.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-return {
-  { -- Neo-tree is a Neovim plugin to browse the file system
-    'nvim-neo-tree/neo-tree.nvim',
-    version = '*',
-    dependencies = {
-      'nvim-lua/plenary.nvim',
-      'nvim-tree/nvim-web-devicons',
-      'MunifTanjim/nui.nvim',
-    },
-    cmd = 'Neotree',
-    keys = {
-      { '\\', '<Cmd>Neotree action=focus source=filesystem position=left reveal_force_cwd=false<CR>', desc = 'NeoTree left-side', silent = true },
-      { '|', '<Cmd>Neotree action=focus source=filesystem position=float reveal_force_cwd=false<CR>', desc = 'NeoTree float', silent = true },
-    },
-    opts = {
-      enable_git_status = true,
-      filesystem = {
-        use_libuv_file_watcher = true,
-        window = {
-          mappings = {
-            ['\\'] = 'close_window',
-            ['|'] = 'close_window',
-          },
-        },
-      },
-    },
-  },
-}
-
--- vim: ts=2 sts=2 sw=2 et
diff --git a/nvim/lua/plugins/nvim-tree.lua b/nvim/lua/plugins/nvim-tree.lua
new file mode 100644
index 0000000..a4b74e9
--- /dev/null
+++ b/nvim/lua/plugins/nvim-tree.lua
@@ -0,0 +1,41 @@
+return {
+  {
+    'nvim-tree/nvim-tree.lua',
+    version = '*',
+    lazy = false,
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+    },
+    config = function()
+      require('nvim-tree').setup {
+        renderer = {
+          highlight_git = 'all',
+          highlight_diagnostics = 'icon',
+          highlight_opened_files = 'all',
+          highlight_modified = 'all',
+          special_files = {},
+          icons = {
+            git_placement = 'signcolumn',
+          },
+        },
+        git = {
+          enable = true,
+          show_on_dirs = true,
+          show_on_open_dirs = true,
+          timeout = 400,
+        },
+        filesystem_watchers = {
+          enable = true,
+          debounce_delay = 50,
+        },
+        filters = {
+          enable = true,
+          git_ignored = true,
+          dotfiles = true,
+        },
+      }
+
+      vim.api.nvim_set_keymap('n', '\\', '<Cmd>NvimTreeToggle<CR>', { silent = true, noremap = true })
+    end,
+  },
+}