From f4195e109e55e4f1cc995afba0134202b8c167a4 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Fri, 26 Jan 2024 14:07:29 -0800
Subject: [PATCH] feat: Switch to topgrade powered ublue-update chore: Drop
 bling repo chore: Restore minimum battery check thanks to patched library

---
 Containerfile                          | 5 ++---
 packages.json                          | 1 -
 usr/etc/ublue-update/ublue-update.toml | 2 +-
 usr/share/ublue-os/topgrade.toml       | 9 ++++++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Containerfile b/Containerfile
index 7daeed3a63b..b7a39152c7d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -67,12 +67,12 @@ RUN curl -Lo /tmp/starship.tar.gz "https://github.com/starship/starship/releases
   install -c -m 0755 /tmp/starship /usr/bin && \
   echo 'eval "$(starship init bash)"' >> /etc/bashrc
 
-RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rpm -E %fedora)/ublue-os-bling-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os-bling.repo && \
-    wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
+RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     /tmp/build.sh && \
     /tmp/image-info.sh && \
     pip install --prefix=/usr yafti && \
     pip install --prefix=/usr topgrade && \
+    rpm-ostree install ublue-update && \
     mkdir -p /usr/etc/flatpak/remotes.d && \
     wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \
     cp /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml && \
@@ -89,7 +89,6 @@ RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/bling/repo/fedora-$(rp
     find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just && \
     rm -f /etc/yum.repos.d/tailscale.repo && \
     rm -f /etc/yum.repos.d/charm.repo && \
-    rm -f /etc/yum.repos.d/_copr_ublue-os-bling.repo && \
     rm -f /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo && \
     echo "Hidden=true" >> /usr/share/applications/fish.desktop && \
     echo "Hidden=true" >> /usr/share/applications/htop.desktop && \
diff --git a/packages.json b/packages.json
index 96945c66737..aa50d706029 100644
--- a/packages.json
+++ b/packages.json
@@ -37,7 +37,6 @@
 				"stress-ng",
 				"tailscale",
 				"tmux",
-				"ublue-update",
 				"usbmuxd",
 				"wireguard-tools",
 				"xprop",
diff --git a/usr/etc/ublue-update/ublue-update.toml b/usr/etc/ublue-update/ublue-update.toml
index efcc93c0e65..2cfa6511054 100644
--- a/usr/etc/ublue-update/ublue-update.toml
+++ b/usr/etc/ublue-update/ublue-update.toml
@@ -1,5 +1,5 @@
 [checks]
-    min_battery_percent = 0.0
+    min_battery_percent = 20.0
     max_cpu_load_percent = 50.0
     max_mem_percent = 90.0
 [notify]
diff --git a/usr/share/ublue-os/topgrade.toml b/usr/share/ublue-os/topgrade.toml
index c8a891eb36d..3dcc032939f 100644
--- a/usr/share/ublue-os/topgrade.toml
+++ b/usr/share/ublue-os/topgrade.toml
@@ -1,6 +1,9 @@
 [misc]
 no_self_update = true
+disable = ["self_update", "toolbx", "containers"]
+ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "pip3", "helm", "home_manager", "firmware"]
 assume_yes = true
-no_retry = true
-disable = ["toolbx", "self_update"]
-ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "pip3"]
+no_retry = false
+
+[linux]
+rpm_ostree = true