From 46ba557ce886d59360ebb2ebfd8107e15eee9824 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Wed, 3 May 2023 17:47:41 +0200
Subject: [PATCH] Migrate from gnome to plasma

---
 scripts/Arch/Collections/personal.sh  | 16 ++++++++--------
 scripts/Arch/Config/sddm/install.sh   |  2 ++
 scripts/Arch/OS/setup.sh              |  4 +++-
 scripts/Arch/Software/KDE/install.sh  |  4 ++++
 scripts/Arch/Software/sddm/install.sh |  5 +++++
 5 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100755 scripts/Arch/Config/sddm/install.sh
 create mode 100755 scripts/Arch/Software/KDE/install.sh
 create mode 100755 scripts/Arch/Software/sddm/install.sh

diff --git a/scripts/Arch/Collections/personal.sh b/scripts/Arch/Collections/personal.sh
index 1a73512e..69bfd0b0 100755
--- a/scripts/Arch/Collections/personal.sh
+++ b/scripts/Arch/Collections/personal.sh
@@ -32,15 +32,15 @@ yay --noconfirm -Syu \
 # GRUB Shenanigans
 . "../Software/minegrub-theme/install.sh";
 
-# Gnome Extensions
-yay --noconfirm -Syu \
-    gnome-shell-extension-order-icons-git \
-    gnome-shell-extension-desktop-icons-ng \
-    gnome-shell-extension-dash-to-dock \
-    gnome-shell-extension-pop-shell-git \
-    gnome-shell-extension-pano-git;
+# # Gnome Extensions
+# yay --noconfirm -Syu \
+#     gnome-shell-extension-order-icons-git \
+#     gnome-shell-extension-desktop-icons-ng \
+#     gnome-shell-extension-dash-to-dock \
+#     gnome-shell-extension-pop-shell-git \
+#     gnome-shell-extension-pano-git;
 
-. "../Config/GnomeExtensions/install.sh";
+# . "../Config/GnomeExtensions/install.sh";
 
 # rclone
 . "../Software/rclone/install.sh";
diff --git a/scripts/Arch/Config/sddm/install.sh b/scripts/Arch/Config/sddm/install.sh
new file mode 100755
index 00000000..c8303ab6
--- /dev/null
+++ b/scripts/Arch/Config/sddm/install.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo systemctl enable sddm;
diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh
index ef8bb053..f848eb38 100755
--- a/scripts/Arch/OS/setup.sh
+++ b/scripts/Arch/OS/setup.sh
@@ -49,9 +49,11 @@ 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/GNOME/install.sh";
+arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/sddm/install.sh";
+arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/../Software/KDE/install.sh";
 
 
 USER_NAME="${USER_NAME}" \
diff --git a/scripts/Arch/Software/KDE/install.sh b/scripts/Arch/Software/KDE/install.sh
new file mode 100755
index 00000000..14ec8b41
--- /dev/null
+++ b/scripts/Arch/Software/KDE/install.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+sudo pacman -Syu --noconfirm \
+    plasma-meta \
+    plasma-wayland-session;
diff --git a/scripts/Arch/Software/sddm/install.sh b/scripts/Arch/Software/sddm/install.sh
new file mode 100755
index 00000000..be9064ae
--- /dev/null
+++ b/scripts/Arch/Software/sddm/install.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+pushd "${BASH_SOURCE%/*}" > /dev/null;
+yay -Syu --noconfirm sddm-git;
+source "../../Config/sddm/install.sh";
+popd > /dev/null;