From d7051ae7c0205fcf0bfd6705c5ae253b7757b185 Mon Sep 17 00:00:00 2001 From: thelamer Date: Tue, 6 Aug 2024 17:04:43 -0400 Subject: [PATCH] refresh alpine-kde --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- root/defaults/startwm.sh | 22 ++++++++++++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d8cbfac1..b49200bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:3.20 +FROM ghcr.io/linuxserver/baseimage-rdesktop:alpine320 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5cb3a8f4..0630b8fe 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-rdesktop:arm64v8-alpine320 # set version label ARG BUILD_DATE diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh index 6957f66a..417e5b5c 100755 --- a/root/defaults/startwm.sh +++ b/root/defaults/startwm.sh @@ -1,11 +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 + 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