diff --git a/hosts/snowfire/home.nix b/hosts/snowfire/home.nix
index ac5665cb..f67ccff5 100644
--- a/hosts/snowfire/home.nix
+++ b/hosts/snowfire/home.nix
@@ -17,6 +17,7 @@
       brave.enable = true;
       editor = "emacs";
       ranger.enable = true;
+      yazi.enable = true;
       git.enable = true;
       engineering.enable = true;
       art.enable = true;
diff --git a/modules/user/yazi/default.nix b/modules/user/yazi/default.nix
new file mode 100644
index 00000000..a5b7dccb
--- /dev/null
+++ b/modules/user/yazi/default.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ...}:
+
+let
+  cfg = config.userSettings.yazi;
+in {
+  options = {
+    userSettings.yazi = {
+      enable = lib.mkEnableOption "Enable yazi TUI file manager";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.yazi = {
+      enable = true;
+      enableZshIntegration = true;
+      keymap.manager.prepend_keymap = 
+        [
+          { run = "shell ' \"$0\"' --cursor=0 --interactive"; on = [ "@" ]; }
+        ];
+    };
+  };
+}