diff --git a/packages/nvf.nix b/packages/nvf.nix
index 9d4a16c..7b202a1 100644
--- a/packages/nvf.nix
+++ b/packages/nvf.nix
@@ -6,6 +6,9 @@ _: {
       style = "mocha";
     };
 
+    viAlias = true;
+    vimAlias = true;
+
     options = {
       # Indentation
       expandtab = true;
@@ -134,6 +137,7 @@ _: {
       leetcode-nvim.enable = true;
       preview.glow.enable = true;
       yanky-nvim.enable = true;
+      yazi-nvim.enable = true;
     };
   };
 }
diff --git a/users/modules/editor.nix b/users/modules/editor.nix
index 704ba95..f3d01b4 100644
--- a/users/modules/editor.nix
+++ b/users/modules/editor.nix
@@ -1,6 +1,9 @@
-{self, pkgs, ...}:
-
 {
+  self,
+  pkgs,
+  ...
+}: {
+  home.sessionVariables.EDITOR = "nvim";
   home.packages = [
     self.packages.${pkgs.stdenv.system}.nvf
   ];
diff --git a/users/modules/utils.nix b/users/modules/utils.nix
index 2a1ac77..3277964 100644
--- a/users/modules/utils.nix
+++ b/users/modules/utils.nix
@@ -18,6 +18,10 @@
       enableBashIntegration = true;
       tmux.enableShellIntegration = true;
     };
+    yazi = {
+      enable = true;
+      enableBashIntegration = true;
+    };
   };
 
   services = {