diff --git a/home/modules/linux/graphical/wayland.nix b/home/modules/linux/graphical/wayland.nix
index 785e0f6..26776b8 100644
--- a/home/modules/linux/graphical/wayland.nix
+++ b/home/modules/linux/graphical/wayland.nix
@@ -107,6 +107,7 @@ with lib;
       latitude = "46.31";
       longitude = "6.38";
     };
+    systemd.user.services.wlsunset.Unit.After = "graphical-session.target";
 
 
     # Notification system
diff --git a/home/modules/programs/my-niri.nix b/home/modules/programs/my-niri.nix
index ea8f0e5..2149419 100644
--- a/home/modules/programs/my-niri.nix
+++ b/home/modules/programs/my-niri.nix
@@ -86,6 +86,8 @@ in
       Service.Slice = "session.slice";
       Service.Type = "notify";
       Service.ExecStart = "${lib.getExe pkgs.xwayland-satellite} ${xwayland-display}";
+      Service.ExecStartPost = [ "systemctl --user set-environment DISPLAY=${xwayland-display}" ];
+      Service.ExecStopPre = [ "systemctl --user unset-environment" ];
     };
 
     programs.niri.settings = {