Merge pull request #20 from linuxserver/wayland-default

Wayland default

Author: thelamer

Dockerfile

@@ -11,7 +11,10 @@ LABEL maintainer="thelamer"
 
 # title
 ENV TITLE=LibreOffice \
-    NO_GAMEPAD=true
+    NO_GAMEPAD=true \
+    PIXELFLUX_WAYLAND=true \
+    SELKIES_DESKTOP=true \
+    NO_FULL=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -46,7 +49,17 @@ RUN \
     /usr/bin/thunar-real && \
   echo "**** cleanup ****" && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /usr/share/applications/footclient.desktop \
+    /usr/share/applications/foot-server.desktop \
+    /usr/share/applications/st.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
 
 # add local files
 COPY /root /

Dockerfile.aarch64

@@ -11,7 +11,10 @@ LABEL maintainer="thelamer"
 
 # title
 ENV TITLE=LibreOffice \
-    NO_GAMEPAD=true
+    NO_GAMEPAD=true \
+    PIXELFLUX_WAYLAND=true \
+    SELKIES_DESKTOP=true \
+    NO_FULL=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -46,7 +49,17 @@ RUN \
     /usr/bin/thunar-real && \
   echo "**** cleanup ****" && \
   rm -rf \
-    /tmp/*
+    /tmp/* \
+    /usr/share/applications/footclient.desktop \
+    /usr/share/applications/foot-server.desktop \
+    /usr/share/applications/st.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
 
 # add local files
 COPY /root /

README.md

@@ -576,6 +576,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **28.12.25:** - Add Wayland init logic, rebase to Alpine 3.23.
 * **12.07.25:** - Rebase to Selkies, Alpine 3.22, HTTPS IS NOW REQUIRED.
 * **06.12.24:** - Rebase to Alpine 3.21.

readme-vars.yml

@@ -102,6 +102,7 @@ init_diagram: |
   "libreoffice:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "29.03.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "28.12.25:", desc: "Add Wayland init logic, rebase to Alpine 3.23."}
   - {date: "12.07.25:", desc: "Rebase to Selkies, Alpine 3.22, HTTPS IS NOW REQUIRED."}
   - {date: "06.12.24:", desc: "Rebase to Alpine 3.21."}

root/defaults/autostart_wayland

@@ -1,3 +1,8 @@
 #!/bin/bash
 
-libreoffice
+if [ ! -f "${HOME}/Desktop/libreoffice-writer.desktop" ]; then
+  cp /usr/share/applications/libreoffice-*.desktop "${HOME}/Desktop/"
+  rm -f "${HOME}/Desktop/libreoffice-xsltfilter.desktop"
+fi
+
+touch "${HOME}/.config/panel-reload"