diff --git a/pkgs/applications/misc/waycorner/default.nix b/pkgs/by-name/wa/waycorner/package.nix
similarity index 72%
rename from pkgs/applications/misc/waycorner/default.nix
rename to pkgs/by-name/wa/waycorner/package.nix
index 2d1303bb26c7..4ca5ca58b04c 100644
--- a/pkgs/applications/misc/waycorner/default.nix
+++ b/pkgs/by-name/wa/waycorner/package.nix
@@ -1,41 +1,42 @@
-{ lib
-, makeWrapper
-, rustPlatform
-, pkg-config
-, fetchFromGitHub
-, wayland
-,
+{
+  lib,
+  makeWrapper,
+  rustPlatform,
+  pkg-config,
+  fetchFromGitHub,
+  wayland,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "waycorner";
   version = "0.2.3";
+
   src = fetchFromGitHub {
     owner = "AndreasBackx";
     repo = "waycorner";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y=";
   };
+
   cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU=";
-  buildInputs = [
-    wayland
-  ];
+
   nativeBuildInputs = [
     pkg-config
     makeWrapper
   ];
+
   postFixup = ''
     # the program looks for libwayland-client.so at runtime
     wrapProgram $out/bin/waycorner \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Hot corners for Wayland";
     mainProgram = "waycorner";
-    changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md";
+    changelog = "https://github.com/AndreasBackx/waycorner/blob/${version}/CHANGELOG.md";
     homepage = "https://github.com/AndreasBackx/waycorner";
-    platforms = platforms.linux;
-    license = licenses.mit;
-    maintainers = with maintainers; [ NotAShelf ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ NotAShelf ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5043f7151a73..e5f5a8034b33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29965,8 +29965,6 @@ with pkgs;
 
   remontoire = callPackage ../applications/misc/remontoire { };
 
-  waycorner = callPackage ../applications/misc/waycorner { };
-
   wayshot = callPackage ../tools/misc/wayshot { };
 
   waylevel = callPackage ../tools/misc/waylevel { };