diff --git a/modules/desktop/environments/niri.nix b/modules/desktop/environments/niri.nix
index 32b6e07..2a36a3d 100644
--- a/modules/desktop/environments/niri.nix
+++ b/modules/desktop/environments/niri.nix
@@ -21,6 +21,7 @@
     noctalia-shell = "${noctalia-pkg}/bin/noctalia-shell";
     ghostty = "${pkgs.ghostty}/bin/ghostty";
     playerctl = "${pkgs.playerctl}/bin/playerctl";
+    yazi = "${pkgs.yazi}/bin/yazi";
     noctalia = cmd: [ noctalia-shell "ipc" "call" ] ++ (pkgs.lib.splitString " " cmd);
     xws-unstable = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.xwayland-satellite-unstable;
   in {
@@ -92,6 +93,8 @@
         "Mod+Shift+Equal".action.set-window-height = "+10%";
 
         "Mod+O".action.toggle-overview = [];
+        
+        "Mod+E".action.spawn = [ ghostty "-e" yazi ];
       };
       spawn-at-startup = [
         { command = [ noctalia-shell ]; }
diff --git a/modules/desktop/yazi.nix b/modules/desktop/yazi.nix
new file mode 100644
index 0000000..af82eee
--- /dev/null
+++ b/modules/desktop/yazi.nix
@@ -0,0 +1,20 @@
+{ ... }:
+
+{
+  flake.modules.nixos.desktop = { pkgs, ... }: {
+    programs.yazi.enable = true;
+
+    environment.systemPackages = [ pkgs.mpv ];
+  };
+
+  flake.modules.homeManager.desktop = {
+    programs.yazi = {
+      enable = true;
+
+      enableZshIntegration = true;
+      enableBashIntegration = true;
+      enableFishIntegration = true;
+      enableNushellIntegration = true;
+    };
+  };
+}