Refresh turnstile env after Wayland startup

ansible/inventory/group_vars/desktop.yml

@@ -5,7 +5,7 @@ desktop_sessions_enabled:
   - sway
   - hyprland
 
-desktop_default_session: sway
+desktop_default_session: hyprland
 desktop_default_session_env: wayland
 desktop_prompt_for_session: true
 
@@ -225,10 +225,6 @@ desktop_hyprland_dotfiles:
     src: .config/dunst/
     dest: .config/dunst/
     mode: preserve
-  - name: flameshot config
-    src: .config/flameshot/
-    dest: .config/flameshot/
-    mode: preserve
   - name: rofi config
     src: .config/rofi/
     dest: .config/rofi/

ansible/inventory/group_vars/void.yml

@@ -189,7 +189,9 @@ desktop_hyprland_packages:
   - hyprland
   - hyprland-guiutils
   - hyprlock
+  - hyprpolkitagent
   - hyprpaper
+  - hyprsysteminfo
   - rofi
   - slurp
   - SwayOSD

ansible/inventory/host_vars/ikaros.yml

@@ -5,7 +5,7 @@ desktop_sessions_enabled:
   - sway
   - hyprland
 
-desktop_default_session: sway
+desktop_default_session: hyprland
 desktop_default_session_env: wayland
 
 host_packages:

ansible/inventory/host_vars/nymph.yml

@@ -5,7 +5,7 @@ desktop_sessions_enabled:
   - sway
   - hyprland
 
-desktop_default_session: sway
+desktop_default_session: hyprland
 desktop_default_session_env: wayland
 desktop_emptty_session_error_logging: rotate
 

dotfiles/desktop/.config/hypr/hyprland.conf

@@ -90,6 +90,7 @@ windowrule = idle_inhibit focus, match:content 2
 
 # 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 = env UPDATE_TURNSTILE_RESTART_EMACS=1 ~/.local/bin/update-turnstile-env
 exec-once = dex --autostart --environment Hyprland
 exec-once = gnome-keyring-daemon --start --components=secrets
 exec-once = ~/.local/bin/setup-gtk-theme
@@ -108,7 +109,7 @@ exec-once = hyprpaper
 exec-once = waybar -c ~/.config/waybar/hyprland.jsonc -s ~/.config/waybar/hyprland-style.css
 exec-once = swayosd-server
 exec-once = dunst
-exec-once = /usr/libexec/xfce-polkit
+exec-once = hyprpolkitagent
 exec-once = nm-applet
 exec-once = blueman-applet
 exec-once = udiskie

dotfiles/desktop/.config/sway/config

@@ -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
 # 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 env UPDATE_TURNSTILE_RESTART_EMACS=1 ~/.local/bin/update-turnstile-env
 exec dex --autostart --environment sway
 exec gnome-keyring-daemon --start --components=secrets
 exec_always ~/.config/sway/scripts/setup-gtk-theme.sh

dotfiles/desktop/.local/bin/update-turnstile-env

@@ -10,6 +10,11 @@ vars="DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS SSH_AUTH_SOCK XDG_CURRENT_DESK
 
 [ -n "${WAYLAND_DISPLAY:-}" ]             && vars="$vars WAYLAND_DISPLAY"
 [ -n "${SWAYSOCK:-}" ]                    && vars="$vars SWAYSOCK"
+[ -n "${HYPRLAND_INSTANCE_SIGNATURE:-}" ] && vars="$vars HYPRLAND_INSTANCE_SIGNATURE"
 
 # shellcheck disable=SC2086
 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