From d7c38d2d1cbb2dab58565d22b0de130b09fd6989 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Tue, 7 Mar 2023 23:27:41 -0500
Subject: [PATCH] Removed unfinished Sway support

---
 README.md        |  2 +-
 chrootInstall.sh | 16 ++--------------
 install.sh       |  9 +--------
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 3beb30c..f98aaf1 100755
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Some major/noteworthy differences from common configurations:
 - EXT4 fast_commit mode is enabled by default
 - makepkg is configured for better than stock performance
 - a custom .bashrc with useful power management aliases is included
-- ...all of this and more on KDE Plasma (Wayland)/Sway (UNFINISHED)
+- ...all of this and more on KDE Plasma (Wayland)
 
 # Usage
 Upon loading up the official Artix base ISO (tested on weekly base images only), logging in, connecting to the internet, and switching to the root user, run:
diff --git a/chrootInstall.sh b/chrootInstall.sh
index fd7f081..d2e3929 100755
--- a/chrootInstall.sh
+++ b/chrootInstall.sh
@@ -5,7 +5,6 @@ formfactor="$(< /tempfiles/formfactor)"
 cpu="$(< /tempfiles/cpu)"
 threadsminusone="$(< /tempfiles/threadsminusone)"
 gpu="$(< /tempfiles/gpu)"
-desktop="$(< /tempfiles/desktop)"
 intel_vaapi_driver="$(< /tempfiles/intel_vaapi_driver)"
 boot="$(< /tempfiles/boot)"
 disk="$(< /tempfiles/disk)"
@@ -120,24 +119,13 @@ chown "$username":users /home/"$username"/{.config,.local}
 chown "$username":users /home/"$username"/.local/share
 chmod 755 /home/"$username"/{.config,.local/share}
 
-# installing desktop environment and addons + utilities
-if [ "$desktop" != 0 ]; then
-    pacman -S pipewire pipewire-pulse pipewire-jack pipewire-alsa wireplumber wayland-protocols polkit micro bluez-openrc --needed --noconfirm
-fi
-
 ## KDE Plasma
-if [ "$desktop" == 1 ]; then
-    pacman -S plasma-desktop plasma-wayland-session plasma-wayland-protocols kscreen kwallet-pam kdeplasma-addons spectacle gwenview plasma-nm plasma-pa breeze-gtk kde-gtk-config kio-extras khotkeys kwalletmanager yakuake ark kate bluedevil dolphin qt5-imageformats --needed --noconfirm
+if [ "$formfactor" == 1 ] || [ "$formfactor" == 2 ] || [ "$formfactor" == 3 ]; then
+    pacman -S plasma-desktop plasma-wayland-session plasma-wayland-protocols kscreen kwallet-pam kdeplasma-addons spectacle gwenview plasma-nm plasma-pa breeze-gtk kde-gtk-config kio-extras khotkeys kwalletmanager yakuake ark kate bluedevil dolphin qt5-imageformats pipewire pipewire-pulse pipewire-jack pipewire-alsa wireplumber wayland-protocols polkit micro bluez-openrc --needed --noconfirm
     curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/pam-login -o /etc/pam.d/login
     echo -e "if [ -z \$DISPLAY ] && [ "\$\(tty\)" = "/dev/tty1" ]; then exec dbus-run-session startplasma-wayland; fi" >> /home/"$username"/.bash_profile
 fi
 
-## Sway
-if [ "$desktop" == 2 ]; then
-    pacman -S sway waybar fuzzel foot ranger p7zip --needed --noconfirm
-    echo -e "if [ -z \$DISPLAY ] && [ "\$\(tty\)" = "/dev/tty1" ]; then exec sway; fi" >> /home/"$username"/.bash_profile
-fi
-
 mkdir -p /home/"$username"/.config/autostart/
 curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/pipewire-start/pipewire.desktop -o /home/"$username"/.config/autostart/pipewire.desktop
 curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/programs/powerset/powerset.sh -o /usr/local/bin/powerset.sh
diff --git a/install.sh b/install.sh
index 81b9694..933c07c 100755
--- a/install.sh
+++ b/install.sh
@@ -3,7 +3,7 @@
 loadkeys us
 echo ----------------------------------------------------------------------------------------------
 echo rwinkhart\'s artix install script
-echo last updated february 21, 2023
+echo last updated march 07, 2023
 echo ----------------------------------------------------------------------------------------------
 echo You will be asked some questions before installation.
 echo -e "----------------------------------------------------------------------------------------------\n"
@@ -44,12 +44,6 @@ ram=$(echo "$(< /proc/meminfo)" | grep 'MemTotal:' | awk '{print $2;}'); ram=$(e
 # stop hardware detection
 
 # start conditional questions
-if [ "$formfactor" == 1 ] || [ "$formfactor" == 2 ] || [ "$formfactor" == 3 ]; then
-    echo -e '1. KDE Plasma\n2. Sway\n'
-    read -n 1 -rp "desktop: " desktop
-else
-    desktop=0
-fi
 if [ "$gpu" == 'Intel' ]; then
     echo -e '1. libva-intel-driver (intel igpus up to coffee lake)\n2. intel-media-driver (intel igpus/dgpus newer than coffee lake)\n'
     read -n 1 -rp "va-api driver: " intel_vaapi_driver
@@ -179,7 +173,6 @@ echo "$formfactor" > /mnt/tempfiles/formfactor
 echo "$cpu" > /mnt/tempfiles/cpu
 echo "$threadsminusone" > /mnt/tempfiles/threadsminusone
 echo "$gpu" > /mnt/tempfiles/gpu
-echo "$desktop" > /mnt/tempfiles/desktop
 echo "$intel_vaapi_driver" > /mnt/tempfiles/intel_vaapi_driver
 echo "$boot" > /mnt/tempfiles/boot
 echo "$disk0" > /mnt/tempfiles/disk