config.yaml

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

dotfiles/config/sway/config

@@ -281,4 +281,4 @@ bar {
 include /etc/sway/config.d/*
 
 # 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"

dotfiles/pam_environment

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

dotfiles/zshrc

@@ -32,20 +32,17 @@ if [[ "$OSTYPE" =~ ^linux.*$ ]]; then
     #  $ npm install -g bower grunt grunt-cli
     PATH=$PATH:~/.node_modules/bin
 
-    {%@@ 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 @@%}
+    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
 fi
 
 # Enable asdf version manager zsh completions