diff --git a/nvim/.config/nvim/autocmd.vim b/nvim/.config/nvim/autocmd.vim
index b598046..8044874 100644
--- a/nvim/.config/nvim/autocmd.vim
+++ b/nvim/.config/nvim/autocmd.vim
@@ -14,11 +14,6 @@ augroup ResizeWindowsProportionally
   autocmd VimResized * :wincmd =
 augroup END
 
-augroup VinegarNetrw
-  au!
-  autocmd FileType netrw set bufhidden=delete
-augroup END
-
 augroup UserStatusline
   autocmd!
   autocmd BufEnter,WinEnter,TermOpen * setlocal statusline=%!ActiveStatus()
diff --git a/nvim/.config/nvim/config.vim b/nvim/.config/nvim/config.vim
index 5fa9f66..9a26f3e 100644
--- a/nvim/.config/nvim/config.vim
+++ b/nvim/.config/nvim/config.vim
@@ -81,3 +81,7 @@ let g:loaded_ruby_provider = 0
 let g:loaded_perl_provider = 0
 let g:loaded_node_provider = 0
 let g:python3_host_prog = '/usr/bin/python3'
+
+" Disable netrw completely
+let g:loaded_netrw       = 1
+let g:loaded_netrwPlugin = 1
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 9dcb917..d12107f 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -82,13 +82,14 @@ Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-sleuth'
-Plug 'tpope/vim-vinegar'
 " Show indentation levels
 Plug 'Yggdroot/indentLine'
 " Floating terminal
 Plug 'voldikss/vim-floaterm'
 " Smooth scrolling
 Plug 'psliwka/vim-smoothie'
+" Directory viewer
+Plug 'justinmk/vim-dirvish'
 " Handle line & column jump specifications as found in stack traces
 Plug 'wsdjeg/vim-fetch'
 " Miscellaneous
diff --git a/nvim/.config/nvim/plugin_settings.vim b/nvim/.config/nvim/plugin_settings.vim
index d9d08de..fce8cf3 100644
--- a/nvim/.config/nvim/plugin_settings.vim
+++ b/nvim/.config/nvim/plugin_settings.vim
@@ -1,7 +1,3 @@
-" Close open netrw buffers once done selecting file in vinegar
-" See https://github.com/tpope/vim-vinegar/issues/13
-let g:netrw_fastbrowse = 0
-
 " Let vim-gitgutter do its thing on large files
 let g:gitgutter_max_signs=1000
 let g:gitgutter_map_keys = 0