Attempt to utilize bling module ublue-update instead of personal systemd units.

2025-06-14 12:48:35 -04:00
parent 5a4123097e
commit cf132260df
12 changed files with 12 additions and 93 deletions
--- a/files/system/etc/ublue-update/ublue-update.toml
+++ b/files/system/etc/ublue-update/ublue-update.toml
@@ -0,0 +1,8 @@
+[checks]
+    min_battery_percent = 20.0
+    max_cpu_load_percent = 50.0
+    max_mem_percent = 90.0
+    network_not_metered = true
+
+[notify]
+    dbus_notify = true
--- a/files/systemd/system/bootc-fetch-updates.service
+++ b/files/systemd/system/bootc-fetch-updates.service
@@ -1,8 +0,0 @@
-[Unit]
-Description=Download bootc updates
-Documentation=man:bootc(8)
-ConditionPathExists=/run/ostree-booted
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/bootc update --quiet
--- a/files/systemd/system/bootc-fetch-updates.timer
+++ b/files/systemd/system/bootc-fetch-updates.timer
@@ -1,12 +0,0 @@
-[Unit]
-Description=Download bootc updates
-Documentation=man:bootc(8)
-ConditionPathExists=/run/ostree-booted
-
-[Timer]
-OnBootSec=15min
-OnUnitInactiveSec=8h
-RandomizedDelaySec=2h
-
-[Install]
-WantedBy=timers.target
--- a/files/systemd/system/flag-update-downloaded.service
+++ b/files/systemd/system/flag-update-downloaded.service
@@ -1,10 +0,0 @@
-[Unit]
-Description=Create a file to flag that an update has been downloaded
-After=bootc-status-updated.target
-
-[Service]
-Type=exec
-ExecStart=/usr/bin/touch /tmp/hydro-os-updated
-
-[Install]
-WantedBy=bootc-status-updated.target
--- a/files/systemd/system/flatpak-system-update.service
+++ b/files/systemd/system/flatpak-system-update.service
@@ -1,5 +0,0 @@
-[Unit]
-Description=Update flatpaks
-
-[Service]
-ExecStart=flatpak update --noninteractive
--- a/files/systemd/system/flatpak-system-update.timer
+++ b/files/systemd/system/flatpak-system-update.timer
@@ -1,9 +0,0 @@
-[Unit]
-Description=Update flatpak
-
-[Timer]
-OnBootSec=15min
-OnCalendar=daily
-
-[Install]
-WantedBy=timers.target
--- a/files/systemd/user/bootc-status-updated.path
+++ b/files/systemd/user/bootc-status-updated.path
@@ -1,10 +0,0 @@
-[Unit]
-Description=Monitor bootc for status changes
-Documentation=man:bootc-status-updated.path(5)
-
-[Path]
-PathExists=/tmp/hydro-os-updated
-Unit=bootc-status-updated.target
-
-[Install]
-WantedBy=multi-user.target
--- a/files/systemd/user/bootc-status-updated.target
+++ b/files/systemd/user/bootc-status-updated.target
@@ -1,4 +0,0 @@
-[Unit]
-Description=Target for bootc status changes
-Documentation=man:bootc-status-updated.target(5)
-StopWhenUnneeded=true
--- a/files/systemd/user/flatpak-user-update.service
+++ b/files/systemd/user/flatpak-user-update.service
@@ -1,5 +0,0 @@
-[Unit]
-Description=Update flatpaks
-
-[Service]
-ExecStart=flatpak update --noninteractive
--- a/files/systemd/user/flatpak-user-update.timer
+++ b/files/systemd/user/flatpak-user-update.timer
@@ -1,9 +0,0 @@
-[Unit]
-Description=Update flatpak
-
-[Timer]
-OnBootSec=15min
-OnCalendar=daily
-
-[Install]
-WantedBy=timers.target
--- a/files/systemd/user/notify-update.service
+++ b/files/systemd/user/notify-update.service
@@ -1,11 +0,0 @@
-[Unit]
-Description=Notify the user when the next update has been downloaded.
-# order after update has been applied
-After=bootc-status-updated.target
-
-[Service]
-Type=exec
-ExecStart=/usr/bin/systemd-run --user notify-send 'Update Downloaded!' 'A new update has been downloaded! Please restart to apply update!'
-
-[Install]
-WantedBy=bootc-status-updated.target
--- a/recipes/components/base-module.yml
+++ b/recipes/components/base-module.yml
@@ -13,19 +13,13 @@ modules:
      - addimageinfo.sh

  - type: systemd
-    system:
-      enabled:
-        - bootc-fetch-updates.timer
-        - podman-auto-update.timer
-        - flatpak-system-update.timer
-        - flag-update-downloaded.service
    user:
      enabled:
-        - podman-auto-update.timer
-        - flatpak-user-update.timer
        - unlock-kwallet.service
-        - notify-update.service
-        - bootc-status-updated.path
+  
+  - type: bling
+    install:
+    - ublue-update

  - type: dnf
    install: