From d5f1f641b289553927b3801580598d200a501863 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 19 May 2025 16:07:50 -0500 Subject: [PATCH] yazi: add main.lua support to plugins (#6394) (#7090) Yazi is deprecating init.lua for main.lua usages. This adds support for main.lua in plugins. (cherry picked from commit 18fa9f323d8adbb0b7b8b98a8488db308210ed93) --- modules/programs/yazi.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/programs/yazi.nix b/modules/programs/yazi.nix index 0f5117dbd..55a80bde2 100644 --- a/modules/programs/yazi.nix +++ b/modules/programs/yazi.nix @@ -265,8 +265,12 @@ in { toString missingFiles }"; singularOpt = removeSuffix "s" opt; + isPluginValid = opt == "plugins" + && (any (file: pathExists "${value}/${file}") requiredFiles); + isValid = + if opt == "plugins" then isPluginValid else missingFiles == [ ]; in { - assertion = isDir && missingFiles == [ ]; + assertion = isDir && isValid; message = '' Value at `programs.yazi.${opt}.${name}` is not a valid yazi ${singularOpt}. ${msgNotDir} @@ -281,6 +285,6 @@ in { "preview.png" "LICENSE" "LICENSE-tmtheme" - ]) ++ (mkAsserts "plugins" [ "init.lua" ]); + ]) ++ (mkAsserts "plugins" [ "init.lua" "main.lua" ]); }; }