diff --git a/modules/graphical/sway/swayidle.service.nix b/modules/graphical/sway/swayidle.service.nix
index 88052a9a..de984e7d 100644
--- a/modules/graphical/sway/swayidle.service.nix
+++ b/modules/graphical/sway/swayidle.service.nix
@@ -12,13 +12,12 @@
   };
   Service = {
     Type = "simple";
-    Environment = "PATH=/run/current-system/sw/bin:${pkgs.sway}/bin:${pkgs.swaylock-bg}/bin:${pkgs.swayidle}/bin";
     ExecStart = ''
-      swayidle -w \
-      after-resume 'swaymsg "output * dpms on"' \
-      before-sleep 'swaylock-bg' \
-      timeout 300 'swaylock-bg' \
-      timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"'
+      ${pkgs.swayidle}/bin/swayidle -w \
+      timeout 300 '${pkgs.swaylock-bg}/bin/swaylock-bg' \
+      timeout 600 '${pkgs.sway}/bin/swaymsg "output * dpms off"' \
+        resume '${pkgs.sway}/bin/swaymsg "output * dpms on"' \
+      before-sleep '${pkgs.swaylock-bg}/bin/swaylock-bg'
     '';
   };
   Install = {
diff --git a/pkgs/swaylock-bg.nix b/pkgs/swaylock-bg.nix
index 78a96813..96df6a42 100644
--- a/pkgs/swaylock-bg.nix
+++ b/pkgs/swaylock-bg.nix
@@ -16,5 +16,5 @@ with self; ''
   do
       LOCKARGS="''${LOCKARGS} --image ''${OUTPUT}:''${IMAGE}"
   done
-  exec ${swaylock}/bin/swaylock $LOCKARGS
+  exec ${swaylock}/bin/swaylock --daemonize $LOCKARGS
 ''