[neon/snap-packaging/plasma-core-desktop] /: Force the wayland mode for SDDM

[Kevin Ottens]

Git commit ec02f4648798213de0429e96a24ed0bf00ed884c by Kevin Ottens.
Committed on 07/06/2024 at 07:57.
Pushed by ervin into branch 'master'.

Force the wayland mode for SDDM

M  +8    -1    hooks/006-add-gdm.chroot
M  +5    -0    static/usr/libexec/start-sddm.sh

https://invent.kde.org/neon/snap-packaging/plasma-core-desktop/-/commit/ec02f4648798213de0429e96a24ed0bf00ed884c

diff --git a/hooks/006-add-gdm.chroot b/hooks/006-add-gdm.chroot
index 77dcced..8dc7cce 100755
--- a/hooks/006-add-gdm.chroot
+++ b/hooks/006-add-gdm.chroot
@@ -81,7 +81,14 @@ sed -i 's/^ExecStart=\/usr\/bin\/sddm/ExecStart=\/usr\/libexec\/start-sddm.sh/'
 
 # Move SDDM config to writable directory
 mkdir -p /etc/writable/sddm
-touch /etc/writable/sddm/sddm.conf
+cat >/etc/writable/sddm/sddm.conf<<EOF
+[General]
+DisplayServer=wayland
+GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
+
+[Wayland]
+CompositorCommand=kwin_wayland --no-lockscreen --no-global-shortcuts --locale1
+EOF
 ln -s writable/sddm/sddm.conf /etc/sddm.conf
 
 
diff --git a/static/usr/libexec/start-sddm.sh b/static/usr/libexec/start-sddm.sh
index a415f69..4a9763a 100755
--- a/static/usr/libexec/start-sddm.sh
+++ b/static/usr/libexec/start-sddm.sh
@@ -20,7 +20,12 @@ user_count=`grep '/home/' /var/lib/extrausers/passwd | wc -l`
 if [ $user_count -lt 1 ] ; then
     mv $SDDM_CONF $SDDM_CONF.orig
     cat >$SDDM_CONF<<EOF
+[General]
+DisplayServer=wayland
+GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
+
 [Wayland]
+CompositorCommand=kwin_wayland --no-lockscreen --no-global-shortcuts --locale1
 SessionDir=/usr/share/wayland-sessions-bootstrap
 
 [Autologin]