From c8860d7baccd9a57e2e0b50aa66155c00aef90a0 Mon Sep 17 00:00:00 2001
From: Tulili <tulilirockz@outlook.com>
Date: Sun, 24 Mar 2024 18:05:00 -0300
Subject: [PATCH] fix: simpler definition for jsonnet template

---
 config/templates/recipe-std.jsonnet | 31 ++++++-----------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/config/templates/recipe-std.jsonnet b/config/templates/recipe-std.jsonnet
index bfee8a9..beb5c81 100644
--- a/config/templates/recipe-std.jsonnet
+++ b/config/templates/recipe-std.jsonnet
@@ -1,10 +1,7 @@
-local images = {
-    base: "ghcr.io/ublue-os",
-};
-
 local project = {
     image_name: "atomic-studio",
     description: "Operating system based on Fedora Atomic meant for content creators and artists",
+    base_images: "ghcr.io/ublue-os",
 };
 
 local modules = {
@@ -17,39 +14,23 @@ local modules = {
     misc: [{ "type": "yafti" }, { "type": "signing" }],
 };
 
-local cond(boolcond, iftrue, iffalse) = if (boolcond) then iftrue else iffalse;
-
-local gen_image_tags(base_image, nvidia) = std.join("", [
-    cond(base_image == "silverblue", "-gnome", ""),
-    cond(nvidia, "-nvidia", ""),
-]);
-
-local gen_baseimage_url(base_image, nvidia) = std.join("", [
-    base_image,
-    cond(nvidia, "-nvidia", "-main"),
-]);
-
 local gen_module_definition(prefix, modules) = [
     { "from-file": ("common/" + prefix + "/" + module + ".yml")}  
     for module in modules 
 ];
 
+local gen_image_tags(baseimage, nvidia) = (if (baseimage == "silverblue") then "-gnome" else "") + (if(nvidia) then "-nvidia" else ""); 
+
 local image(baseimage, nvidia) = {
     "name": project.image_name + gen_image_tags(baseimage, nvidia),
     "description": project.description,
-    "base-image": gen_baseimage_url(baseimage, nvidia),
+    "base-image": project.base_images + "/" + baseimage + (if (nvidia) then "-nvidia" else "-main"),
     "image-version": "latest",
     "modules": std.flattenArrays(
     [
         gen_module_definition("shared", modules.shared),
-        cond(nvidia, 
-            gen_module_definition("shared/nvidia", modules.nvidia),
-            gen_module_definition("shared/amd", modules.amd)  
-        ),
-        cond(baseimage == "silverblue",
-            gen_module_definition("gnome", modules.gnome), 
-            gen_module_definition("plasma", modules.plasma)
-        ),
+        if (nvidia) then gen_module_definition("shared/nvidia", modules.nvidia) else gen_module_definition("shared/amd", modules.amd),
+        if (baseimage == "silverblue") then gen_module_definition("gnome", modules.gnome) else gen_module_definition("plasma", modules.plasma),
         gen_module_definition("audio", modules.audio),
         modules.misc,
     ]),