From 123e11860d9af77c047dd7e3645c6967c5a2762c Mon Sep 17 00:00:00 2001
From: Eriq Taing <eriq12@protonmail.com>
Date: Sat, 14 Jun 2025 14:42:33 -0400
Subject: [PATCH] Revert chagnes, dropping notifying user on update.

---
 files/systemd/system/bootc-fetch-updates.service   |  8 ++++++++
 files/systemd/system/bootc-fetch-updates.timer     | 12 ++++++++++++
 files/systemd/system/flatpak-system-update.service |  5 +++++
 files/systemd/system/flatpak-system-update.timer   |  9 +++++++++
 files/systemd/user/flatpak-user-update.service     |  5 +++++
 files/systemd/user/flatpak-user-update.timer       |  9 +++++++++
 recipes/components/base-module.yml                 | 13 +++++--------
 7 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 files/systemd/system/bootc-fetch-updates.service
 create mode 100644 files/systemd/system/bootc-fetch-updates.timer
 create mode 100644 files/systemd/system/flatpak-system-update.service
 create mode 100644 files/systemd/system/flatpak-system-update.timer
 create mode 100644 files/systemd/user/flatpak-user-update.service
 create mode 100644 files/systemd/user/flatpak-user-update.timer

diff --git a/files/systemd/system/bootc-fetch-updates.service b/files/systemd/system/bootc-fetch-updates.service
new file mode 100644
index 0000000..c316cde
--- /dev/null
+++ b/files/systemd/system/bootc-fetch-updates.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Download bootc updates
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/bootc update --quiet
\ No newline at end of file
diff --git a/files/systemd/system/bootc-fetch-updates.timer b/files/systemd/system/bootc-fetch-updates.timer
new file mode 100644
index 0000000..482831f
--- /dev/null
+++ b/files/systemd/system/bootc-fetch-updates.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Download bootc updates
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+
+[Timer]
+OnBootSec=15min
+OnUnitInactiveSec=8h
+RandomizedDelaySec=2h
+
+[Install]
+WantedBy=timers.target
\ No newline at end of file
diff --git a/files/systemd/system/flatpak-system-update.service b/files/systemd/system/flatpak-system-update.service
new file mode 100644
index 0000000..ca8f96c
--- /dev/null
+++ b/files/systemd/system/flatpak-system-update.service
@@ -0,0 +1,5 @@
+[Unit]
+Description=Update flatpaks
+
+[Service]
+ExecStart=flatpak update --noninteractive
\ No newline at end of file
diff --git a/files/systemd/system/flatpak-system-update.timer b/files/systemd/system/flatpak-system-update.timer
new file mode 100644
index 0000000..ff66905
--- /dev/null
+++ b/files/systemd/system/flatpak-system-update.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Update flatpak
+
+[Timer]
+OnBootSec=15min
+OnCalendar=daily
+
+[Install]
+WantedBy=timers.target
\ No newline at end of file
diff --git a/files/systemd/user/flatpak-user-update.service b/files/systemd/user/flatpak-user-update.service
new file mode 100644
index 0000000..ca8f96c
--- /dev/null
+++ b/files/systemd/user/flatpak-user-update.service
@@ -0,0 +1,5 @@
+[Unit]
+Description=Update flatpaks
+
+[Service]
+ExecStart=flatpak update --noninteractive
\ No newline at end of file
diff --git a/files/systemd/user/flatpak-user-update.timer b/files/systemd/user/flatpak-user-update.timer
new file mode 100644
index 0000000..ff66905
--- /dev/null
+++ b/files/systemd/user/flatpak-user-update.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Update flatpak
+
+[Timer]
+OnBootSec=15min
+OnCalendar=daily
+
+[Install]
+WantedBy=timers.target
\ No newline at end of file
diff --git a/recipes/components/base-module.yml b/recipes/components/base-module.yml
index f9bcc04..fecaddb 100644
--- a/recipes/components/base-module.yml
+++ b/recipes/components/base-module.yml
@@ -7,23 +7,20 @@ modules:
       packages:
         - ublue-os-udev-rules
         - ublue-os-signing
-  
-  - type: dnf
-    repos:
-      copr:
-        - ublue-os/bling
-    install:
-      packages:
-        - ublue-update
 
   - type: script
     scripts:
       - addimageinfo.sh
 
   - type: systemd
+    system:
+      enabled:
+        - bootc-fetch-updates.timer
+        - flatpak-system-update.timer
     user:
       enabled:
         - unlock-kwallet.service
+        - flatpak-user-update.timer
 
   - type: dnf
     install: