diff --git a/common/hm/programs/default.nix b/common/hm/programs/default.nix
index 8663b19..2c8dcb3 100644
--- a/common/hm/programs/default.nix
+++ b/common/hm/programs/default.nix
@@ -16,6 +16,7 @@
     ./nemo.nix
     ./sublime.nix
     ./vscodium.nix
+    ./yazi.nix
     ./zellij.nix
     ./zenBrowser.nix
     ./zsh.nix
diff --git a/common/hm/programs/helix/helix.nix b/common/hm/programs/helix/helix.nix
index 288ca91..c4258d5 100644
--- a/common/hm/programs/helix/helix.nix
+++ b/common/hm/programs/helix/helix.nix
@@ -28,16 +28,16 @@
         bufferline = "multiple";
       };
       keys.normal = lib.mkMerge [
-        (lib.mkIf config.programs.lazygit.enable {
-          "C-g" = [
-            ":write-all"
-            ":new"
-            ":insert-output ${lib.getExe config.programs.lazygit.package}"
-            ":buffer-close!"
-            ":redraw"
-            ":reload-all"
-          ];
-        })
+        # (lib.mkIf config.programs.lazygit.enable {
+        #   "C-g" = [
+        #     ":write-all"
+        #     ":new"
+        #     ":insert-output ${lib.getExe config.programs.lazygit.package}"
+        #     ":buffer-close!"
+        #     ":redraw"
+        #     ":reload-all"
+        #   ];
+        # })
       ];
     };
   };
diff --git a/common/hm/programs/yazi.nix b/common/hm/programs/yazi.nix
new file mode 100644
index 0000000..3f4be92
--- /dev/null
+++ b/common/hm/programs/yazi.nix
@@ -0,0 +1,14 @@
+{
+  osConfig,
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  programs.yazi = {
+    enable = lib.mkDefault true;
+    enableZshIntegration = lib.mkDefault true;
+    shellWrapperName = "y";
+  };
+}