From 53ed15bcfb27611a1b643ab7f1c3ab501854793b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Garc=C3=ADa?=
 <4411661+GarciaLnk@users.noreply.github.com>
Date: Sun, 15 Dec 2024 01:07:39 +0100
Subject: [PATCH 1/2] feat: add etckeeper

this installs etckeeper and enables a timer that commits daily the changes done to /etc
---
 build_files/base/17-cleanup.sh  | 5 +++++
 build_files/dx/09-cleanup-dx.sh | 2 ++
 packages.json                   | 1 +
 3 files changed, 8 insertions(+)

diff --git a/build_files/base/17-cleanup.sh b/build_files/base/17-cleanup.sh
index aa9df2cc75d..56a8f894561 100755
--- a/build_files/base/17-cleanup.sh
+++ b/build_files/base/17-cleanup.sh
@@ -16,6 +16,7 @@ systemctl enable brew-update.timer
 systemctl --global enable ublue-user-setup.service
 systemctl --global enable podman-auto-update.timer
 systemctl enable check-sb-key.service
+systemctl enable etckeeper.timer
 
 # Hide Desktop Files. Hidden removes mime associations
 sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/fish.desktop
@@ -40,3 +41,7 @@ done
 if [ -f /etc/yum.repos.d/fedora-coreos-pool.repo ]; then
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-coreos-pool.repo
 fi
+
+# Initialize etckeeper
+etckeeper init
+etckeeper commit "initial setup"
diff --git a/build_files/dx/09-cleanup-dx.sh b/build_files/dx/09-cleanup-dx.sh
index 16df8fee37a..5131427ec95 100755
--- a/build_files/dx/09-cleanup-dx.sh
+++ b/build_files/dx/09-cleanup-dx.sh
@@ -29,3 +29,5 @@ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
 for i in /etc/yum.repos.d/rpmfusion-*; do
     sed -i 's@enabled=1@enabled=0@g' "$i"
 done
+
+etckeeper commit "initial dx setup"
diff --git a/packages.json b/packages.json
index c647cbde1ac..9d64fffe22e 100644
--- a/packages.json
+++ b/packages.json
@@ -12,6 +12,7 @@
 				"evtest",
 				"epson-inkjet-printer-escpr",
 				"epson-inkjet-printer-escpr2",
+				"etckeeper",
 				"fastfetch",
 				"fish",
 				"firewall-config",

From 0fb4245eadb8479faee9be53cca8361a8f6b06a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Garc=C3=ADa?=
 <4411661+GarciaLnk@users.noreply.github.com>
Date: Sun, 15 Dec 2024 22:51:41 +0100
Subject: [PATCH 2/2] fix: do not enable etckeeper by default

---
 build_files/base/17-cleanup.sh  | 5 -----
 build_files/dx/09-cleanup-dx.sh | 2 --
 2 files changed, 7 deletions(-)

diff --git a/build_files/base/17-cleanup.sh b/build_files/base/17-cleanup.sh
index 56a8f894561..aa9df2cc75d 100755
--- a/build_files/base/17-cleanup.sh
+++ b/build_files/base/17-cleanup.sh
@@ -16,7 +16,6 @@ systemctl enable brew-update.timer
 systemctl --global enable ublue-user-setup.service
 systemctl --global enable podman-auto-update.timer
 systemctl enable check-sb-key.service
-systemctl enable etckeeper.timer
 
 # Hide Desktop Files. Hidden removes mime associations
 sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/fish.desktop
@@ -41,7 +40,3 @@ done
 if [ -f /etc/yum.repos.d/fedora-coreos-pool.repo ]; then
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-coreos-pool.repo
 fi
-
-# Initialize etckeeper
-etckeeper init
-etckeeper commit "initial setup"
diff --git a/build_files/dx/09-cleanup-dx.sh b/build_files/dx/09-cleanup-dx.sh
index 5131427ec95..16df8fee37a 100755
--- a/build_files/dx/09-cleanup-dx.sh
+++ b/build_files/dx/09-cleanup-dx.sh
@@ -29,5 +29,3 @@ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
 for i in /etc/yum.repos.d/rpmfusion-*; do
     sed -i 's@enabled=1@enabled=0@g' "$i"
 done
-
-etckeeper commit "initial dx setup"