From a2d94d19cf95aec0b9d458827af731be12939c3a Mon Sep 17 00:00:00 2001
From: Christopher Schnick <crschnick@xpipe.io>
Date: Sun, 20 Apr 2025 18:50:07 +0200
Subject: [PATCH] Fixes [stage]

---
 Dockerfile               | 23 +++++++++++++++++++----
 root/defaults/startwm.sh |  8 ++++++++
 version-ptb              |  2 +-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c222125..6f12688 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,6 +27,8 @@ RUN  echo "**** install base packages ****" && \
     kwrite \
     wget \
     git \
+    zip \
+    unzip \
     plasma-desktop \
     plasma-workspace \
     plymouth-theme-kubuntu-logo \
@@ -43,6 +45,13 @@ RUN  echo "**** install base packages ****" && \
    /var/tmp/* \
    /tmp/*
 
+RUN echo "**** nerdfonts ****" && \
+  curl -LO "https://github.com/ryanoasis/nerd-fonts/releases/latest/download/UbuntuMono.zip" && \
+  mkdir -p "/usr/share/fonts/ubuntu-mono-nerd" && \
+  unzip "UbuntuMono.zip" -d "/usr/share/fonts/ubuntu-mono-nerd" && \
+  rm "UbuntuMono.zip" && \
+  fc-cache -fv
+
 # add local files
 COPY /root /
 
@@ -80,6 +89,8 @@ RUN  echo "**** install tool packages ****" && \
     terminator \
     freerdp2-x11 \
     remmina \
+    tmux \
+    screen \
     remmina-plugin-rdp && \
  apt-get autoclean
 
@@ -108,12 +119,16 @@ RUN echo "**** XPipe **** ($TARGETPLATFORM)" && \
   apt-get install --no-install-recommends -y "./${XPIPE_ARTIFACT}" && \
   rm "./${XPIPE_ARTIFACT}"
 
+RUN echo "**** zellij **** ($TARGETPLATFORM)" && \
+  if [ "$TARGETPLATFORM" = "linux/amd64" ]; then ZELLIJ_LINK="https://github.com/zellij-org/zellij/releases/latest/download/zellij-x86_64-unknown-linux-musl.tar.gz"; else ZELLIJ_LINK="https://github.com/zellij-org/zellij/releases/latest/download/zellij-aarch64-unknown-linux-musl.tar.gz "; fi && \
+  curl -LO "${ZELLIJ_LINK}" && \
+  tar -xvf zellij*.tar.gz && \
+  sudo install -o root -g root -m 0755 zellij /usr/local/bin/zellij && \
+  rm zellij && \
+  rm zellij*.tar.gz
+
 RUN mkdir -p "/etc/xdg/autostart/" && ln -s "/usr/share/applications/$XPIPE_PACKAGE.desktop" "/etc/xdg/autostart/$XPIPE_PACKAGE.desktop"
 
-RUN echo "**** kwallet tweaks ****" && mkdir -p /config/.config && printf "[Wallet]\nEnabled=false\n" > /config/.config/kwalletrc
-
-RUN echo "**** konsole tweaks ****" && mkdir -p /config/.config && printf "\n\n[KonsoleWindow]\nUseSingleInstance=true\n\n[Notification Messages]\nCloseAllTabs=true\n" >> /config/.config/konsolerc
-
 RUN echo "**** kde tweaks ****" && \
   sed -i \
     "s/applications:org.kde.discover.desktop,/,/g" \
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index 17c2d89..5b3ac3b 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -17,5 +17,13 @@ fi
 setterm blank 0
 setterm powerdown 0
 
+if [ ! -f "$HOME/.config/konsolerc" ]; then
+  printf "[General]\nConfigVersion=1\n\n[KonsoleWindow]\nUseSingleInstance=true\n\n[Notification Messages]\nCloseAllTabs=true\nCloseSingleTab=true\n" > "$HOME/.config/konsolerc"
+fi
+
+if [ ! -f "$HOME/.config/kwalletrc" ]; then
+  printf "[Wallet]\nEnabled=false\n" > "$HOME/.config/kwalletrc"
+fi
+
 # Launch DE
 /usr/bin/dbus-launch /usr/bin/startplasma-x11 > /dev/null 2>&1
diff --git a/version-ptb b/version-ptb
index 4db6d3c..81bef31 100644
--- a/version-ptb
+++ b/version-ptb
@@ -1 +1 @@
-15.1-2
\ No newline at end of file
+16.0-50
\ No newline at end of file