diff --git a/modules/default-packages.nix b/modules/default-packages.nix
index c902026..3fcb9f9 100644
--- a/modules/default-packages.nix
+++ b/modules/default-packages.nix
@@ -4,7 +4,6 @@
   programs = {
     vim.enable = true;
     git.enable = true;
-    yazi.enable = true;
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/yazi.nix b/modules/yazi.nix
new file mode 100644
index 0000000..53eecab
--- /dev/null
+++ b/modules/yazi.nix
@@ -0,0 +1,34 @@
+{config, pkgs, lib, ...}:
+
+let
+  cfg = config.modules.yazi;
+in
+{
+  options.modules.yazi = {
+    enable = lib.mkEnableOption "Enable Yazi file manager";
+    optional-programs = lib.mkEnableOption "Enable optional extra packages";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs = {
+      yazi.enable = true;
+    };
+
+    environment.systemPackages = with pkgs; [
+      nerd-fonts.ubuntu
+      nerd-fonts.ubuntu-mono
+    ]
+    ++ lib.mkIf cfg.optional-programs [
+      ffmpeg_7
+      p7zip
+      jq
+      poppler
+      fd
+      ripgrep
+      fzf
+      zoxide
+      resvg
+      imagemagick
+    ];
+  };
+}
\ No newline at end of file
diff --git a/systems/vm/configuration.nix b/systems/vm/configuration.nix
index 48ed673..5377647 100644
--- a/systems/vm/configuration.nix
+++ b/systems/vm/configuration.nix
@@ -18,5 +18,10 @@
     waybar = true;
   };
 
+  modules.yazi = {
+    enable = true;
+    optional-programs = true;
+  };
+
 	system.stateVersion = "25.11";
 }
\ No newline at end of file