Compare commits

..

No commits in common. "79cf112ad4f93e8b061a3713e4326b3636af27d3" and "8b23f5748e5f8c652a08f8ca2b2f462a427a88b0" have entirely different histories.

4 changed files with 20 additions and 15 deletions

View File

@ -48,6 +48,9 @@ dotfiles:
f_psqlrc: f_psqlrc:
src: psqlrc src: psqlrc
dst: ~/.psqlrc dst: ~/.psqlrc
f_pam_environment:
src: pam_environment
dst: ~/.pam_environment
f_bashrc: f_bashrc:
src: bashrc src: bashrc
dst: ~/.bashrc dst: ~/.bashrc
@ -90,6 +93,7 @@ profiles:
- f_wob.socket - f_wob.socket
- f_sway-session.target - f_sway-session.target
- f_psqlrc - f_psqlrc
- f_pam_environment
- f_xdg_desktop_portal_wlr_config - f_xdg_desktop_portal_wlr_config
- d_local_bin - d_local_bin
- f_ssh-agent.service - f_ssh-agent.service
@ -110,6 +114,7 @@ profiles:
- f_wob.socket - f_wob.socket
- f_sway-session.target - f_sway-session.target
- f_psqlrc - f_psqlrc
- f_pam_environment
- f_xdg_desktop_portal_wlr_config - f_xdg_desktop_portal_wlr_config
- f_geoclue-agent.service - f_geoclue-agent.service
- d_local_bin - d_local_bin

View File

@ -281,4 +281,4 @@ bar {
include /etc/sway/config.d/* include /etc/sway/config.d/*
# Start sway-session.target, to which kanshi.service and swayidle.service bind. # Start sway-session.target, to which kanshi.service and swayidle.service bind.
exec_always "systemctl --user start sway-session.target" exec_always "systemctl --user import-environment; systemctl --user start sway-session.target"

3
dotfiles/pam_environment Normal file
View File

@ -0,0 +1,3 @@
MOZ_ENABLE_WAYLAND=1
QT_QPA_PLATFORM=wayland-egl
XDG_CURRENT_DESKTOP=sway

View File

@ -32,10 +32,7 @@ if [[ "$OSTYPE" =~ ^linux.*$ ]]; then
# $ npm install -g bower grunt grunt-cli # $ npm install -g bower grunt grunt-cli
PATH=$PATH:~/.node_modules/bin PATH=$PATH:~/.node_modules/bin
{%@@ if profile == "knafeh" or profile == "balozi" @@%} if [[ -n $WAYLAND_DISPLAY ]]; then
# 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 export MOZ_ENABLE_WAYLAND=1
# 2021-06-22: fix "Firefox is already running" message # 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/ # See: https://mastransky.wordpress.com/2020/03/16/wayland-x11-how-to-run-firefox-in-mixed-environment/
@ -45,7 +42,7 @@ if [[ "$OSTYPE" =~ ^linux.*$ ]]; then
# 2020-02-10: https://github.com/swaywm/sway/wiki#issues-with-java-applications # 2020-02-10: https://github.com/swaywm/sway/wiki#issues-with-java-applications
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland
{%@@ endif @@%} fi
fi fi
# Enable asdf version manager zsh completions # Enable asdf version manager zsh completions