diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 90f166e..2a34385 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -32,17 +32,20 @@ if [[ "$OSTYPE" =~ ^linux.*$ ]]; then # $ npm install -g bower grunt grunt-cli PATH=$PATH:~/.node_modules/bin - if [[ -n $WAYLAND_DISPLAY ]]; then - export MOZ_ENABLE_WAYLAND=1 - # 2021-06-22: fix "Firefox is already running" message - # See: https://mastransky.wordpress.com/2020/03/16/wayland-x11-how-to-run-firefox-in-mixed-environment/ - export MOZ_DBUS_REMOTE=1 - export QT_QPA_PLATFORM=wayland-egl - export CLUTTER_BACKEND=wayland - # 2020-02-10: https://github.com/swaywm/sway/wiki#issues-with-java-applications - export _JAVA_AWT_WM_NONREPARENTING=1 - export SDL_VIDEODRIVER=wayland - fi + {%@@ if profile == "knafeh" or profile == "balozi" @@%} + # Export these variables in our TTY so that Sway can read them when it + # starts. It's not pretty, but it's all we can do since support for + # ~/.pam_environment was removed from pambase in Arch Linux recently. + export MOZ_ENABLE_WAYLAND=1 + # 2021-06-22: fix "Firefox is already running" message + # See: https://mastransky.wordpress.com/2020/03/16/wayland-x11-how-to-run-firefox-in-mixed-environment/ + export MOZ_DBUS_REMOTE=1 + export QT_QPA_PLATFORM=wayland-egl + export CLUTTER_BACKEND=wayland + # 2020-02-10: https://github.com/swaywm/sway/wiki#issues-with-java-applications + export _JAVA_AWT_WM_NONREPARENTING=1 + export SDL_VIDEODRIVER=wayland + {%@@ endif @@%} fi # Enable asdf version manager zsh completions