diff --git a/modules/home-manager/nvim/default.nix b/modules/home-manager/nvim/default.nix
index b97fa070..eb776e36 100644
--- a/modules/home-manager/nvim/default.nix
+++ b/modules/home-manager/nvim/default.nix
@@ -20,6 +20,8 @@ in
       ".config/github-copilot"
     ];
 
+    programs.zsh.localVariables.EDITOR = "${config.programs.nixvim.finalPackage}/bin/nvim";
+
     programs.nixvim = {
       enable = true;
 
diff --git a/modules/home-manager/yazi/default.nix b/modules/home-manager/yazi/default.nix
index 0883ff21..f901b45f 100644
--- a/modules/home-manager/yazi/default.nix
+++ b/modules/home-manager/yazi/default.nix
@@ -28,6 +28,20 @@ in
           show_symlink = false;
           sort_dir_first = true;
         };
+        opener = {
+          edit = [
+            {
+              run = "${config.programs.zsh.localVariables.EDITOR} \"$@\"";
+              block = true;
+            }
+          ];
+          play = [
+            {
+              run = "mpv \"$@\"";
+              orphan = true;
+            }
+          ];
+        };
       };
       keymap.manager.prepend_keymap = bookmarksToYaziKeybindings cfg.bookmarks;
       theme = { };