diff --git a/README.md b/README.md
index 858cc82..f5e839f 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Minimal Neovim configuration, focused mostly in just coding and text editing.
 - [ ] Move [`go-grip`](https://github.com/chrishrb/go-grip) integration to it's own plugin
   (similar to [`peek.nvim`](https://github.com/toppair/peek.nvim));
 - [ ] Test configuration as a Neovim plugin;
-- [ ] Use [Yazi](https://github.com/sxyazi/yazi) instead of `lf` as file manager;
+- [x] Use [Yazi](https://github.com/sxyazi/yazi) instead of `lf` as file manager;
 - [ ] Bundle and use default formatters for when no one is available on `PATH`;
 - [ ] Better stylize the editor (mainly pop-overs and hover menus).
 
diff --git a/lua/dot013/plugins/ide.lua b/lua/dot013/plugins/ide.lua
index 40616be..727944c 100644
--- a/lua/dot013/plugins/ide.lua
+++ b/lua/dot013/plugins/ide.lua
@@ -190,7 +190,7 @@ return {
 		},
 		after = function()
 			require("tfm").setup({
-				file_manager = "lf", -- TODO: Use Yazi (https://github.com/sxyazi/yazi) as file manager
+				file_manager = "yazi",
 				replace_netrw = true,
 				enable_cmds = true,
 			})
diff --git a/neovim.nix b/neovim.nix
index c93961d..84f4af4 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -5,8 +5,10 @@
   runCommandLocal,
   pkgs,
   lib,
+  yazi ? pkgs.yazi,
 }: let
   nvimPkg = pkgs.neovim-unwrapped;
+  yaziPkg = yazi;
 
   startPlugins = with pkgs;
   with vimPlugins; [
@@ -89,6 +91,7 @@
     jq
 
     inputs.go-grip.packages.${pkgs.system}.default
+    yaziPkg
   ];
 
   foldPlugins = builtins.foldl' (acc: next: acc ++ [next] ++ (foldPlugins (next.dependencies or []))) [];
@@ -173,7 +176,7 @@ in
         terminal = true;
       };
     in ''
-         mkdir -p $out/bin
+      mkdir -p $out/bin
       cp ${lib.getExe nvim-derivation} $out/bin
       mkdir -p $out/share/applications
       cp ${desktopEntry}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop