From 1ce65f521466a488b959059883e4df365cfb4929 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Tue, 6 Aug 2024 18:22:58 -0400
Subject: [PATCH] refresh fedora-kde

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

diff --git a/Dockerfile b/Dockerfile
index e06650b1..50aba3a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora-40
+FROM ghcr.io/linuxserver/baseimage-rdesktop:fedora40
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 13c8f973..c5378e86 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora-40
+FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-fedora40
 
 # set version label
 ARG BUILD_DATE
diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index b0c64b90..417e5b5c 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,14 +1,29 @@
 #!/bin/bash
+
+# Combine env
+/usr/bin/with-contenv /usr/bin/env | sed 's/^/export /g' > /defaults/env.sh
+source /defaults/env.sh
+rm /defaults/env.sh
+
+# 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
+
+# Start Pulseaudio
 /startpulse.sh &
+
+# Disable compositing
 if [ ! -f $HOME/.config/kwinrc ]; then
-  kwriteconfig5 --file $HOME/.config/kwinrc --group Compositing --key Enabled false
+  kwriteconfig6 --file $HOME/.config/kwinrc --group Compositing --key Enabled false
 fi
 if [ ! -f $HOME/.config/kscreenlockerrc ]; then
-  kwriteconfig5 --file $HOME/.config/kscreenlockerrc --group Daemon --key Autolock false
-fi
-if [ ! -f $HOME/.config/kdeglobals ]; then
-  kwriteconfig5 --file $HOME/.config/kdeglobals --group KDE --key LookAndFeelPackage org.fedoraproject.fedora.desktop
+  kwriteconfig6 --file $HOME/.config/kscreenlockerrc --group Daemon --key Autolock false
 fi
 setterm blank 0
 setterm powerdown 0
+
+# Launch DE
 /usr/bin/startplasma-x11 > /dev/null 2>&1