Merge pull request #20 from linuxserver/wayland-default

Wayland default

Author: thelamer

Dockerfile

@@ -12,7 +12,9 @@ LABEL maintainer="thelamer"
 # title
 ENV TITLE=WPS-Office \
     NO_FULL=true \
-    NO_GAMEPAD=true
+    NO_GAMEPAD=true \
+    PIXELFLUX_WAYLAND=true \
+    SELKIES_DESKTOP=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -26,12 +28,6 @@ RUN \
     qt6-base \
     tint2 \
     thunar && \
-  echo "**** install sfwbar ****" && \
-  cd /tmp && \
-  git clone https://aur.archlinux.org/sfwbar.git && \
-  chown -R abc:abc sfwbar && \
-  cd sfwbar && \
-  sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \
   echo "**** install wps-office ****" && \
   cd /tmp && \
   git clone https://aur.archlinux.org/wps-office-cn.git && \
@@ -63,6 +59,19 @@ RUN \
     $(pacman -Qdtq) && \
   rm -rf \
     /tmp/* \
+    /usr/share/applications/avahi-discover.desktop \
+    /usr/share/applications/bssh.desktop \
+    /usr/share/applications/bvnc.desktop \
+    /usr/share/applications/cmake-gui.desktop \
+    /usr/share/applications/footclient.desktop \
+    /usr/share/applications/foot-server.desktop \
+    /usr/share/applications/thunar-bulk-rename.desktop \
+    /usr/share/applications/thunar-settings.desktop \
+    /usr/share/applications/tint2conf.desktop \
+    /usr/share/applications/tint2.desktop \
+    /usr/share/applications/uxterm.desktop \
+    /usr/share/applications/xfce4-about.desktop \
+    /usr/share/applications/xterm.desktop \
     /var/cache/pacman/pkg/* \
     /var/lib/pacman/sync/*
 

README.md

@@ -639,6 +639,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **11.04.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **21.03.26:** - Use Wayland ozone platform for chromium fixes scaling and acceleration.
 * **28.12.25:** - Add Wayland init logic.
 * **10.07.25:** - Rebase to Selkies HTTPS IS NOW REQUIRED, merge chinese and english image.

readme-vars.yml

@@ -100,6 +100,7 @@ init_diagram: |
   "wps-office:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "11.04.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "21.03.26:", desc: "Use Wayland ozone platform for chromium fixes scaling and acceleration."}
   - {date: "28.12.25:", desc: "Add Wayland init logic."}
   - {date: "10.07.25:", desc: "Rebase to Selkies HTTPS IS NOW REQUIRED, merge chinese and english image."}

root/defaults/autostart_wayland

@@ -1,4 +1,11 @@
+#!/bin/bash
+
 # default file copies first run
+if [ ! -f "${HOME}/Desktop/wps-office-prometheus.desktop" ]; then
+  cp /usr/share/applications/wps-office-prometheus.desktop "${HOME}/Desktop/"
+  cp /usr/share/applications/chromium.desktop "${HOME}/Desktop/"
+fi
+
 if [ ! -f $HOME/.config/Kingsoft/Office.conf ]; then
 mkdir -p $HOME/.config/Kingsoft
 echo "[kdcsdk]
@@ -7,7 +14,8 @@ NotFirstOpen=true
 common\\AcceptedEULA=true" > $HOME/.config/Kingsoft/Office.conf
 fi
 
+gio mime x-scheme-handler/http chromium.desktop
+gio mime x-scheme-handler/https chromium.desktop
+gio mime application/x-terminal-emulator foot.desktop
 
-# Start UI
-sfwbar &
-wps
+touch "${HOME}/.config/panel-reload"