From 91f964ca27e2063a2312db48943fc4cadef74c99 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Thu, 19 Jun 2025 11:42:52 -0400
Subject: [PATCH] rebase to selkies

---
 Dockerfile               |  4 +--
 Dockerfile.aarch64       |  4 +--
 README.md                |  1 +
 readme-vars.yml          |  1 +
 root/defaults/autostart  |  1 +
 root/defaults/startwm.sh | 53 ++++++++++++++++++++++++++++++----------
 6 files changed, 47 insertions(+), 17 deletions(-)
 create mode 100755 root/defaults/autostart

diff --git a/Dockerfile b/Dockerfile
index 4733737..fbd0f65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:kali
+FROM ghcr.io/linuxserver/baseimage-selkies:kali
 
 # set version label
 ARG BUILD_DATE
@@ -12,7 +12,7 @@ ENV TITLE="Kali Linux"
 RUN \
   echo "**** add icon ****" && \
   curl -o \
-    /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kali-logo.png && \
   echo "**** install packages ****" && \
   apt-get update && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c74d0d7..9721dea 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-kali
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-kali
 
 # set version label
 ARG BUILD_DATE
@@ -12,7 +12,7 @@ ENV TITLE="Kali Linux"
 RUN \
   echo "**** add icon ****" && \
   curl -o \
-    /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/kali-logo.png && \
   echo "**** install packages ****" && \
   apt-get update && \
diff --git a/README.md b/README.md
index 6cbcde3..026128c 100644
--- a/README.md
+++ b/README.md
@@ -426,5 +426,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.06.25:** - Rebase to Selkies baseimage.
 * **24.01.25:** - Fix SVG icons not rendering.
 * **18.07.24:** - Initial release.
diff --git a/readme-vars.yml b/readme-vars.yml
index 4659f81..df24a58 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -119,5 +119,6 @@ init_diagram: |
   "kali-linux:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "19.06.25:", desc: "Rebase to Selkies baseimage."}
   - {date: "24.01.25:", desc: "Fix SVG icons not rendering."}
   - {date: "18.07.24:", desc: "Initial release."}
diff --git a/root/defaults/autostart b/root/defaults/autostart
new file mode 100755
index 0000000..ca916d0
--- /dev/null
+++ b/root/defaults/autostart
@@ -0,0 +1 @@
+exit 0
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index 2a55693..85eba2e 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,27 +1,54 @@
 #!/bin/bash
 
-# Enable Nvidia GPU support if detected
-if which nvidia-smi; then
-  export LIBGL_KOPPER_DRI2=1
-  export MESA_LOADER_DRIVER_OVERRIDE=zink
-  export GALLIUM_DRIVER=zink
-fi
-
-# Disable compositing and screen lock
+# Disable compositing and screen locking
 if [ ! -f $HOME/.config/kwinrc ]; then
   kwriteconfig6 --file $HOME/.config/kwinrc --group Compositing --key Enabled false
 fi
 if [ ! -f $HOME/.config/kscreenlockerrc ]; then
   kwriteconfig6 --file $HOME/.config/kscreenlockerrc --group Daemon --key Autolock false
 fi
+
+# Power related
 setterm blank 0
 setterm powerdown 0
 
-# Set default bashrc
-if [ ! -f $HOME/.bashlock ]; then
-  sudo cp /root/.bashrc $HOME/.bashrc
-  touch $HOME/.bashlock
+# Direcotries
+sudo rm -f /usr/share/dbus-1/system-services/org.freedesktop.UDisks2.service
+mkdir -p "${HOME}/.config/autostart" "${HOME}/.XDG" "${HOME}/.local/share/"
+chmod 700 "${HOME}/.XDG"
+touch "${HOME}/.local/share/user-places.xbel"
+
+# Background perm loop
+if [ ! -d $HOME/.config/kde.org ]; then
+  (
+    loop_end_time=$((SECONDS + 30))
+    while [ $SECONDS -lt $loop_end_time ]; do
+        find "$HOME/.cache" "$HOME/.config" "$HOME/.local" -type f -perm 000 -exec chmod 644 {} + 2>/dev/null
+        sleep .1
+    done
+  ) &
 fi
 
-# Launch DE
+# Create startup script if it does not exist (keep in sync with openbox)
+STARTUP_FILE="${HOME}/.config/autostart/autostart.desktop"
+if [ ! -f "${STARTUP_FILE}" ]; then
+  echo "[Desktop Entry]" > $STARTUP_FILE
+  echo "Exec=bash /config/.config/openbox/autostart" >> $STARTUP_FILE
+  echo "Icon=dialog-scripts" >> $STARTUP_FILE
+  echo "Name=autostart" >> $STARTUP_FILE
+  echo "Path=" >> $STARTUP_FILE
+  echo "Type=Application" >> $STARTUP_FILE
+  echo "X-KDE-AutostartScript=true" >> $STARTUP_FILE
+  chmod +x $STARTUP_FILE
+fi
+
+# Enable Nvidia GPU support if detected
+if which nvidia-smi && [ "${DISABLE_ZINK}" == "false" ]; then
+  export LIBGL_KOPPER_DRI2=1
+  export MESA_LOADER_DRIVER_OVERRIDE=zink
+  export GALLIUM_DRIVER=zink
+fi
+
+# Stat DE
+unset LD_PRELOAD
 /usr/bin/startplasma-x11 > /dev/null 2>&1