From f2f689e238970222daa292876ba2ea5a1542a606 Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Sun, 1 Dec 2024 13:17:29 +0000
Subject: [PATCH] Use wine-ge for wine package and disable virtual desktop
 mode, use implicit env import for steam

---
 localhost/caskd/archlinux/steam/runner.sh    |  2 +-
 localhost/caskd/archlinux/wine/Containerfile | 17 ++++-------------
 localhost/caskd/archlinux/wine/runner.sh     |  3 ++-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/localhost/caskd/archlinux/steam/runner.sh b/localhost/caskd/archlinux/steam/runner.sh
index ccca6fe..5465775 100755
--- a/localhost/caskd/archlinux/steam/runner.sh
+++ b/localhost/caskd/archlinux/steam/runner.sh
@@ -9,7 +9,7 @@ podman create \
 	--userns=keep-id:uid=10000 \
 	--security-opt=seccomp=unconfined \
 	--restart=on-failure:5 \
-	-e DISPLAY="$DISPLAY" \
+	-e DISPLAY \
 	-v '/sys:/sys' \
 	-v '/dev:/dev' \
 	-v '/run/pulse:/run/pulse' \
diff --git a/localhost/caskd/archlinux/wine/Containerfile b/localhost/caskd/archlinux/wine/Containerfile
index dba52ed..478989a 100644
--- a/localhost/caskd/archlinux/wine/Containerfile
+++ b/localhost/caskd/archlinux/wine/Containerfile
@@ -1,23 +1,14 @@
 # Main image
 FROM localhost/caskd/archlinux/graphical:latest
 
-# Enable multilib
-RUN printf '%s\n%s\n' '[multilib]' 'Include = /etc/pacman.d/mirrorlist' | tee -a /etc/pacman.conf
+USER yaybuild
+RUN --network=host yay -Sy --noconfirm \
+	wine-ge-custom
 
+USER root
 RUN --network=host pacman -Sy --noconfirm \
 	lib32-mesa \
 	lib32-pulseaudio \
-	lib32-vkd3d \
 	lib32-vulkan-radeon \
-	vkd3d \
-	wine \
 	wine-mono \
 	winetricks
-
-USER user
-WORKDIR /home/user
-# Required for optimal performance from DX9-11
-RUN --network=host winetricks -q \
-	dxvk2010
-
-USER root
diff --git a/localhost/caskd/archlinux/wine/runner.sh b/localhost/caskd/archlinux/wine/runner.sh
index 1c25fac..8420e6b 100755
--- a/localhost/caskd/archlinux/wine/runner.sh
+++ b/localhost/caskd/archlinux/wine/runner.sh
@@ -4,6 +4,7 @@ podman run \
 	--user user \
 	--network=host \
 	--userns=keep-id:uid=10000 \
+	--security-opt=seccomp=unconfined \
 	-e DISPLAY \
 	-e WINEDLLOVERRIDES=winhttp=n,b \
 	-v '/sys:/sys' \
@@ -15,4 +16,4 @@ podman run \
 	-v '.:/run/current' \
 	-v 'wine_generic_data:/home/user/.wine:U' \
 	-w /run/current \
-	localhost/caskd/archlinux/wine:latest wine explorer /desktop=desktop,1920x1080 "$@"
+	localhost/caskd/archlinux/wine:latest wine "$@"