diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh
index ba03ff3c..013333c0 100755
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@@ -1,5 +1,13 @@
 #!/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
 setterm blank 0
 setterm powerdown 0
 if [ ! -f "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]; then
@@ -14,4 +22,5 @@ cat <<EOT >> "${HOME}"/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
 EOT
 fi
 
+# Launch DE
 /usr/bin/xfce4-session > /dev/null 2>&1