From 6317070f85f143fd3ac68500250dbdf22dc4b214 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Wed, 3 May 2023 21:46:49 +0200
Subject: [PATCH] Refactor the `sddm` installation

---
 profiles/ManuSurface/Arch/install.sh | 1 +
 scripts/Arch/OS/setup.sh             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/profiles/ManuSurface/Arch/install.sh b/profiles/ManuSurface/Arch/install.sh
index 17836c25..f7b0add3 100755
--- a/profiles/ManuSurface/Arch/install.sh
+++ b/profiles/ManuSurface/Arch/install.sh
@@ -2,6 +2,7 @@
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 . "../../../scripts/Arch/Devices/SurfaceBook2/install.sh";
+. "../../../scripts/Arch/Software/sddm/install.sh";
 . "../../../scripts/Arch/Collections/school.sh";
 
 NEXTCLOUD_DIR="${NEXTCLOUD_DIR}" \
diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh
index f848eb38..b84572c2 100755
--- a/scripts/Arch/OS/setup.sh
+++ b/scripts/Arch/OS/setup.sh
@@ -49,10 +49,10 @@ echo "KEYMAP=$ARCH_KEYMAP" | arch-chroot "$ARCH_MOUNT_ROOT" tee /etc/vconsole.co
 echo "$ARCH_HOSTNAME" | arch-chroot "$ARCH_MOUNT_ROOT" tee /etc/hostname;
 arch-chroot "$ARCH_MOUNT_ROOT" mkinitcpio -P;
 
-arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/yay/install.sh";
 arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/GRUB/install.sh";
 arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/sudo/install.sh";
-arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/sddm/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";