Merge pull request #1060 from vbsp-exe/main

[feat] Remove Xorg in-favour of Wayland

scripts/env/winesapos-env-defaults.sh

@@ -25,7 +25,6 @@ export \
   WINESAPOS_BUILD_IN_VM_ONLY="${WINESAPOS_BUILD_IN_VM_ONLY:-true}" \
   WINESAPOS_BUILD_CHROOT_ONLY="${WINESAPOS_BUILD_CHROOT_ONLY:-false}" \
   WINESAPOS_USER_NAME="${WINESAPOS_USER_NAME:-winesap}" \
-  WINESAPOS_XORG_ENABLE="${WINESAPOS_XORG_ENABLE:-false}" \
   WINESAPOS_SINGLE_MIRROR="${WINESAPOS_SINGLE_MIRROR:-false}" \
   WINESAPOS_SINGLE_MIRROR_URL="${WINESAPOS_SINGLE_MIRROR_URL:-http://ohioix.mm.fcix.net/archlinux}" \
   WINESAPOS_BOOTLOADER="${WINESAPOS_BOOTLOADER:-grub}" \

scripts/winesapos-install.sh

@@ -779,17 +779,8 @@ DefaultLimitNOFILE=524288" > "${WINESAPOS_INSTALL_DIR}"/usr/lib/systemd/user.con
 echo "Increasing open file limits complete."
 
 echo "Setting up the desktop environment..."
-# GuestSneezeOSDev: Instead of fully disabling Xorg, you can re-enable it if WINESAPOS_XORG_ENABLE is yes
-if [[ "${WINESAPOS_XORG_ENABLE}" == "true" ]]; then
-    # Install Xorg.
-    pacman_install_chroot xorg-server xorg-xinit xorg-xinput xterm xf86-input-libinput xcb-util-keysyms xcb-util-cursor xcb-util-wm xcb-util-xrm
-    # Install xwayland-run to help run Steam during the first-time setup.
-    aur_install_chroot xwayland-run-git weston libwayland-server
-elif [[ "${WINESAPOS_XORG_ENABLE}" == "false" ]]; then
-    # Install Wayland.
-    pacman_install_chroot foot libinput wayland xorg-xwayland
-    aur_install_chroot xwayland-run-git weston libwayland-server
-fi
+pacman_install_chroot foot libinput wayland xorg-xwayland
+aur_install_chroot xwayland-run-git weston libwayland-server
 
 # Install the Simple Desktop Display Manager (SDDM).
 pacman_install_chroot sddm

scripts/winesapos-tests.sh

@@ -400,23 +400,11 @@ pacman_search_loop \
   vulkan-nouveau \
   xwayland-run-git
 
-if [[ "${WINESAPOS_XORG_ENABLE}" == "true" ]]; then
-    pacman_search_loop \
-      xcb-util-keysyms \
-      xcb-util-cursor \
-      xcb-util-wm \
-      xcb-util-xrm
-      xf86-input-libinput \
-      xorg-server \
-      xorg-xinit \
-      xorg-xinput \
-      xterm
-else
-    pacman_search_loop \
-      foot \
-      libinput \
-      wayland \
-      xorg-xwayland
+pacman_search_loop \
+    foot \
+    libinput \
+    wayland \
+    xorg-xwayland
 fi
 
 if [[ "${WINESAPOS_DE}" == "i3" ]]; then