diff --git a/configs/default.nix b/configs/default.nix
index a9c3aff..6054fe6 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -233,7 +233,6 @@ in {
     ./vscode.nix
     ./watson.nix
     ./wifi.nix
-    ./xautolock.nix
     ./zsh.nix
   ];
 }
diff --git a/configs/i3.nix b/configs/i3.nix
index 3b274d1..9838bf2 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -201,7 +201,7 @@ in {
         "${modifier}+t" = "exec ${(defaultApplications pkgs).fileManager}";
         "${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
 
-        "${modifier}+Shift+w" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
+        "${modifier}+Shift+w" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
         "${modifier}+a" =
           "exec --no-startup-id ${pkgs.rofi}/bin/rofi -display-window — -show window";
         "${modifier}+d" = "exec --no-startup-id ${pkgs.dmenu}/bin/dmenu_run";
@@ -245,7 +245,7 @@ in {
           "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl next";
         "XF86AudioPrev" =
           "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl previous";
-        "XF86ScreenSaver" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
+        "XF86ScreenSaver" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
 
         "XF86Display" = "exec ${pkgs.scripts.dmenurandr}/bin/dmenurandr";
 
diff --git a/configs/xautolock.nix b/configs/xautolock.nix
deleted file mode 100644
index d8b3df4..0000000
--- a/configs/xautolock.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  suspendIfBored = false;
-
-  xlockModes = lib.concatStringsSep "\\n" [
-    # "braid"
-    "galaxy"
-    # "lightning"
-    # "matrix"
-    "pyro2"
-    "space"
-  ];
-  my-xlock = pkgs.writers.writeDashBin "xlock" ''
-    MODE=$(printf "${xlockModes}" | shuf -n 1)
-
-    ${pkgs.xlockmore}/bin/xlock \
-      -saturation 0.4 \
-      -erasemode no_fade \
-      +description \
-      -showdate \
-      -username " " \
-      -password " " \
-      -info " " \
-      -validate "..." \
-      -invalid "Computer says no." \
-      -mode "$MODE"
-  '';
-in {
-  services.xserver.xautolock = rec {
-    enable = true;
-    killer =
-      if suspendIfBored then "${pkgs.systemd}/bin/systemctl suspend" else null;
-    locker = "${my-xlock}/bin/xlock";
-    nowlocker = locker;
-    enableNotifier = true;
-    notifier = ''
-      ${pkgs.libnotify}/bin/notify-send -u normal -a xautolock "Locking" "in 10 seconds."'';
-  };
-}
diff --git a/packages/scripts/default.nix b/packages/scripts/default.nix
index 2ab3198..492e2a7 100644
--- a/packages/scripts/default.nix
+++ b/packages/scripts/default.nix
@@ -242,4 +242,5 @@ in rec {
 
   bvg = pkgs.callPackage ./bvg.nix { };
   nav = pkgs.callPackage ./nav.nix { };
+  k-lock = pkgs.callPackage ./k-lock.nix { };
 }
diff --git a/packages/scripts/k-lock.nix b/packages/scripts/k-lock.nix
new file mode 100644
index 0000000..7149142
--- /dev/null
+++ b/packages/scripts/k-lock.nix
@@ -0,0 +1,25 @@
+{ writers, lib, xlockmore }:
+let
+  xlockModes = lib.concatStringsSep "\\n" [
+    # "braid"
+    "galaxy"
+    # "lightning"
+    # "matrix"
+    "pyro2"
+    "space"
+  ];
+in writers.writeDashBin "k-lock" ''
+  MODE=$(printf "${xlockModes}" | shuf -n 1)
+
+  ${xlockmore}/bin/xlock \
+    -saturation 0.4 \
+    -erasemode no_fade \
+    +description \
+    -showdate \
+    -username " " \
+    -password " " \
+    -info " " \
+    -validate "..." \
+    -invalid "Computer says no." \
+    -mode "$MODE"
+''