diff --git a/pkgs/tools/X11/sxhkd/default.nix b/pkgs/by-name/sx/sxhkd/package.nix
similarity index 80%
rename from pkgs/tools/X11/sxhkd/default.nix
rename to pkgs/by-name/sx/sxhkd/package.nix
index ab15c38168e2..ea688c23e714 100644
--- a/pkgs/tools/X11/sxhkd/default.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  outputs = [ "out" "doc" "man" ];
+
   nativeBuildInputs = [
     asciidoc
   ];
@@ -40,13 +42,16 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilwm
   ];
 
+  strictDeps = true;
+
   makeFlags = [ "PREFIX=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Simple X hotkey daemon";
     homepage = "https://github.com/baskerville/sxhkd";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ vyp AndersonTorres ncfavier ];
-    platforms = platforms.linux;
+    license = lib.licenses.bsd2;
+    mainProgram = "sxhkd";
+    maintainers = with lib.maintainers; [ vyp AndersonTorres ncfavier ];
+    inherit (libxcb.meta) platforms;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d7270108197..4382e75a36ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34289,8 +34289,6 @@ with pkgs;
 
   sndpeek = callPackage ../applications/audio/sndpeek { };
 
-  sxhkd = callPackage ../tools/X11/sxhkd { };
-
   mpop = callPackage ../applications/networking/mpop {
     inherit (darwin.apple_sdk.frameworks) Security;
   };