diff --git a/flake.nix b/flake.nix
index 855d7b9..a7d20bc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,7 +30,9 @@
         f system pkgs);
   in {
     packages = forAllSystems (system: pkgs: {
-      neovim = pkgs.callPackage ./neovim.nix {inherit inputs;};
+      neovim = pkgs.callPackage ./neovim.nix {
+        go-grip = inputs.go-grip.packages.${system}.default;
+      };
       default = self.packages.${system}.neovim;
     });
 
diff --git a/lua/dot013/plugins/ide.lua b/lua/dot013/plugins/ide.lua
index 18b0691..007638e 100644
--- a/lua/dot013/plugins/ide.lua
+++ b/lua/dot013/plugins/ide.lua
@@ -200,6 +200,7 @@ return {
 	{
 		-- (Probably can be replaced by local functions in the config)
 		"tfm.nvim",
+		enabled = vim.fn.executable("yazi"),
 		cmd = { "Ex", "Tfm", "TfmSplit", "TfmVsplit", "TfmTabedit" },
 		keys = {
 			{ "<leader>e", ":Tfm<cr>", desc = "[TFM] Open file manager" },
diff --git a/neovim.nix b/neovim.nix
index daae60e..1f0ca7a 100644
--- a/neovim.nix
+++ b/neovim.nix
@@ -1,14 +1,12 @@
 {
-  inputs,
   symlinkJoin,
   makeWrapper,
   runCommandLocal,
   pkgs,
   lib,
-  yazi ? pkgs.yazi,
-}: let
+  ...
+} @ args: let
   nvimPkg = pkgs.neovim-unwrapped;
-  yaziPkg = yazi;
 
   startPlugins = with pkgs;
   with vimPlugins; [
@@ -102,8 +100,7 @@
     lf
     ripgrep
 
-    inputs.go-grip.packages.${pkgs.system}.default
-    yaziPkg
+    args.go-grip
   ];
 
   foldPlugins = builtins.foldl' (acc: next: acc ++ [next] ++ (foldPlugins (next.dependencies or []))) [];