diff --git a/debian/changelog b/debian/changelog index 4fe5747..61b61d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tileos-settings-sway (1.0.3~tileos) unstable; urgency=medium + + * Do not apply NVIDIA specific variables on PRIME setups + + -- Aleksey Samoilov Tue, 14 Nov 2023 15:22:30 +0400 + tileos-settings-sway (1.0.2~tileos) unstable; urgency=medium * Add portals config diff --git a/usr/bin/start-sway b/usr/bin/start-sway index 7a24f82..882a4a0 100755 --- a/usr/bin/start-sway +++ b/usr/bin/start-sway @@ -9,12 +9,8 @@ export XDG_SESSION_TYPE=wayland case "$(systemd-detect-virt)" in qemu) export WLR_RENDERER=pixman - export WLR_NO_HARDWARE_CURSORS=1 - ;; -kvm) - export WLR_NO_HARDWARE_CURSORS=1 - ;; -oracle) + ;& +qemu|kvm|oracle) export WLR_NO_HARDWARE_CURSORS=1 ;; esac @@ -48,7 +44,7 @@ if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d" ]; then fi # Check if Nvidia driver installed, start Sway and send output to the journal -if [ -d /sys/module/nvidia ]; then +if [ -d /sys/module/nvidia ] && [ ! -d /sys/module/amdgpu ] && [ ! -d /sys/module/i915 ]; then exec systemd-cat -- /usr/bin/sway --unsupported-gpu $@ else exec systemd-cat -- /usr/bin/sway $@