From d6f6e5935923c325663cf8136d6fa0939729d8e7 Mon Sep 17 00:00:00 2001
From: Mohamed <source2013inemscriptenlolol@gmail.com>
Date: Sat, 10 May 2025 19:13:17 +0400
Subject: [PATCH] [feat] Remove Xorg in-favour of Wayland
Resolve #1054
---
scripts/env/winesapos-env-defaults.sh | 1 -
scripts/winesapos-install.sh | 13 ++-----------
scripts/winesapos-tests.sh | 22 +++++-----------------
3 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/scripts/env/winesapos-env-defaults.sh b/scripts/env/winesapos-env-defaults.sh
index 7663395..8fbbe61 100755
--- a/scripts/env/winesapos-env-defaults.sh
+++ b/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}" \
diff --git a/scripts/winesapos-install.sh b/scripts/winesapos-install.sh
index cd61596..62b7a9f 100755
--- a/scripts/winesapos-install.sh
+++ b/scripts/winesapos-install.sh
@@ -770,17 +770,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
diff --git a/scripts/winesapos-tests.sh b/scripts/winesapos-tests.sh
index d828c95..e7becfb 100755
--- a/scripts/winesapos-tests.sh
+++ b/scripts/winesapos-tests.sh
@@ -392,23 +392,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