From 13078bbc8271b716f55fa9040858a695df49a494 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 29 Mar 2026 18:38:43 -0400 Subject: [PATCH 1/2] make wayland default --- Dockerfile | 5 ++++- Dockerfile.aarch64 | 5 ++++- README.md | 1 + readme-vars.yml | 1 + root/defaults/autostart_wayland | 7 ++++++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1304587..4ee7046 100644 --- a/Dockerfile +++ b/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 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5837d0d..3dd0f2d 100644 --- a/Dockerfile.aarch64 +++ b/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 ****" && \ diff --git a/README.md b/README.md index 1202c99..d9c6a8d 100644 --- a/README.md +++ b/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. diff --git a/readme-vars.yml b/readme-vars.yml index 20c0b3d..568e951 100644 --- a/readme-vars.yml +++ b/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."} diff --git a/root/defaults/autostart_wayland b/root/defaults/autostart_wayland index 99de526..2d2a7dc 100644 --- a/root/defaults/autostart_wayland +++ b/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" From f124166c950b3b33382b93b5e4f808588706bec5 Mon Sep 17 00:00:00 2001 From: thelamer Date: Mon, 30 Mar 2026 13:31:23 -0400 Subject: [PATCH 2/2] clean up start menu a bit more --- Dockerfile | 12 +++++++++++- Dockerfile.aarch64 | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ee7046..e53cbdb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,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 / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3dd0f2d..5a3b8c1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -49,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 /