From ecefb8c32455f057249db92892cf99d1a602e59a Mon Sep 17 00:00:00 2001
From: Tobias Strobel <code@strobel.one>
Date: Thu, 9 Nov 2023 22:53:43 +0100
Subject: [PATCH] Change most flatpaks to native install

---
 install.sh                       | 11 ++++++++++-
 run_once_flatpak-applications.sh | 16 ++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/install.sh b/install.sh
index 182acdf..42cae5b 100755
--- a/install.sh
+++ b/install.sh
@@ -29,6 +29,7 @@ install -pm644 -Dt /etc/pacman.d/conf.d \
 # Remove packages one by one because pacman doesn't handle uninstalled packages
 # gracefully
 packages_to_remove=(
+    eog # replaced by loupe
 )
 
 for pkg in "${packages_to_remove[@]}"; do
@@ -191,10 +192,12 @@ packages=(
     gvfs-smb
     sushi # Previewer for nautilus
     evince # Document viewer
-    eog # Image viewer
+    loupe # image viewer
+    geary # light mail client
     simple-scan
     seahorse # Credential manager
     baobab # Disk space analyser
+    gnome-firmware # fwupd for gnome
     # Multimedia for gnome
     gst-plugins-good
     gst-plugins-bad
@@ -466,6 +469,12 @@ aur_packages=(
     qtscrcpy # Android screen display
     cinny-desktop-bin # Lightweight Matrix client
     iotas # Note taking with Nextcloud Sync
+    denaro # personal finance manager
+    errands # todo list
+    impression # create bootable drives
+    pika-backup # backups with borgbackup
+    tuba # fediverse client (GoToSocial)
+    trayscale # tailscale cli GUI wrapper
 )
 
 aur_optdeps=(
diff --git a/run_once_flatpak-applications.sh b/run_once_flatpak-applications.sh
index f9f4699..a0f89ca 100644
--- a/run_once_flatpak-applications.sh
+++ b/run_once_flatpak-applications.sh
@@ -3,13 +3,13 @@
 set -e
 exec 2> >(while read line; do echo -e "\e[01;31m$line\e[0m"; done)
 
-flatpak install --noninteractive org.gnome.World.PikaBackup
-flatpak install --noninteractive org.gnome.Loupe
-flatpak install --noninteractive dev.deedles.Trayscale
+flatpak install --noninteractive org.gnome.World.PikaBackup # to be removed
+flatpak remove --noninteractive org.gnome.Loupe
+flatpak remove --noninteractive dev.deedles.Trayscale
 flatpak install --noninteractive com.belmoussaoui.ReadItLater
-flatpak install --noninteractive dev.geopjr.Tuba
+flatpak remove --noninteractive dev.geopjr.Tuba
 flatpak install --noninteractive com.github.tchx84.Flatseal
-flatpak install --noninteractive org.gnome.Firmware
-flatpak install --noninteractive io.github.mrvladus.List
-flatpak install --noninteractive org.gnome.Geary
-flatpak install --noninteractive io.gitlab.adhami3310.Impression
+flatpak remove --noninteractive org.gnome.Firmware
+flatpak remove --noninteractive io.github.mrvladus.List
+flatpak remove --noninteractive org.gnome.Geary
+flatpak remove --noninteractive io.gitlab.adhami3310.Impression