GuillaumeHemmen/winesapOS
1
0
Fork 0
mirror of https://github.com/winesapOS/winesapOS.git synced 2025-08-26 11:27:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from vbsp-exe/main

Browse source 
[feat] Remove Xorg in-favour of Wayland
This commit is contained in:
Luke Short 2025-06-20 17:22:22 -06:00 • committed by GitHub
commit 7367b8ff22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 29 deletions

1
scripts/env/winesapos-env-defaults.sh vendored
View file

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

13
scripts/winesapos-install.sh
View file

@ -779,17 +779,8 @@ DefaultLimitNOFILE=524288" > "${WINESAPOS_INSTALL_DIR}"/usr/lib/systemd/user.con
echo "Increasing open file limits complete." echo "Increasing open file limits complete."
echo "Setting up the desktop environment..." echo "Setting up the desktop environment..."
# GuestSneezeOSDev: Instead of fully disabling Xorg, you can re-enable it if WINESAPOS_XORG_ENABLE is yes pacman_install_chroot foot libinput wayland xorg-xwayland
if [[ "${WINESAPOS_XORG_ENABLE}" == "true" ]]; then aur_install_chroot xwayland-run-git weston libwayland-server
# 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
# Install the Simple Desktop Display Manager (SDDM). # Install the Simple Desktop Display Manager (SDDM).
pacman_install_chroot sddm pacman_install_chroot sddm

22
scripts/winesapos-tests.sh
View file

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