Skip to content

Commit fe2523e

Browse files
committed
drop lxqt as it has many issues with scaling and nvidia, use native selkies-desktop
1 parent ed20d43 commit fe2523e

11 files changed

Lines changed: 18 additions & 214 deletions

File tree

Dockerfile

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ LABEL maintainer="thelamer"
1010
ENV TITLE="Webstation" \
1111
NO_FULL=true \
1212
PIXELFLUX_WAYLAND=true \
13+
SELKIES_DESKTOP=true \
1314
DOOMWADDIR="/config"
1415

1516
RUN \
@@ -36,20 +37,13 @@ RUN \
3637
libfaad2 \
3738
libgtk-3-common \
3839
libopenal1 \
39-
libqt6multimedia6 \
4040
libqt6svg6 \
41-
libqt6svgwidgets6 \
42-
libqt6widgets6 \
4341
libusb-1.0-0 \
44-
lxqt-archiver \
45-
lxqt-core \
42+
pcmanfm-qt \
4643
p7zip-full \
4744
p7zip-rar \
4845
papirus-icon-theme && \
49-
echo "**** lxqt tweaks ****" && \
50-
sed -i \
51-
's#^Exec=.*#Exec=/usr/local/bin/wrapped-chromium#g' \
52-
/usr/share/applications/chromium.desktop && \
46+
echo "**** chromium wrapper ****" && \
5347
mv \
5448
/usr/bin/chromium \
5549
/usr/bin/chromium-browser && \
@@ -124,7 +118,7 @@ RUN \
124118
fi && \
125119
curl -o \
126120
/tmp/eden.deb -L \
127-
"https://git.eden-emu.dev/eden-emu/eden/releases/download/${EDEN_VERSION}/Eden-Debian-13-${EDEN_VERSION}-amd64.deb" && \
121+
"https://git.eden-emu.dev/eden-emu/eden/releases/download/${EDEN_VERSION}/Eden-Ubuntu-24.04-${EDEN_VERSION}-amd64.deb" && \
128122
apt-get install -y \
129123
/tmp/eden.deb && \
130124
echo "**** install flycast ****" && \
@@ -185,16 +179,16 @@ RUN \
185179
| awk -F '(": "|")' '/browser.*AppImage/ {print $3}') && \
186180
curl -o \
187181
/tmp/rpcs3.app -L \
188-
"${RPCS3_URL}" && \
182+
"https://github.com/RPCS3/rpcs3-binaries-linux/releases/download/build-6451c4d49fdf87380df65bd834d6582a1b6acde6/rpcs3-v0.0.37-18156-6451c4d4_linux64.AppImage" && \
189183
cd /tmp && \
190184
chmod +x rpcs3.app && \
191185
./rpcs3.app --appimage-extract && \
192186
mv \
193187
AppDir \
194188
/opt/rpcs3 && \
195189
echo "**** install scummvm ****" && \
196-
SCUMMVM_VERSION=$(curl -s https://downloads.scummvm.org/frs/scummvm/ \
197-
| awk -F'(<a href="|/">)' '{print $2}'| grep -B 1 'daily' |head -n1) && \
190+
SCUMMVM_VERSION=$(curl -sX GET "https://api.github.com/repos/scummvm/scummvm/releases/latest" \
191+
| awk '/tag_name/{print $4;exit}' FS='[""]' | sed 's/^v//g') && \
198192
curl -o \
199193
/tmp/scummvm.deb -L \
200194
"https://downloads.scummvm.org/frs/scummvm/${SCUMMVM_VERSION}/scummvm_${SCUMMVM_VERSION}-1_ubuntu24_04_amd64.deb" && \
@@ -287,14 +281,7 @@ RUN \
287281
/config/.cache \
288282
/config/.launchpadlib \
289283
/tmp/* \
290-
/usr/share/applications/lxqt-config-monitor.desktop \
291-
/usr/share/applications/lxqt-hibernate.desktop \
292-
/usr/share/applications/lxqt-leave.desktop \
293-
/usr/share/applications/lxqt-lockscreen.desktop \
294-
/usr/share/applications/lxqt-logout.desktop \
295-
/usr/share/applications/lxqt-reboot.desktop \
296-
/usr/share/applications/lxqt-shutdown.desktop \
297-
/usr/share/applications/lxqt-suspend.desktop \
284+
/usr/share/applications/pcmanfm-qt-desktop-pref.desktop \
298285
/var/lib/apt/lists/* \
299286
/var/tmp/*
300287

root/defaults/autostart_wayland

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,3 @@ if [ ! -f "${HOME}/.config/Cemu/controllerProfiles/controller0.xml" ]; then
6767
/defaults/controller0.xml \
6868
"${HOME}/.config/Cemu/controllerProfiles/controller0.xml"
6969
fi
70-
71-
dbus-run-session /startui.sh

root/defaults/config/.config/lxqt/lxqt-config-appearance.conf

Lines changed: 0 additions & 4 deletions
This file was deleted.

root/defaults/config/.config/lxqt/lxqt.conf

Lines changed: 0 additions & 15 deletions
This file was deleted.

root/defaults/config/.config/lxqt/panel.conf

Lines changed: 0 additions & 36 deletions
This file was deleted.

root/defaults/config/.config/pcmanfm-qt/lxqt/settings.conf

Lines changed: 0 additions & 119 deletions
This file was deleted.

root/defaults/desktop/org.duckstation.DuckStation.desktop

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[Desktop Entry]
22
Type=Application
3+
Categories=Game;Emulator;
34
Name=DuckStation
45
GenericName=PlayStation 1 Emulator
56
Comment=Fast PlayStation 1 emulator
File renamed without changes.

root/defaults/startwm_wayland.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#!/usr/bin/env bash
22

33
# Default files
4-
if [ ! -f "${HOME}"/.config/lxqt/lxqt.conf ]; then
5-
mkdir -p "${HOME}"/.config
6-
cp -r /defaults/config/.config/* "${HOME}"/.config/
7-
fi
84
if [ ! -f "${HOME}"/Desktop/PCSX2.desktop ]; then
95
mkdir -p "${HOME}"/Desktop
106
cp /defaults/desktop/* "${HOME}"/Desktop
@@ -55,4 +51,12 @@ export XCURSOR_SIZE=24
5551
export XKB_DEFAULT_LAYOUT=us
5652
export XKB_DEFAULT_RULES=evdev
5753
export WAYLAND_DISPLAY=wayland-1
58-
labwc > /dev/null 2>&1
54+
if [ "${SELKIES_DESKTOP}" == "true" ]; then
55+
labwc > /dev/null 2>&1 &
56+
sleep 1
57+
export WAYLAND_DISPLAY=wayland-0
58+
export DISPLAY=:0
59+
selkies-desktop
60+
else
61+
labwc > /dev/null 2>&1
62+
fi

root/defaults/wallpaper.jpg

-145 KB
Binary file not shown.

0 commit comments

Comments
 (0)