From f1698367767bc4cb9f9bf630696e2861e43533fc Mon Sep 17 00:00:00 2001
From: qpismont <pismont.quentin@protonmail.com>
Date: Sat, 24 Jan 2026 18:31:27 +0100
Subject: [PATCH] Refactor Containerfile and update build-iso.sh for improved
 ISO generation and module customization

---
 Containerfile | 20 ++------------------
 build-iso.sh  |  4 +++-
 iso.toml      | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 iso.toml

diff --git a/Containerfile b/Containerfile
index 2057540..babb414 100644
--- a/Containerfile
+++ b/Containerfile
@@ -7,29 +7,14 @@ RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc \
 #Ajout du dépot mullvad
 RUN curl -fsSL https://repository.mullvad.net/rpm/stable/mullvad.repo -o /etc/yum.repos.d/mullvad.repo
 
-#Ajout du dépot avengemedia pour DMS (DankMaterialShell)
-RUN dnf install -y 'dnf5-command(copr)' \
-    && dnf copr enable avengemedia/dms -y \
-    && dnf copr enable avengemedia/danklinux -y
-
-#Ajout du dépot Niri desktop
-RUN dnf copr enable yalter/niri -y
-
 #Install de gnome avec support hardware + Podman + Cups + Vulkan driver + Plymouth + dev tools + divers utilitaires
 RUN dnf install -y \
+    -x gnome-software gnome-software-rpm-ostree gnome-system-monitor showtime decibels snapshot PackageKit PackageKit-gstreamer-plugin PackageKit-command-not-found toolbox \
     @gnome-desktop \
     @hardware-support \
     @development-tools \
     @multimedia \
-    mesa-vulkan-drivers \
-    mesa-vulkan-drivers.i686 \
-    vulkan-loader \
-    vulkan-loader.i686 \
     vulkan-tools \
-    gamescope \
-    niri \
-    dsearch \
-    dms \
     glibc-langpack-fr \
     langpacks-core-fr \
     langpacks-fr \
@@ -60,7 +45,6 @@ RUN dnf install -y \
     gstreamer1-plugins-base \
     gstreamer1-vaapi \
     ffmpeg \
-    && dnf remove -y alacritty waybar gnome-software gnome-software-rpm-ostree gnome-system-monitor showtime decibels snapshot PackageKit PackageKit-gstreamer-plugin PackageKit-command-not-found toolbox || true \
     && dnf clean all \
     && rm -rf /var/cache/dnf
 
@@ -113,4 +97,4 @@ RUN systemctl set-default graphical.target
 #Activation des services + Desactivation de bootc-update automatique
 RUN systemctl preset-all && \
     systemctl enable gdm.service NetworkManager.service bluetooth.service podman.socket cups.service mullvad-daemon.service && \
-    systemctl mask bootc-fetch-apply-updates.timer
+    systemctl mask bootc-fetch-apply-updates.timer
\ No newline at end of file
diff --git a/build-iso.sh b/build-iso.sh
index 7c8139b..1f122b4 100755
--- a/build-iso.sh
+++ b/build-iso.sh
@@ -19,11 +19,13 @@ sudo podman run --rm -it \
   --pull=newer \
   --security-opt label=type:unconfined_t \
   -v $(pwd)/output:/output \
+  -v "./iso.toml:/config.toml:ro" \
   -v /var/lib/containers/storage:/var/lib/containers/storage \
   quay.io/centos-bootc/bootc-image-builder:latest \
-  --type anaconda-iso \
+  --type iso \
   --local \
   --rootfs btrfs \
+  --use-lib-repo=true \
   localhost/${IMAGE_NAME}:${IMAGE_TAG}
 
 echo "[SUCCÈS] ISO généré dans $OUTPUT_DIR"
\ No newline at end of file
diff --git a/iso.toml b/iso.toml
new file mode 100644
index 0000000..1075e92
--- /dev/null
+++ b/iso.toml
@@ -0,0 +1,14 @@
+[customizations.installer.modules]
+enable = [
+  "org.fedoraproject.Anaconda.Modules.Storage",
+  "org.fedoraproject.Anaconda.Modules.Runtime",
+  "org.fedoraproject.Anaconda.Modules.Network",
+  "org.fedoraproject.Anaconda.Modules.Security",
+  "org.fedoraproject.Anaconda.Modules.Services",
+  "org.fedoraproject.Anaconda.Modules.Users",
+  "org.fedoraproject.Anaconda.Modules.Timezone"
+]
+
+disable = [
+  "org.fedoraproject.Anaconda.Modules.Subscription",
+]
\ No newline at end of file