From 70a16c59d422a7008e1a8c79e6446f47d9265b3e Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Sat, 27 Jul 2024 15:31:37 -0400
Subject: [PATCH] Create cosmic only laptop image

---
 .gitlab-ci.yml                | 1 +
 recipes/common/jp-common.yml  | 1 -
 recipes/jp-desktop-nvidia.yml | 1 +
 recipes/jp-laptop-cosmic.yml  | 9 +++++++++
 recipes/jp-laptop.yml         | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 recipes/jp-laptop-cosmic.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f6bc32..90b5f50 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,7 @@ build-image:
           # - jp-desktop.yml
           - jp-desktop-nvidia.yml
           - jp-laptop.yml
+          - jp-laptop-cosmic.yml
           - cp-laptop.yml
   variables:
     DOCKER_HOST: tcp://docker:2376
diff --git a/recipes/common/jp-common.yml b/recipes/common/jp-common.yml
index 019fe2d..8ee44cc 100644
--- a/recipes/common/jp-common.yml
+++ b/recipes/common/jp-common.yml
@@ -5,7 +5,6 @@ modules:
   - from-file: common/gaming.yml
   - from-file: common/dev-packages.yml
   - from-file: common/updates.yml
-  - from-file: common/cosmic.yml
   - type: files
     files:
       - source: distrobox
diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml
index e39534b..36aad8c 100644
--- a/recipes/jp-desktop-nvidia.yml
+++ b/recipes/jp-desktop-nvidia.yml
@@ -6,4 +6,5 @@ stages:
   - from-file: common/helix.yml
 modules:
   - from-file: common/jp-desktop.yml
+  - from-file: common/cosmic.yml
   - from-file: common/helix.yml
diff --git a/recipes/jp-laptop-cosmic.yml b/recipes/jp-laptop-cosmic.yml
new file mode 100644
index 0000000..fdcd98a
--- /dev/null
+++ b/recipes/jp-laptop-cosmic.yml
@@ -0,0 +1,9 @@
+name: jp-laptop-cosmic
+base-image: ghcr.io/ublue-os/cosmic-base
+image-version: 40
+description: The image of Wunker OS for JP's Laptop.
+stages:
+  - from-file: common/helix.yml
+modules:
+  - from-file: common/jp-laptop.yml
+  - from-file: common/helix.yml
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index 688ed44..e401337 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -6,4 +6,5 @@ stages:
   - from-file: common/helix.yml
 modules:
   - from-file: common/jp-laptop.yml
+  - from-file: common/cosmic.yml
   - from-file: common/helix.yml