diff --git a/users/leah/presets/niri/swaync/default.nix b/users/leah/presets/niri/swaync/default.nix
index 98e6ee2..d1bb5d8 100644
--- a/users/leah/presets/niri/swaync/default.nix
+++ b/users/leah/presets/niri/swaync/default.nix
@@ -5,7 +5,7 @@
 {
   hjem.users.leah = {
     packages = [ pkgs.swaynotificationcenter ];
-    systemd.targets.graphical-session-pre.wants = [ "swaync.service" ];
+    systemd.targets.graphical-session.wants = [ "swaync.service" ];
 
     xdg.config.files = {
       "swaync/style.css".source = ./style.css;
diff --git a/users/leah/presets/niri/waybar/default.nix b/users/leah/presets/niri/waybar/default.nix
index e3bc466..db19474 100644
--- a/users/leah/presets/niri/waybar/default.nix
+++ b/users/leah/presets/niri/waybar/default.nix
@@ -5,15 +5,16 @@
 let
   jsonFormat = pkgs.formats.json { };
   config = import ./config.nix args;
+  configFile = jsonFormat.generate "waybar-config.jsonc" config;
 in
 {
   hjem.users.leah = {
     packages = [ pkgs.waybar ];
-    systemd.targets.graphical-session-pre.wants = [ "waybar.service" ];
+    systemd.targets.graphical-session.wants = [ "waybar.service" ];
 
     xdg.config.files = {
       "waybar/style.css".source = ./style.css;
-      "waybar/config.jsonc".source = jsonFormat.generate "waybar-config.jsonc" config;
+      "waybar/config.jsonc".source = configFile;
     };
   };
 }