From d1e0c35a2d6e250db0d433f276fb8bead52ca112 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com>
Date: Thu, 8 May 2025 08:38:47 -0400
Subject: [PATCH] Move cp-laptop to dnf module

---
 recipes/common/ms-fonts.yml | 11 ++++++-----
 recipes/cp-laptop.yml       | 22 ++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/recipes/common/ms-fonts.yml b/recipes/common/ms-fonts.yml
index ca30251..ec17fe0 100644
--- a/recipes/common/ms-fonts.yml
+++ b/recipes/common/ms-fonts.yml
@@ -1,7 +1,8 @@
 modules:
-  - type: rpm-ostree
+  - type: dnf
     install:
-      - cabextract
-      - xorg-x11-font-utils
-      - fontconfig
-      - https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm
+      packages:
+        - cabextract
+        - xorg-x11-font-utils
+        - fontconfig
+        - https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm
diff --git a/recipes/cp-laptop.yml b/recipes/cp-laptop.yml
index a252711..3fe98b7 100644
--- a/recipes/cp-laptop.yml
+++ b/recipes/cp-laptop.yml
@@ -2,20 +2,22 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cp-laptop
 base-image: ghcr.io/ublue-os/kinoite-main
-image-version: 41
+image-version: 42
 description: The image of Wunker OS for CP's laptop.
 modules:
-  - type: rpm-ostree
+  - type: dnf
     repos:
-      - https://copr.fedorainfracloud.org/coprs/iucar/rstudio/repo/fedora-%OS_VERSION%/iucar-rstudio-fedora-%OS_VERSION%.repo
+      copr:
+        - iucar/rstudio
     install:
-      - libadwaita
-      - cronie
-      - fprintd
-      - fprintd-pam
-      - R
-      - rstudio-desktop
-      - libreoffice
+      packages:
+        - libadwaita
+        - cronie
+        - fprintd
+        - fprintd-pam
+        - R
+        - rstudio-desktop
+        - libreoffice
   - from-file: common/ms-fonts.yml
   - from-file: common/updates.yml
   - from-file: common/bluebuild-logo.yml