From 109e62335f8be361da0ddb712886b2ca5a354f90 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Thu, 7 Mar 2024 19:15:46 +0100
Subject: [PATCH] Install GUI after initial reboot

---
 scripts/Arch/Collections/personal.sh | 16 ++++++++++++++--
 scripts/Arch/OS/setup.sh             |  5 +----
 scripts/Arch/Software/KDE/install.sh |  4 ++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/scripts/Arch/Collections/personal.sh b/scripts/Arch/Collections/personal.sh
index a3761685..aaac9c88 100755
--- a/scripts/Arch/Collections/personal.sh
+++ b/scripts/Arch/Collections/personal.sh
@@ -27,12 +27,21 @@ yay --noconfirm -Syu \
     terminal-parrot \
     rar \
     nextcloud-client \
+    flatpak \
     ;
 
+. "../Software/git/install.sh";
+
 sudo chsh $USER --shell "$(which fish)";
 
-. "../Software/git/install.sh";
-. "../Software/IcedTea/install.sh";
+# User Interface
+yay --noconfirm -Syu \
+    sddm \
+    maliit-keyboard \
+    ;
+
+. ../Config/sddm/install.sh;
+. ../Software/KDE/install.sh;
 
 yay --noconfirm -Syu power-profiles-daemon;
 sudo systemctl enable --now power-profiles-daemon;
@@ -60,6 +69,9 @@ yay --noconfirm -Syu \
 
 # . "../Config/GnomeExtensions/install.sh";
 
+# Frameworks
+. "../Software/IcedTea/install.sh";
+
 # rclone
 . "../Software/rclone/install.sh";
 
diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh
index 46902b73..f6384b22 100755
--- a/scripts/Arch/OS/setup.sh
+++ b/scripts/Arch/OS/setup.sh
@@ -38,7 +38,7 @@ pacstrap -K "$ARCH_MOUNT_ROOT" \
     man-db \
     man-pages \
     texinfo \
-    maliit-keyboard;
+    ;
 
 cp -r "$projectRoot" "${ARCH_MOUNT_ROOT}$tempRoot";
 genfstab -U "$ARCH_MOUNT_ROOT" >> "$ARCH_MOUNT_ROOT/etc/fstab";
@@ -65,9 +65,6 @@ arch-chroot "$ARCH_MOUNT_ROOT" mkinitcpio -P;
 arch-chroot "$ARCH_MOUNT_ROOT" pacman -Syu;
 arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/GRUB/install.sh";
 arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/sudo/install.sh";
-pacstrap -K "$ARCH_MOUNT_ROOT" sddm;
-arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Config/sddm/install.sh";
-arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/KDE/install.sh";
 pacstrap -K "$ARCH_MOUNT_ROOT" git;
 
 
diff --git a/scripts/Arch/Software/KDE/install.sh b/scripts/Arch/Software/KDE/install.sh
index 7da49287..3ee07cc7 100755
--- a/scripts/Arch/Software/KDE/install.sh
+++ b/scripts/Arch/Software/KDE/install.sh
@@ -7,6 +7,6 @@ sudo pacman -Syu --noconfirm \
     packagekit-qt5 \
     kde-applications-meta \
     iio-sensor-proxy \
-    flatpak \
     pipewire-audio \
-    pipewire-pulse;
+    pipewire-pulse \
+    ;