From 2362faa5482ad705a546dbc3df3d00c0c8ee8098 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Fri, 3 Apr 2026 15:02:53 -0400
Subject: [PATCH] make wayland default

---
 Dockerfile                      |  7 ++++++-
 README.md                       |  1 +
 readme-vars.yml                 |  1 +
 root/defaults/autostart         |  2 +-
 root/defaults/autostart_wayland |  2 +-
 root/usr/bin/joplin             | 12 ++++++++++++
 6 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100755 root/usr/bin/joplin

diff --git a/Dockerfile b/Dockerfile
index 608f3fa..f395e7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,9 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 # title
-ENV TITLE=Joplin
+ENV TITLE=Joplin \
+    NO_GAMEPAD=true \
+    PIXELFLUX_WAYLAND=true
 
 RUN \
   echo "**** add icon ****" && \
@@ -28,6 +30,9 @@ RUN \
     "https://github.com/laurent22/joplin/releases/download/${JOPLIN_VERSION}/Joplin-$(echo ${JOPLIN_VERSION}| sed 's/^v//g').deb" && \
   apt-get install -y \
     /tmp/joplin.deb && \
+  mv \
+    /usr/bin/joplin \
+    /usr/bin/joplin-real && \
   echo "**** cleanup ****" && \
   apt-get autoclean && \
   rm -rf \
diff --git a/README.md b/README.md
index cea6ca7..ad4a9ee 100644
--- a/README.md
+++ b/README.md
@@ -612,6 +612,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **03.04.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **21.03.26:** - Use Wayland ozone platform fixes scaling and acceleration.
 * **28.12.25:** - Add Wayland init logic.
 * **19.08.25:** - Initial release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 72554f9..ef370d3 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -106,6 +106,7 @@ init_diagram: |
   "joplin:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "03.04.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "21.03.26:", desc: "Use Wayland ozone platform fixes scaling and acceleration."}
   - {date: "28.12.25:", desc: "Add Wayland init logic."}
   - {date: "19.08.25:", desc: "Initial release."}
diff --git a/root/defaults/autostart b/root/defaults/autostart
index 455a482..21cd9cf 100644
--- a/root/defaults/autostart
+++ b/root/defaults/autostart
@@ -1 +1 @@
-joplin --no-sandbox
+joplin
diff --git a/root/defaults/autostart_wayland b/root/defaults/autostart_wayland
index 19a8c0c..21cd9cf 100644
--- a/root/defaults/autostart_wayland
+++ b/root/defaults/autostart_wayland
@@ -1 +1 @@
-joplin --ozone-platform=wayland --no-sandbox
+joplin
diff --git a/root/usr/bin/joplin b/root/usr/bin/joplin
new file mode 100755
index 0000000..90a6ac8
--- /dev/null
+++ b/root/usr/bin/joplin
@@ -0,0 +1,12 @@
+#! /bin/bash
+
+BIN=/usr/bin/joplin-real
+
+# Wayland check
+if ls -l /dev/dri/* > /dev/null 2>&1; then
+  if pgrep labwc > /dev/null 2>&1; then
+    WAYLAND="--ozone-platform=wayland"
+  fi
+fi
+
+${BIN} ${WAYLAND} --no-sandbox "$@"