From 1fea2e971e43d6014c4fdd64a275391dc5a7b752 Mon Sep 17 00:00:00 2001
From: Tobias Strobel <code@strobel.one>
Date: Wed, 5 Apr 2023 19:52:08 +0200
Subject: [PATCH 1/5] Install plymouth from official

---
 install.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index 11cd1b3..3fad4db 100755
--- a/install.sh
+++ b/install.sh
@@ -43,6 +43,7 @@ packages=(
     sudo
     zram-generator # swap on compressed RAM, mostly to support systemd-oomd
     sbctl # Manage secure boot binaries and sign binaries
+    plymouth # Splash screen at boot
     # File systems
     ntfs-3g
     exfatprogs
@@ -423,8 +424,6 @@ aur chroot --create
 aur_packages=(
     # AUR helper
     aurutils
-    # Splash screen at boot
-    plymouth
     networkmanager-iwd
     # iwd GUI
     iwgtk

From bdaa6971a6bd6b17caad74acfeb6bb0664700bad Mon Sep 17 00:00:00 2001
From: Tobias Strobel <code@strobel.one>
Date: Mon, 17 Apr 2023 18:00:08 +0200
Subject: [PATCH 2/5] Add Trayscale as flatpak

---
 install.sh                       | 1 -
 run_once_flatpak-applications.sh | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 3fad4db..410fc35 100755
--- a/install.sh
+++ b/install.sh
@@ -450,7 +450,6 @@ aur_packages=(
     git-gone
     dnscontrol-bin
     qtscrcpy # Android screen display
-    trayscale # GUI wrapper around tailscale cli client
 )
 
 aur_optdeps=(
diff --git a/run_once_flatpak-applications.sh b/run_once_flatpak-applications.sh
index 2c00608..21bc349 100644
--- a/run_once_flatpak-applications.sh
+++ b/run_once_flatpak-applications.sh
@@ -4,3 +4,4 @@ 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 dev.deedles.Trayscale

From 97f65c15c44c5f00486f3aaddba9e35d71b6a4fd Mon Sep 17 00:00:00 2001
From: Tobias Strobel <code@strobel.one>
Date: Mon, 17 Apr 2023 18:02:07 +0200
Subject: [PATCH 3/5] Add Loupe as flatpak

---
 run_once_flatpak-applications.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/run_once_flatpak-applications.sh b/run_once_flatpak-applications.sh
index 21bc349..5ab6807 100644
--- a/run_once_flatpak-applications.sh
+++ b/run_once_flatpak-applications.sh
@@ -4,4 +4,5 @@ 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

From 9cbace5b3fa2d36371e87b94e4744af1e012d19d Mon Sep 17 00:00:00 2001
From: Tobias Strobel <code@strobel.one>
Date: Mon, 17 Apr 2023 18:05:24 +0200
Subject: [PATCH 4/5] Add sshfs

---
 install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install.sh b/install.sh
index 410fc35..c647af3 100755
--- a/install.sh
+++ b/install.sh
@@ -48,6 +48,7 @@ packages=(
     ntfs-3g
     exfatprogs
     btrfs-progs
+    sshfs
     # Hardware tools
     fwupd # Firmware updates
     usbutils # for lsusb

From a792e6eaba3d057961fd879a3e0745c7f5f0d662 Mon Sep 17 00:00:00 2001
From: Tobias Strobel <code@strobel.one>
Date: Mon, 17 Apr 2023 18:21:55 +0200
Subject: [PATCH 5/5] Replace pop-shell with tiling-assistant

---
 install.sh                   | 14 +++++++++-----
 run_once_gnome-extensions.sh |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index c647af3..68ecefc 100755
--- a/install.sh
+++ b/install.sh
@@ -26,9 +26,13 @@ install -pm644 -Dt /etc/pacman.d/conf.d \
     "$DIR/etc/pacman/60-aurutils-repository.conf" \
     "$DIR/etc/pacman/99-options.conf"
 
-# Remove packages no longer in use
-to_remove=()
-for pkg in "${to_remove[@]}"; do
+# Remove packages one by one because pacman doesn't handle uninstalled packages
+# gracefully
+packages_to_remove=(
+    gnome-shell-extension-pop-shell-git
+)
+
+for pkg in "${packages_to_remove[@]}"; do
     pacman --noconfirm -Rs "$pkg" || true
 done
 
@@ -431,14 +435,14 @@ aur_packages=(
     # Login settings
     gdm-settings
     # Gnome extensions
-    gnome-shell-extension-arch-update # Indicator for system update    gnome-shell-extension-arch-update # Indicator for system updatess
+    gnome-shell-extension-arch-update # Indicator for system update
     gnome-shell-extension-gsconnect # Connect phone and desktop system
     gnome-shell-extension-dash-to-dock # Move the dash out of the overview transforming it in a dock
     gnome-shell-extension-clipboard-history # Searchable history panel of clipboard
     gnome-shell-extension-bluetooth-quick-connect
     gnome-shell-extension-quick-settings-tweaks-git
     gnome-shell-extension-nightthemeswitcher
-    gnome-shell-extension-pop-shell-git
+    gnome-shell-extension-tiling-assistant
     gnome-shell-extension-alphabetical-grid-extension-git # Restore the alphabetical ordering of the app grid
     # Firefox extensions
     firefox-extension-bitwarden
diff --git a/run_once_gnome-extensions.sh b/run_once_gnome-extensions.sh
index be63e31..2af081c 100644
--- a/run_once_gnome-extensions.sh
+++ b/run_once_gnome-extensions.sh
@@ -6,9 +6,11 @@ exec 2> >(while read line; do echo -e "\e[01;31m$line\e[0m"; done)
 gnome-extensions enable appindicatorsupport@rgcjonas.gmail.com
 gnome-extensions enable gsconnect@andyholmes.github.io
 gnome-extensions enable arch-update@RaphaelRochet
-gnome-extensions enable pop-shell@system76.com
 gnome-extensions enable clipboard-history@alexsaveau.dev
 gnome-extensions enable bluetooth-quick-connect@bjarosze.gmail.com
 gnome-extensions enable quick-settings-tweaks@qwreey
 gnome-extensions enable nightthemeswitcher@romainvigier.fr
 gnome-extensions enable AlphabeticalAppGrid@stuarthayhurst
+gnome-extensions enable tiling-assistant@leleat-on-github
+
+gnome-extensions disable pop-shell@system76.com