diff --git a/modules/default.nix b/modules/default.nix
index 43489f2..bddeef5 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -121,5 +121,6 @@ in
     modules.shell.nvim.enable = lib.mkDefault true;
     modules.shell.git.enable = lib.mkDefault true;
     modules.shell.direnv.enable = lib.mkDefault true;
+    modules.shell.yazi.enable = lib.mkDefault true;
   };
 }
diff --git a/modules/shell/yazi.nix b/modules/shell/yazi.nix
new file mode 100644
index 0000000..8e57089
--- /dev/null
+++ b/modules/shell/yazi.nix
@@ -0,0 +1,32 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+# Yazi, a terminal file manager.
+let
+  cfg = config.modules.shell.yazi;
+  user = config.user.name;
+in
+{
+  options.modules.shell.yazi.enable = lib.mkEnableOption "Yazi, a terminal file manager";
+
+  config = lib.mkIf cfg.enable {
+    home-manager.users.${user}.programs.yazi = {
+      enable = true;
+      enableFishIntegration = true;
+      extraPackages = with pkgs; [
+        fd
+        ffmpegthumbnailer
+        fzf
+        imagemagick
+        jq
+        poppler
+        ripgrep
+        unar
+        zoxide
+      ];
+    };
+  };
+}