From 986dfd9d5d25aaf15e19b24f6807fe2a0e29e7dc Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Wed, 24 Apr 2024 21:44:43 -0400
Subject: [PATCH] Create fedora 40 images

---
 .gitlab-ci.yml            |  2 ++
 recipes/jp-desktop-40.yml | 13 +++++++++++++
 recipes/jp-desktop.yml    |  3 +--
 recipes/jp-laptop-40.yml  | 13 +++++++++++++
 recipes/jp-laptop.yml     |  2 +-
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 recipes/jp-desktop-40.yml
 create mode 100644 recipes/jp-laptop-40.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75b8821..6f2124d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,8 @@ build-image:
       - RECIPE:
           - jp-desktop.yml
           - jp-laptop.yml
+          - jp-desktop-40.yml
+          - jp-laptop-40.yml
   variables:
     DOCKER_HOST: tcp://docker:2376
     DOCKER_TLS_CERTDIR: /certs
diff --git a/recipes/jp-desktop-40.yml b/recipes/jp-desktop-40.yml
new file mode 100644
index 0000000..a5eeec3
--- /dev/null
+++ b/recipes/jp-desktop-40.yml
@@ -0,0 +1,13 @@
+name: jp-desktop-40
+base-image: ghcr.io/ublue-os/bazzite-nvidia
+image-version: latest
+description: The image of Wunker OS for JP's desktop gaming.
+modules:
+  - type: signing
+  - type: files
+    files:
+      - steam-firewall: /usr
+      - desktop-audio: /usr
+  - from-file: modules/jp-apps.yml
+  - from-file: modules/gaming.yml
+  - from-file: modules/dev-packages.yml
diff --git a/recipes/jp-desktop.yml b/recipes/jp-desktop.yml
index cdec451..26b287b 100644
--- a/recipes/jp-desktop.yml
+++ b/recipes/jp-desktop.yml
@@ -1,8 +1,7 @@
 name: jp-desktop
 base-image: ghcr.io/ublue-os/bazzite-nvidia
-image-version: latest
+image-version: 39
 description: The image of Wunker OS for JP's desktop gaming.
-blue-build-tag: main-installer
 modules:
   - type: signing
   - type: files
diff --git a/recipes/jp-laptop-40.yml b/recipes/jp-laptop-40.yml
new file mode 100644
index 0000000..9a7b052
--- /dev/null
+++ b/recipes/jp-laptop-40.yml
@@ -0,0 +1,13 @@
+name: jp-laptop-40
+base-image: ghcr.io/ublue-os/bazzite
+image-version: latest
+description: The image of Wunker OS for JP's Laptop.
+modules:
+  - type: signing
+  - from-file: modules/jp-apps.yml
+  - type: rpm-ostree
+    install:
+      - fprintd
+      - fprintd-pam
+  - from-file: modules/gaming.yml
+  - from-file: modules/dev-packages.yml
diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml
index 888ee69..a9180cd 100644
--- a/recipes/jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -1,6 +1,6 @@
 name: jp-laptop
 base-image: ghcr.io/ublue-os/bazzite
-image-version: latest
+image-version: 39
 description: The image of Wunker OS for JP's Laptop.
 modules:
   - type: signing