From ed28f37c251f44858f8b7c0b453a73c55433bc83 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Apr 2020 13:44:15 +0300 Subject: [PATCH] Move environment vars to sway start script --- config-home.yaml | 3 --- home/.zprofile | 2 +- home/Scripts/sway-run.sh | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100755 home/Scripts/sway-run.sh diff --git a/config-home.yaml b/config-home.yaml index b431b65..0be1820 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -19,9 +19,6 @@ dotfiles: d_mpv: dst: ~/.config/mpv src: .config/mpv - d_environment: - dst: ~/.config/environment.d - src: .config/environment.d f_init.vim: dst: ~/.config/nvim/init.vim src: .config/nvim/init.vim diff --git a/home/.zprofile b/home/.zprofile index 2101c12..dcbf3fe 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +1,5 @@ if cat /proc/cmdline | grep -q "video=eDP-1:d"; then [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && sway > /dev/null 2>&1 + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/Scripts/sway-run.sh > /dev/null 2>&1 fi diff --git a/home/Scripts/sway-run.sh b/home/Scripts/sway-run.sh new file mode 100755 index 0000000..cff3e15 --- /dev/null +++ b/home/Scripts/sway-run.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +# Set environment variables for Sway + +# Firefox +export MOZ_ENABLE_WAYLAND=1 +export MOZ_USE_XINPUT2=1 +export MOZ_WEBRENDER=1 + +# Fix java on wayland +export _JAVA_AWT_WM_NONREPARENTING=1 +export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' + +# Enable qt5 theming and wayland support +export QT_QPA_PLATFORMTHEME=qt5ct +export QT_QPA_PLATFORM=wayland-egl +export QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + +# Fix redshift on wlroots +export WLR_DRM_NO_ATOMIC=1 + +# Use wayland in SDL2 +export SDL_VIDEODRIVER=wayland + +# Run sway +sway + +# Unset the variables after quitting Sway +unset MOZ_ENABLE_WAYLAND=1 +unset MOZ_USE_XINPUT2=1 +unset MOZ_WEBRENDER=1 +unset _JAVA_AWT_WM_NONREPARENTING=1 +unset _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' +unset QT_QPA_PLATFORMTHEME=qt5ct +unset QT_QPA_PLATFORM=wayland-egl +unset QT_WAYLAND_DISABLE_WINDOWDECORATION=1 +unset WLR_DRM_NO_ATOMIC=1 +unset SDL_VIDEODRIVER=wayland