From bfdc959289a7e42dce29fc849c03acddb13ee167 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Wed, 10 Sep 2025 18:18:33 -0400
Subject: [PATCH] Create combo recipe

---
 .gitlab-ci.yml                | 12 ++++++++----
 recipes/base-combo-nvidia.yml | 10 ++++++++++
 recipes/base-combo.yml        | 10 ++++++++++
 recipes/jp-desktop-nvidia.yml |  2 +-
 recipes/jp-laptop.yml         |  2 +-
 5 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 recipes/base-combo-nvidia.yml
 create mode 100644 recipes/base-combo.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b88c447..4bc235d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,7 @@ variables:
   DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client
   RUST_LOG_STYLE: always
   BB_SIGNING_DRIVER: sigstore
+  BB_CACHE_LAYERS: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
 
@@ -42,12 +43,14 @@ base-images:
     matrix:
       - RECIPE:
           # - base-cosmic.yml
-          - base-cosmic-nvidia.yml
+          # - base-cosmic-nvidia.yml
+          # - base-combo.yml
+          - base-combo-nvidia.yml
           # - base-kinoite.yml
           # - base-kinoite-nvidia.yml
         TAG: 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci
         BB_BUILD_PUSH: 'true'
-        BB_BUILD_RECHUNK: 'true'
+        # BB_BUILD_RECHUNK: 'true'
 
 build-image:
   extends:
@@ -59,9 +62,10 @@ build-image:
     matrix:
       - RECIPE:
           - cp-laptop.yml
-          - jp-desktop-nvidia.yml
           - wke-server.yml
           - wke-worker.yml
+        BB_BUILD_PUSH: 'true'
+      - RECIPE:
+          - jp-desktop-nvidia.yml
           - jp-laptop.yml
-        BB_CACHE_LAYERS: 'true'
         # BB_BUILD_PUSH: 'true'
diff --git a/recipes/base-combo-nvidia.yml b/recipes/base-combo-nvidia.yml
new file mode 100644
index 0000000..3998b02
--- /dev/null
+++ b/recipes/base-combo-nvidia.yml
@@ -0,0 +1,10 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
+name: combo
+base-image: quay.io/fedora/fedora-bootc
+image-version: 42
+description: The base image of Wunker OS with COSMIC and Plasma for Nvidia
+modules:
+  - from-file: base/common.yml
+  - from-file: base/cosmic.yml
+  - from-file: base/post-build.yml
diff --git a/recipes/base-combo.yml b/recipes/base-combo.yml
new file mode 100644
index 0000000..d15eeb2
--- /dev/null
+++ b/recipes/base-combo.yml
@@ -0,0 +1,10 @@
+---
+# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
+name: combo
+base-image: quay.io/fedora/fedora-bootc
+image-version: 42
+description: The base image of Wunker OS with COSMIC and Plasma
+modules:
+  - from-file: base/common.yml
+  - from-file: base/cosmic.yml
+  - from-file: base/post-build.yml
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index 4593152..9f24821 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -6,7 +6,7 @@ name: jp-desktop-nvidia
 # image-version: "42.20250828.1"
 
 # Custom Base
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/cosmic-nvidia
+base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo-nvidia
 image-version: 42
 description: The image of Wunker OS for JP's desktop gaming.
 blue-build-tag: none
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index b28c49d..9e55446 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -3,7 +3,7 @@
 name: jp-laptop
 # base-image: ghcr.io/ublue-os/bazzite
 # image-version: "42.20250828"
-base-image: registry.gitlab.com/wunker-bunker/wunker-os/cosmic
+base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo
 image-version: 42
 description: The image of Wunker OS for JP's Laptop.
 stages: