Improve environment variables export

This commit is contained in:
Aleksey Samoilov 2023-08-17 17:05:53 +04:00
parent e24b0a545f
commit 4b17935119
4 changed files with 33 additions and 24 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
tileos-settings-sway (0.41~tileos) unstable; urgency=medium
* Improve environment variables export
-- Aleksey Samoilov <samoilov.lex@gmail.com> Thu, 17 Aug 2023 17:04:56 +0400
tileos-settings-sway (0.40~tileos) unstable; urgency=medium
* Fix xdg-user-dirs autostart

View file

@ -0,0 +1,17 @@
# Force Wayland for Mozilla Firefox
MOZ_ENABLE_WAYLAND=1
MOZ_DBUS_REMOTE=1
# Force Wayland for Qt apps
QT_QPA_PLATFORM="wayland;xcb"
QT_QPA_PLATFORMTHEME=qt5ct
# Set default cursor size
XCURSOR_SIZE=24
# Force Wayland for EFL (Enlightenment) apps
ECORE_EVAS_ENGINE="wayland-egl"
ELM_ACCEL="gl"
# Java XWayland blank screens fix
_JAVA_AWT_WM_NONREPARENTING=1

View file

@ -1,18 +0,0 @@
# This file is a part of TileOS configuration for Sway and will be sourced
# from /usr/bin/start-sway script for all users of the system.
# User-specific variables should be placed in $XDG_CONFIG_HOME/sway/environment
# Force Wayland for Mozilla Firefox
export MOZ_ENABLE_WAYLAND=1
export MOZ_DBUS_REMOTE=1
# Force Wayland for Qt apps
export QT_QPA_PLATFORM="wayland;xcb"
export QT_QPA_PLATFORMTHEME=qt5ct
# Force Wayland for EFL (Enlightenment) apps
export ECORE_EVAS_ENGINE="wayland-egl"
export ELM_ACCEL="gl"
# Java XWayland blank screens fix
export _JAVA_AWT_WM_NONREPARENTING=1

View file

@ -28,18 +28,22 @@ if [ -d /sys/module/nvidia ]; then
fi
## Load system environment customizations
if [ -f /etc/sway/environment ]; then
if [ -d /etc/environment.d ]; then
set -o allexport
for f in /etc/environment.d/*.conf; do
# shellcheck source=/dev/null
. /etc/sway/environment
. "$f"
done
set +o allexport
fi
## Load user environment customizations
if [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/sway/environment" ]; then
if [ -d "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d" ]; then
set -o allexport
for i in "${XDG_CONFIG_HOME:-$HOME/.config}/environment.d"/*.conf; do
# shellcheck source=/dev/null
. "${XDG_CONFIG_HOME:-$HOME/.config}/sway/environment"
. "$i"
done
set +o allexport
fi