mirror of
https://github.com/fscotto/infra.git
synced 2026-07-29 16:20:01 +00:00
Refresh turnstile env after Wayland startup
This commit is contained in:
@@ -90,6 +90,7 @@ windowrule = idle_inhibit focus, match:content 2
|
|||||||
|
|
||||||
# Autostart — XDG and session services
|
# Autostart — XDG and session services
|
||||||
exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP
|
exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP
|
||||||
|
exec-once = env UPDATE_TURNSTILE_RESTART_EMACS=1 ~/.local/bin/update-turnstile-env
|
||||||
exec-once = dex --autostart --environment Hyprland
|
exec-once = dex --autostart --environment Hyprland
|
||||||
exec-once = gnome-keyring-daemon --start --components=secrets
|
exec-once = gnome-keyring-daemon --start --components=secrets
|
||||||
exec-once = ~/.local/bin/setup-gtk-theme
|
exec-once = ~/.local/bin/setup-gtk-theme
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ for_window [app_id="org.freedesktop.impl.portal.desktop.gtk"] floating enable
|
|||||||
# Propagate Wayland env to dbus so xdg-desktop-portal backends inherit
|
# Propagate Wayland env to dbus so xdg-desktop-portal backends inherit
|
||||||
# WAYLAND_DISPLAY/SWAYSOCK when dbus-activated (otherwise they crash).
|
# WAYLAND_DISPLAY/SWAYSOCK when dbus-activated (otherwise they crash).
|
||||||
exec dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP
|
exec dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP XDG_SESSION_TYPE XDG_SESSION_DESKTOP
|
||||||
|
exec env UPDATE_TURNSTILE_RESTART_EMACS=1 ~/.local/bin/update-turnstile-env
|
||||||
exec dex --autostart --environment sway
|
exec dex --autostart --environment sway
|
||||||
exec gnome-keyring-daemon --start --components=secrets
|
exec gnome-keyring-daemon --start --components=secrets
|
||||||
exec_always ~/.config/sway/scripts/setup-gtk-theme.sh
|
exec_always ~/.config/sway/scripts/setup-gtk-theme.sh
|
||||||
|
|||||||
@@ -8,8 +8,13 @@ fi
|
|||||||
|
|
||||||
vars="DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS SSH_AUTH_SOCK XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE"
|
vars="DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS SSH_AUTH_SOCK XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE"
|
||||||
|
|
||||||
[ -n "${WAYLAND_DISPLAY:-}" ] && vars="$vars WAYLAND_DISPLAY"
|
[ -n "${WAYLAND_DISPLAY:-}" ] && vars="$vars WAYLAND_DISPLAY"
|
||||||
[ -n "${SWAYSOCK:-}" ] && vars="$vars SWAYSOCK"
|
[ -n "${SWAYSOCK:-}" ] && vars="$vars SWAYSOCK"
|
||||||
|
[ -n "${HYPRLAND_INSTANCE_SIGNATURE:-}" ] && vars="$vars HYPRLAND_INSTANCE_SIGNATURE"
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
turnstile-update-runit-env $vars >/dev/null 2>&1 || true
|
turnstile-update-runit-env $vars >/dev/null 2>&1 || true
|
||||||
|
|
||||||
|
if [ "${UPDATE_TURNSTILE_RESTART_EMACS:-0}" = "1" ] && command -v sv >/dev/null 2>&1; then
|
||||||
|
sv restart "$HOME/.config/service/emacs" >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user