diff --git a/.config/nvim/lua/keybindings.lua b/.config/nvim/lua/keybindings.lua
index 16d159b..9f27529 100644
--- a/.config/nvim/lua/keybindings.lua
+++ b/.config/nvim/lua/keybindings.lua
@@ -24,7 +24,7 @@ map("n", "k", "v:count == 0 ? 'gk' : 'k'", e_opts)
 map("n", "<C-k>", ":BufferLineCycleNext<CR>", opts)
 map("n", "<C-j>", ":BufferLineCyclePrev<CR>", opts)
 
-map("n", "<C-b>", ":NvimTreeToggle<CR>", opts)
+map("n", "<C-b>", ":Neotree<CR>", opts)
 
 -- Telescope
 map("n", "<C-p>", "<cmd>lua require('plugins.telescope').custom_find_files()<CR>", opts)
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 4689a95..9a8ee36 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -28,9 +28,11 @@ return require("packer").startup(function()
 
 	-- File tree
 	use({
-		"kyazdani42/nvim-tree.lua",
+		"nvim-neo-tree/neo-tree.nvim",
 		requires = {
+			"nvim-lua/plenary.nvim",
 			"kyazdani42/nvim-web-devicons",
+			"MunifTanjim/nui.nvim",
 		},
 	})
 
diff --git a/.config/nvim/lua/plugins/bufferline.lua b/.config/nvim/lua/plugins/bufferline.lua
index 8608de9..da65645 100644
--- a/.config/nvim/lua/plugins/bufferline.lua
+++ b/.config/nvim/lua/plugins/bufferline.lua
@@ -1,11 +1 @@
-require("bufferline").setup({
-	options = {
-		offsets = {
-			{
-				filetype = "NvimTree",
-				text = "",
-				text_align = "left",
-			},
-		},
-	},
-})
+require("bufferline").setup()
diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua
index a876ab6..c64d789 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -9,7 +9,4 @@ require("lualine").setup({
 		lualine_y = {},
 		lualine_z = { "progress" },
 	},
-	extensions = {
-		"nvim-tree",
-	},
 })
diff --git a/.config/nvim/lua/plugins/tree.lua b/.config/nvim/lua/plugins/tree.lua
index 9cd1c3e..00bf3c7 100644
--- a/.config/nvim/lua/plugins/tree.lua
+++ b/.config/nvim/lua/plugins/tree.lua
@@ -1,24 +1,11 @@
-require("nvim-tree").setup({
-	open_on_setup = false,
-	auto_close = true,
-	hijack_cursor = true,
-	hijack_unnamed_buffer_when_opening = true,
-	update_cwd = true,
-	diagnostics = {
-		enable = true,
+require("neo-tree").setup({
+	window = {
+		position = "float",
 	},
-	git = {
-		enable = true,
-		ignore = false,
-	},
-	view = {
-		width = 25,
-		side = "left",
-	},
-	actions = {
-		open_file = {
-			quit_on_open = true,
-			resize_window = true,
+	filesystem = {
+		filtered_items = {
+			hide_dotfiles = false,
+			hide_gitignored = false,
 		},
 	},
 })