diff --git a/modules/home/vim/after/ftplugin/netrw.vim b/modules/home/vim/after/ftplugin/netrw.vim
deleted file mode 100644
index e3689f8..0000000
--- a/modules/home/vim/after/ftplugin/netrw.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Don't show Netrw in buffer list
-setlocal bufhidden=delete
-let b:undo_ftplugin='|setlocal bufhidden<'
diff --git a/modules/home/vim/after/plugin/mappings/oil.lua b/modules/home/vim/after/plugin/mappings/oil.lua
new file mode 100644
index 0000000..f627c34
--- /dev/null
+++ b/modules/home/vim/after/plugin/mappings/oil.lua
@@ -0,0 +1,8 @@
+local wk = require("which-key")
+local oil = require("oil")
+
+local keys = {
+    ["-"] = { oil.open, "Open parent directory" },
+}
+
+wk.register(keys)
diff --git a/modules/home/vim/default.nix b/modules/home/vim/default.nix
index d7280fb..e2c3504 100644
--- a/modules/home/vim/default.nix
+++ b/modules/home/vim/default.nix
@@ -46,7 +46,6 @@ in
       vim-repeat # Enanche '.' for plugins
       vim-rsi # Readline mappings
       vim-unimpaired # Some ex command mappings
-      vim-vinegar # Better netrw
 
       # Languages
       rust-vim
@@ -85,6 +84,7 @@ in
       dressing-nvim # Integrate native UI hooks with Telescope etc...
       gitsigns-nvim # Fast git UI integration
       nvim-surround # Deal with pairs, now in Lua
+      oil-nvim # Better alternative to NetrW
       telescope-fzf-native-nvim # Use 'fzf' fuzzy matching algorithm
       telescope-lsp-handlers-nvim # Use 'telescope' for various LSP actions
       telescope-nvim # Fuzzy finder interface
diff --git a/modules/home/vim/init.vim b/modules/home/vim/init.vim
index 3a74c4f..a5a06f4 100644
--- a/modules/home/vim/init.vim
+++ b/modules/home/vim/init.vim
@@ -38,10 +38,10 @@ set tabstop=8
 
 " File parameters {{{
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Disable backups, we have source control for that
-set nobackup
-" Disable swapfiles too
-set noswapfile
+" Enable swap files
+set swapfile
+" And undo files
+set undofile
 " }}}
 
 " UI and UX parameters {{{
diff --git a/modules/home/vim/plugin/settings/oil.lua b/modules/home/vim/plugin/settings/oil.lua
new file mode 100644
index 0000000..2fee1a5
--- /dev/null
+++ b/modules/home/vim/plugin/settings/oil.lua
@@ -0,0 +1,26 @@
+local oil = require("oil")
+local detail = false
+
+oil.setup({
+    view_options = {
+        -- Show files and directories that start with "." by default
+        show_hidden = true,
+        -- But never '..'
+        is_always_hidden = function(name, bufnr)
+            return name == ".."
+        end,
+    },
+    keymaps = {
+        ["gd"] = {
+            desc = "Toggle file detail view",
+            callback = function()
+                detail = not detail
+                if detail then
+                    oil.set_columns({ "icon", "permissions", "size", "mtime" })
+                else
+                    oil.set_columns({ "icon" })
+                end
+            end,
+        },
+    },
+})
diff --git a/modules/nixos/hardware/sound/default.nix b/modules/nixos/hardware/sound/default.nix
index e8ba7f7..1cf12cb 100644
--- a/modules/nixos/hardware/sound/default.nix
+++ b/modules/nixos/hardware/sound/default.nix
@@ -54,9 +54,6 @@ in
 
     # Pulseaudio setup
     (lib.mkIf cfg.pulse.enable {
-      # ALSA
-      sound.enable = true;
-
       hardware.pulseaudio.enable = true;
     })
   ]);