From 239ad43c2848c557e55616ff714fcbd49dcf379c Mon Sep 17 00:00:00 2001
From: Ryan Kuba <ryankuba@gmail.com>
Date: Thu, 23 May 2024 15:13:52 +0000
Subject: [PATCH] rebase alpine kde to 3.20 (#249)

---
 Dockerfile               | 5 ++---
 Dockerfile.aarch64       | 5 ++---
 root/defaults/startwm.sh | 3 +++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3caeeb95..291afdc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine319
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine320
 
 # set version label
 ARG BUILD_DATE
@@ -22,10 +22,9 @@ RUN \
     kwrite \
     breeze \
     breeze-gtk \
-    breeze-icons5 \
+    breeze-icons \
     firefox \
     kde-gtk-config \
-    khotkeys \
     kmenuedit \
     plasma-browser-integration \
     plasma-desktop \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0d93e81e..1d25b4fe 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine319
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine320
 
 # set version label
 ARG BUILD_DATE
@@ -22,10 +22,9 @@ RUN \
     kwrite \
     breeze \
     breeze-gtk \
-    breeze-icons5 \
+    breeze-icons \
     firefox \
     kde-gtk-config \
-    khotkeys \
     kmenuedit \
     plasma-browser-integration \
     plasma-desktop \
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index 8f3b006b..49f09477 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# Disable compositing and screen locking
 if [ ! -f $HOME/.config/kwinrc ]; then
   kwriteconfig5 --file $HOME/.config/kwinrc --group Compositing --key Enabled false
 fi
@@ -8,4 +9,6 @@ if [ ! -f $HOME/.config/kscreenlockerrc ]; then
 fi
 setterm blank 0
 setterm powerdown 0
+
+# Start DE
 /usr/bin/startplasma-x11 > /dev/null 2>&1