From 908e6e60b6333f1979b10e6bedd37a217a00cd71 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Wed, 18 Jun 2025 21:13:55 +0200
Subject: [PATCH] feat: refacto config a bit

---
 Containerfile |  3 +++
 build.sh      | 45 +++++++++++++++++++++++++++++++++------------
 packages      |  1 +
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/Containerfile b/Containerfile
index 42442d4..7f76b02 100644
--- a/Containerfile
+++ b/Containerfile
@@ -68,3 +68,6 @@ RUN mkdir -p /var/lib/alternatives && \
 # - /var/lib/alternatives is required to prevent failure with some RPM installs
 # - All RUN commands must end with ostree container commit
 #   see: https://coreos.github.io/rpm-ostree/container/#using-ostree-container-commit
+
+RUN dnf5 config-manager setopt skip_if_unavailable=1 && \
+    bootc container lint
diff --git a/build.sh b/build.sh
index d6d4834..6390425 100755
--- a/build.sh
+++ b/build.sh
@@ -7,26 +7,28 @@ RELEASE="$(rpm -E %fedora)"
 ### Add repos
 
 # Add niri repo
-curl -Lo /etc/yum.repos.d/yalter-niri-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/yalter/niri/repo/fedora-"${RELEASE}"/yalter-niri-fedora-"${RELEASE}".repo
+dnf5 -y copr enable yalter/niri
 
 # Add Staging repo
-curl -Lo /etc/yum.repos.d/ublue-os-staging-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${RELEASE}"/ublue-os-staging-fedora-"${RELEASE}".repo
+dnf5 -y copr enable ublue-os/staging
 
 # Add Bling repo
-curl -Lo /etc/yum.repos.d/ublue-os-bling-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-"${RELEASE}"/ublue-os-bling-fedora-"${RELEASE}".repo
+dnf5 -y copr enable ublue-os/bling
 
-curl -Lo /etc/yum.repos.d/ganto-lxc4-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ganto/lxc4/repo/fedora-"${RELEASE}"/ganto-lxc4-fedora-"${RELEASE}".repo
+dnf5 -y copr enable ganto/lxc4
 
-curl -Lo /etc/yum.repos.d/_copr_che-nerd-fonts-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${RELEASE}"/che-nerd-fonts-fedora-"${RELEASE}".repo
+dnf5 -y copr enable che/nerd-fonts
 
-curl -Lo /etc/yum.repos.d/_copr_pgdev-ghostty-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/pgdev/ghostty/repo/fedora-"${RELEASE}"/pgdev-ghostty-fedora-"${RELEASE}".repo
+dnf5 -y copr enable pgdev/ghostty
 
-curl -Lo /etc/yum.repos.d/_copr_alternateved-bleeding-emacs-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/alternateved/bleeding-emacs/repo/fedora-"${RELEASE}"/alternateved-bleeding-emacs-fedora-"${RELEASE}".repo
+dnf5 -y copr enable alternateved/bleeding-emacs
 
-curl -Lo /etc/yum.repos.d/_copr-ulysg-xwayland-satellite-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ulysg/xwayland-satellite/repo/fedora-"${RELEASE}"/ulysg-xwayland-satellite-fedora-"${RELEASE}".repo
+dnf5 -y copr enable ulysg/xwayland-satellite
 
 curl https://downloads.1password.com/linux/keys/1password.asc | tee /etc/pki/rpm-gpg/1password.gpg
 
+dnf5 -y copr enable gmaglione/podman-bootc
+
 ### Install 1password using blue-build script
 
 curl -Lo 1password.sh https://raw.githubusercontent.com/blue-build/modules/22fe11d844763bf30bd83028970b975676fe7beb/modules/bling/installers/1password.sh
@@ -38,14 +40,11 @@ rm 1password.sh
 
 ### Install packages
 
-grep -v '^#' /tmp/packages | xargs rpm-ostree install
+grep -v '^#' /tmp/packages | xargs dnf5 install -y
 
 # Install topgrade
 pip install --prefix=/usr topgrade
 
-# Installed via flatpak
-rpm-ostree override remove firefox firefox-langpacks
-
 #### os-release
 
 sed -i '/fedoraproject.org/d' /usr/lib/os-release
@@ -104,3 +103,25 @@ systemctl enable -f --global syncthing.service
 
 systemctl enable azure-system-setup.service
 systemctl enable azure-groups.service
+
+dnf5 -y copr disable yalter/niri
+
+# Add Staging repo
+dnf5 -y copr disable ublue-os/staging
+
+# Add Bling repo
+dnf5 -y copr disable ublue-os/bling
+
+dnf5 -y copr disable ganto/lxc4
+
+dnf5 -y copr disable che/nerd-fonts
+
+dnf5 -y copr disable pgdev/ghostty
+
+dnf5 -y copr disable alternateved/bleeding-emacs
+
+dnf5 -y copr disable ulysg/xwayland-satellite
+
+curl https://downloads.1password.com/linux/keys/1password.asc | tee /etc/pki/rpm-gpg/1password.gpg
+
+dnf5 -y copr disable gmaglione/podman-bootc
diff --git a/packages b/packages
index 0a6a56c..dd23c5a 100644
--- a/packages
+++ b/packages
@@ -47,6 +47,7 @@ docker-compose-plugin
 # incus
 # incus-agent
 podman
+podman-bootc
 podman-docker
 podman-tui
 devpod