From 0d7176792b6ceed2ade337278f54e1112cdc957e Mon Sep 17 00:00:00 2001
From: Mihai Fufezan <fufexan@protonmail.com>
Date: Wed, 2 Nov 2022 21:36:07 +0200
Subject: [PATCH] Nix HM: prevent race condition between dbus and systemd

Fixes #940
---
 nix/hm-module.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nix/hm-module.nix b/nix/hm-module.nix
index 6809e012..7b2af275 100644
--- a/nix/hm-module.nix
+++ b/nix/hm-module.nix
@@ -102,8 +102,9 @@ in {
     xdg.configFile."hypr/hyprland.conf" = {
       text =
         (lib.optionalString cfg.systemdIntegration ''
-          exec-once=${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP
-          exec-once=systemctl --user start hyprland-session.target
+          exec-once=${pkgs.dbus}/bin/dbus-update-activation-environment --systemd \
+            DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && \
+            systemctl --user start hyprland-session.target
         '')
         + cfg.extraConfig;