From 4ca33a3fe37afeb14a5e764813f623be7c2af042 Mon Sep 17 00:00:00 2001
From: Arcitec <38923130+Arcitec@users.noreply.github.com>
Date: Tue, 9 May 2023 19:07:50 +0200
Subject: [PATCH] feat: streamlined YAML configuration for RPM-related settings

All RPM-related settings are now within their own YAML sub-category, to improve readability.
---
 build.sh   |  6 +++---
 recipe.yml | 55 +++++++++++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/build.sh b/build.sh
index dfc1342023..6a4885c9d3 100644
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@ get_yaml_string() {
 fedora_version="$(get_yaml_string '.fedora-version')"
 
 # Add custom repos.
-get_yaml_array repos '.extrarepos[]'
+get_yaml_array repos '.rpm.repos[]'
 if [[ ${#repos[@]} -gt 0 ]]; then
     echo "-- Adding repos defined in recipe.yml --"
     for repo in "${repos[@]}"; do
@@ -38,7 +38,7 @@ if [[ ${#buildscripts[@]} -gt 0 ]]; then
 fi
 
 # Remove RPMs.
-get_yaml_array remove_rpms '.rpm-remove[]'
+get_yaml_array remove_rpms '.rpm.remove[]'
 if [[ ${#remove_rpms[@]} -gt 0 ]]; then
     echo "-- Removing RPMs defined in recipe.yml --"
     echo "Removing: ${remove_rpms[@]}"
@@ -47,7 +47,7 @@ if [[ ${#remove_rpms[@]} -gt 0 ]]; then
 fi
 
 # Install RPMs.
-get_yaml_array install_rpms '.rpm-install[]'
+get_yaml_array install_rpms '.rpm.install[]'
 if [[ ${#install_rpms[@]} -gt 0 ]]; then
     echo "-- Installing RPMs defined in recipe.yml --"
     echo "Installing: ${install_rpms[@]}"
diff --git a/recipe.yml b/recipe.yml
index f6ac6f4c9e..c01282ce48 100644
--- a/recipe.yml
+++ b/recipe.yml
@@ -24,39 +24,44 @@ description: A starting point for further customization of uBlue images. Make yo
 scripts:
 #  - example.sh
 
-# A list of urls of ".repo" files that should be added to your system.
-# This is the proper way to add custom COPR repos to your image.
-# Tip: Use `%FEDORA_VERSION%` instead of static Fedora version numbers, so that
-# your repos automatically use the Fedora version defined in `fedora-version`,
-# which greatly simplifies future maintenance of your custom recipe.
-extrarepos:
-  # Example (which also demonstrates version number expansion):
-  # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%FEDORA_VERSION%/atim-starship-fedora-%FEDORA_VERSION%.repo
+# Custom RPM configuration.
+# These changes will be integrated into your custom image at the "system level".
+rpm:
+  # A list of urls of ".repo" files that should be added to your system.
+  # This is the proper way to add custom COPR repos to your image.
+  # Tip: Use `%FEDORA_VERSION%` instead of static Fedora version numbers, so that
+  # your repos automatically use the Fedora version defined in `fedora-version`,
+  # which greatly simplifies future maintenance of your custom recipe.
+  repos:
+    # Example (which also demonstrates version number expansion):
+    # - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%FEDORA_VERSION%/atim-starship-fedora-%FEDORA_VERSION%.repo
 
-# These RPMs will be removed from the system image. This step happens during
-# image build, before installing custom RPMs (from the "rpm-install" category).
-rpm-remove:
-  # Remove the native firefox (from Fedora) in favor of the Flatpak.
-  - firefox
-  - firefox-langpacks
+  # These RPMs will be installed from your enabled repositories (Fedora's own
+  # repos, extra "repos" you've added, etc). The installation is automatically
+  # performed via rpm-ostree during the image build, and will be pre-installed
+  # at the "system level" in the final image.
+  install:
+    # Needed for yafti (the first boot installer). Remove if you're not using yafti.
+    - python3-pip
+    # GNOME's GTK4 theme, Libadwaita. Already included in Silverblue, but not other spins.
+    - libadwaita
+    # Add your own below:
+    # Example:
+    # - tilix
 
-# These RPMs will be installed from your enabled repositories (Fedora's own repos,
-# any "extrarepos" you've added, etc). The installation is automatically performed
-# via rpm-ostree during the image build, and will be pre-installed in the final image.
-rpm-install:
-  # Needed for yafti (the first boot installer). Remove if you're not using yafti.
-  - python3-pip
-  # GNOME's GTK4 Theme, Libadwaita. It already comes with silverblue, but not other spins.
-  - libadwaita
-  # Add your own below:
-  # - tilix
+  # These RPMs will be removed from the system image. This step happens during
+  # image build, BEFORE installing custom RPMs (from the "rpm.install" category).
+  remove:
+    # Remove the native firefox (from Fedora) in favor of the Flatpak.
+    - firefox
+    - firefox-langpacks
 
 # These Flatpaks will be suggested for install on user login, via the yafti
 # "first boot" GUI. By default, the menu also shows up again anytime the image's
 # yafti configuration differs from the user's last encounter, so feel free
 # to expand the selection over time. Your users will then see the yafti menu
 # again after OS update, and will be given a chance to install new additions.
-# Everything below will be merged into the "etc/yafti.yml" configuration on build,
+# Everything below will be merged into the "etc/yafti.yml" config on build,
 # in a category named "Custom". If you prefer, you can instead remove everything
 # below and purely use "etc/yafti.yml" to have more control over settings.
 # This is just an example selection.