diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua
index 449f059..f8cfe1d 100644
--- a/home/.config/nvim/lua/plugins/init.lua
+++ b/home/.config/nvim/lua/plugins/init.lua
@@ -61,7 +61,7 @@ require('packer').startup(function()
     use {
         'kyazdani42/nvim-tree.lua',
         requires = 'kyazdani42/nvim-web-devicons',
-        config = function() require('nvim-tree').setup {} end
+        config = require('plugins.nvim-tree')
     }
 
     -- Telescope
diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua
new file mode 100644
index 0000000..a382629
--- /dev/null
+++ b/home/.config/nvim/lua/plugins/nvim-tree.lua
@@ -0,0 +1,13 @@
+return function()
+	require("nvim-tree").setup { -- BEGIN_DEFAULT_OPTS
+		diagnostics = {
+			enable = true,
+			show_on_dirs = true,
+		},
+		renderer = {
+			highlight_git = true
+		}
+	}
+	-- Open/close with alt-o
+	vim.keymap.set('n', '<M-o>', vim.cmd.NvimTreeToggle)
+end