From 3e16a3dddf1b9b45423631e1f1dae030fa36242d Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Thu, 25 Jan 2024 23:18:19 -0800
Subject: [PATCH] chore: Remove old ublue-update configs & scripts

---
 Containerfile                                  |  7 +++++++
 .../usr/etc/ublue-update/ublue-update.toml     |  7 -------
 .../usr/etc/ublue-update/topgrade-user.toml    | 16 ----------------
 .../usr/etc/ublue-update/ublue-update.toml     |  7 -------
 .../user/80-adwaita-for-steam-user-update.sh   |  7 -------
 .../90-mozilla-gnome-themes-user-update.sh     | 18 ------------------
 6 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 system_files/deck/shared/usr/etc/ublue-update/ublue-update.toml
 delete mode 100644 system_files/desktop/shared/usr/etc/ublue-update/topgrade-user.toml
 delete mode 100644 system_files/desktop/shared/usr/etc/ublue-update/ublue-update.toml
 delete mode 100755 system_files/desktop/silverblue/usr/etc/ublue-update.d/user/80-adwaita-for-steam-user-update.sh
 delete mode 100755 system_files/desktop/silverblue/usr/etc/ublue-update.d/user/90-mozilla-gnome-themes-user-update.sh

diff --git a/Containerfile b/Containerfile
index b07b45f2..ee8d44e9 100644
--- a/Containerfile
+++ b/Containerfile
@@ -264,6 +264,11 @@ RUN rpm-ostree install \
     pip install --prefix=/usr topgrade && \
     rpm-ostree install \
         ublue-update && \
+    sed -i '1s/^/[include]\npaths = ["\/etc\/ublue-os\/topgrade.toml"]\n\n/' /usr/etc/ublue-update/topgrade-user.toml && \
+    sed -i 's/min_battery_percent.*/min_battery_percent = 30.0/' /usr/etc/ublue-update/ublue-update.toml && \
+    sed -i 's/max_cpu_load_percent.*/max_cpu_load_percent = 90.0/' /usr/etc/ublue-update/ublue-update.toml && \
+    sed -i 's/max_mem_percent.*/max_mem_percent = 90.0/' /usr/etc/ublue-update/ublue-update.toml && \
+    sed -i 's/dbus_notify.*/dbus_notify = true/' /usr/etc/ublue-update/ublue-update.toml && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo && \
     rpm-ostree install \
         nerd-fonts && \
@@ -657,6 +662,8 @@ RUN /tmp/image-info.sh && \
         rm -f /usr/share/applications/com.github.maliit.keyboard.desktop \
     ; fi && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/input-remapper-gtk.desktop && \
+    sed -i 's/max_cpu_load_percent.*/max_cpu_load_percent = 100.0/' /usr/etc/ublue-update/ublue-update.toml && \
+    sed -i 's/dbus_notify.*/dbus_notify = false/' /usr/etc/ublue-update/ublue-update.toml && \
     cp "/usr/share/ublue-os/firstboot/yafti.yml" "/usr/etc/yafti.yml" && \
     sed -i 's/#HandlePowerKey=poweroff/HandlePowerKey=suspend/g' /etc/systemd/logind.conf && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
diff --git a/system_files/deck/shared/usr/etc/ublue-update/ublue-update.toml b/system_files/deck/shared/usr/etc/ublue-update/ublue-update.toml
deleted file mode 100644
index 04deb903..00000000
--- a/system_files/deck/shared/usr/etc/ublue-update/ublue-update.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[checks]
-    min_battery_percent = 30.0
-    max_cpu_load_percent = 100.0
-    max_mem_percent = 90.0
-[notify]
-    dbus_notify = false
-
diff --git a/system_files/desktop/shared/usr/etc/ublue-update/topgrade-user.toml b/system_files/desktop/shared/usr/etc/ublue-update/topgrade-user.toml
deleted file mode 100644
index e3fac855..00000000
--- a/system_files/desktop/shared/usr/etc/ublue-update/topgrade-user.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[include]
-paths = ["/etc/ublue-os/topgrade.toml"]
-
-[misc]
-only = ["flatpak", "distrobox"]
-ignore_failures = ["flatpak", "distrobox"]
-skip_notify = true
-assume_yes = true
-no_retry = true
-no_self_update = true
-
-[distrobox]
-use_root = false
-
-[flatpak]
-use_sudo = false
diff --git a/system_files/desktop/shared/usr/etc/ublue-update/ublue-update.toml b/system_files/desktop/shared/usr/etc/ublue-update/ublue-update.toml
deleted file mode 100644
index cc06a23a..00000000
--- a/system_files/desktop/shared/usr/etc/ublue-update/ublue-update.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[checks]
-    min_battery_percent = 30.0
-    max_cpu_load_percent = 90.0
-    max_mem_percent = 90.0
-[notify]
-    dbus_notify = true
-
diff --git a/system_files/desktop/silverblue/usr/etc/ublue-update.d/user/80-adwaita-for-steam-user-update.sh b/system_files/desktop/silverblue/usr/etc/ublue-update.d/user/80-adwaita-for-steam-user-update.sh
deleted file mode 100755
index 21886ec3..00000000
--- a/system_files/desktop/silverblue/usr/etc/ublue-update.d/user/80-adwaita-for-steam-user-update.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-shopt -s nullglob
-
-if [ -d "$HOME/homebrew/themes/Adwaita-for-Steam" ]; then
-  cd "$HOME/homebrew/themes/Adwaita-for-Steam"
-  git pull
-fi
diff --git a/system_files/desktop/silverblue/usr/etc/ublue-update.d/user/90-mozilla-gnome-themes-user-update.sh b/system_files/desktop/silverblue/usr/etc/ublue-update.d/user/90-mozilla-gnome-themes-user-update.sh
deleted file mode 100755
index f35500b5..00000000
--- a/system_files/desktop/silverblue/usr/etc/ublue-update.d/user/90-mozilla-gnome-themes-user-update.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/bash
-shopt -s nullglob
-
-# Flatpak Firefox
-for firefox_gnome_theme in "$HOME/.var/app/org.mozilla.firefox/.mozilla/firefox/"*".default"*"/chrome/firefox-gnome-theme/"; do
-  if [ -d "$firefox_gnome_theme" ]; then
-    cd "$firefox_gnome_theme"
-    git pull
-  fi
-done
-
-# Flatpak Thunderbird
-for thunderbird_gnome_theme in "$HOME/.var/app/org.mozilla.Thunderbird/.thunderbird/"*".default"*"/chrome/thunderbird-gnome-theme/"; do
-  if [ -d "$thunderbird_gnome_theme" ]; then
-    cd "$thunderbird_gnome_theme"
-    git pull
-  fi
-done