From 2669e1630da43fc2a85196c5546d38dbe6d183df Mon Sep 17 00:00:00 2001
From: Alex <alex@ahubbard.xyz>
Date: Thu, 22 Dec 2022 20:29:23 -0600
Subject: [PATCH] * add automatic flatpak updates to arch install

* rename SCRIPTS/ to scripts/

* add directory files/ for misc files to add to installer, currently
  holds flatpak auto update systemd timers
---
 installers/arch/files/flatpak-update.service        | 11 +++++++++++
 installers/arch/files/flatpak-update.timer          | 13 +++++++++++++
 installers/arch/install.sh                          |  8 +++++++-
 installers/arch/{SCRIPTS => scripts}/aur-install.sh |  0
 .../arch/{SCRIPTS => scripts}/aur-programs.list     |  0
 installers/arch/{SCRIPTS => scripts}/gaming.sh      |  0
 installers/arch/{SCRIPTS => scripts}/harden.sh      |  0
 installers/arch/{SCRIPTS => scripts}/opendoas.sh    |  0
 installers/arch/{SCRIPTS => scripts}/system76.sh    |  0
 .../arch/{SCRIPTS => scripts}/ungoogled-chromium.sh |  0
 .../arch/{SCRIPTS => scripts}/virt-manager.sh       |  0
 11 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 installers/arch/files/flatpak-update.service
 create mode 100644 installers/arch/files/flatpak-update.timer
 rename installers/arch/{SCRIPTS => scripts}/aur-install.sh (100%)
 rename installers/arch/{SCRIPTS => scripts}/aur-programs.list (100%)
 rename installers/arch/{SCRIPTS => scripts}/gaming.sh (100%)
 rename installers/arch/{SCRIPTS => scripts}/harden.sh (100%)
 rename installers/arch/{SCRIPTS => scripts}/opendoas.sh (100%)
 rename installers/arch/{SCRIPTS => scripts}/system76.sh (100%)
 rename installers/arch/{SCRIPTS => scripts}/ungoogled-chromium.sh (100%)
 rename installers/arch/{SCRIPTS => scripts}/virt-manager.sh (100%)

diff --git a/installers/arch/files/flatpak-update.service b/installers/arch/files/flatpak-update.service
new file mode 100644
index 0000000..ae367f4
--- /dev/null
+++ b/installers/arch/files/flatpak-update.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Update Flatpak
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/flatpak update --noninteractive --assumeyes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/installers/arch/files/flatpak-update.timer b/installers/arch/files/flatpak-update.timer
new file mode 100644
index 0000000..85cd815
--- /dev/null
+++ b/installers/arch/files/flatpak-update.timer
@@ -0,0 +1,13 @@
+[Unit]
+Description=Update Flatpak
+
+[Timer]
+OnBootSec=2m
+OnActiveSec=2m
+OnUnitInactiveSec=24h
+OnUnitActiveSec=24h
+AccuracySec=1h
+RandomizedDelaySec=10m
+
+[Install]
+WantedBy=timers.target
diff --git a/installers/arch/install.sh b/installers/arch/install.sh
index 5046b1f..0f05546 100755
--- a/installers/arch/install.sh
+++ b/installers/arch/install.sh
@@ -71,6 +71,12 @@ configuration() {
 
     sudo ufw enable
 
+#setup flatpak auto updates
+    sudo cp ./files/flatpak-update.service /etc/systemd/user/
+    sudo cp ./files/flatpak-update.timer /etc/systemd/user/
+    sudo systemctl daemon-reload
+    systemctl --user enable --now flatpak-update.timer
+
 #zsh setup
     chsh -s /bin/zsh "$USER"
 
@@ -88,6 +94,7 @@ configuration() {
     sudo sh -c "echo '$USER hard memlock 2048' >> /etc/security/limits.conf"
 
 #fixes
+    #fixes java progams on tilining window managers
     sudo sh -c 'echo "export _JAVA_AWT_WM_NONREPARENTING=1" >> /etc/profile.d/jre.sh'
 
 #theming
@@ -132,7 +139,6 @@ read input
 [ "$input" = "y" ] && wireless
 
 echo "installing AUR packages..."
-echo "$PWD"
 sh ./SCRIPTS/aur-install.sh
 echo "Done installing AUR packages."
 echo ""
diff --git a/installers/arch/SCRIPTS/aur-install.sh b/installers/arch/scripts/aur-install.sh
similarity index 100%
rename from installers/arch/SCRIPTS/aur-install.sh
rename to installers/arch/scripts/aur-install.sh
diff --git a/installers/arch/SCRIPTS/aur-programs.list b/installers/arch/scripts/aur-programs.list
similarity index 100%
rename from installers/arch/SCRIPTS/aur-programs.list
rename to installers/arch/scripts/aur-programs.list
diff --git a/installers/arch/SCRIPTS/gaming.sh b/installers/arch/scripts/gaming.sh
similarity index 100%
rename from installers/arch/SCRIPTS/gaming.sh
rename to installers/arch/scripts/gaming.sh
diff --git a/installers/arch/SCRIPTS/harden.sh b/installers/arch/scripts/harden.sh
similarity index 100%
rename from installers/arch/SCRIPTS/harden.sh
rename to installers/arch/scripts/harden.sh
diff --git a/installers/arch/SCRIPTS/opendoas.sh b/installers/arch/scripts/opendoas.sh
similarity index 100%
rename from installers/arch/SCRIPTS/opendoas.sh
rename to installers/arch/scripts/opendoas.sh
diff --git a/installers/arch/SCRIPTS/system76.sh b/installers/arch/scripts/system76.sh
similarity index 100%
rename from installers/arch/SCRIPTS/system76.sh
rename to installers/arch/scripts/system76.sh
diff --git a/installers/arch/SCRIPTS/ungoogled-chromium.sh b/installers/arch/scripts/ungoogled-chromium.sh
similarity index 100%
rename from installers/arch/SCRIPTS/ungoogled-chromium.sh
rename to installers/arch/scripts/ungoogled-chromium.sh
diff --git a/installers/arch/SCRIPTS/virt-manager.sh b/installers/arch/scripts/virt-manager.sh
similarity index 100%
rename from installers/arch/SCRIPTS/virt-manager.sh
rename to installers/arch/scripts/virt-manager.sh