diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index 76667da..741a5d9 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -28,10 +28,8 @@
       # Colorscheme
       papercolor-theme
 
-      # Better support for netrw
-      vim-vinegar
-      netrw-nvim
-      nvim-web-devicons
+      # Filebrowser
+      nvim-tree-lua
 
       # Bar at the top for all open buffers
       bufferline-nvim
@@ -157,6 +155,11 @@
       let g:go_highlight_operators = 1
       let g:go_highlight_build_constraints = 1
 
+      " Bug with whitespaces. TODO: Remove this line after nvim 0.11
+      " https://github.com/vim-airline/vim-airline/issues/2704
+      let g:airline#extensions#whitespace#enabled = 0
+
+
       " Don't use gopls from vim-go
       let g:go_gopls_enabled = 0
 
@@ -180,12 +183,12 @@
         local hooks = require "ibl.hooks"
         hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level)
         hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level)
-        require'netrw'.setup{}
         require("auto-session").setup {
           auto_save_enabled = true;
           auto_restore_enabled = true;
         }
         require("bufferline").setup{}
+        require("nvim-tree").setup()
 
         require('lspconfig').gopls.setup{}
         require('lspconfig').pyright.setup{}