diff --git a/programs/sway/default.nix b/programs/sway/default.nix
index 8a0b6a3..38eabed 100644
--- a/programs/sway/default.nix
+++ b/programs/sway/default.nix
@@ -11,6 +11,7 @@
     ./avizo/default.nix
     ./rofi/default.nix
     ./swaylock/default.nix
+    ./swayidle/default.nix
     ./swaync/default.nix
     ./waybar/default.nix
     ./wlogout/default.nix
@@ -157,7 +158,7 @@
           "XF86MonBrightnessDown" = "exec ${services.avizo.package}/bin/lightctl - 5";
 
           # System utilities
-          "${modifier}+F1" = "exec ${programs.swaylock.package}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse";
+          "${modifier}+F1" = "exec swaylockfx";
           "${modifier}+p" = "exec ${programs.wlogout.package}/bin/wlogout";
           "${modifier}+z" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
           "${modifier}+Shift+z" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
diff --git a/programs/sway/swayidle/default.nix b/programs/sway/swayidle/default.nix
new file mode 100644
index 0000000..0b6fa91
--- /dev/null
+++ b/programs/sway/swayidle/default.nix
@@ -0,0 +1,12 @@
+{...}: {
+  imports = [../swaylock/default.nix];
+  services.swayidle = {
+    enable = true;
+    timeouts = [
+      {
+        timeout = 60 * 15; # 15 minutes
+        command = "swaylockfx";
+      }
+    ];
+  };
+}
diff --git a/programs/sway/swaylock/default.nix b/programs/sway/swaylock/default.nix
index 3b0d524..e574670 100644
--- a/programs/sway/swaylock/default.nix
+++ b/programs/sway/swaylock/default.nix
@@ -4,6 +4,10 @@
   accentColour ? "base07",
   ...
 }: {
+  home.packages = with pkgs; [
+    (writeShellScriptBin "swaylockfx"
+      "${config.programs.swaylock.package}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse")
+  ];
   programs.swaylock = {
     enable = true;
     package = pkgs.swaylock-effects;