diff --git a/pkgs/tools/misc/valeronoi/default.nix b/pkgs/by-name/va/valeronoi/package.nix
similarity index 50%
rename from pkgs/tools/misc/valeronoi/default.nix
rename to pkgs/by-name/va/valeronoi/package.nix
index 9b43a8387dd7..675b32eff088 100644
--- a/pkgs/tools/misc/valeronoi/default.nix
+++ b/pkgs/by-name/va/valeronoi/package.nix
@@ -7,49 +7,49 @@
   cmake,
   gpp,
   mpfr,
-  qtbase,
-  qtimageformats,
-  qtsvg,
-  wrapQtAppsHook,
+  qt6Packages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "valeronoi";
   version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "ccoors";
-    repo = pname;
-    tag = "v${version}";
-    sha256 = "sha256-5KXVSIqWDkXnpO+qgBzFtbJb444RW8dIVXp8Y/aAOrk=";
+    repo = "valeronoi";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5KXVSIqWDkXnpO+qgBzFtbJb444RW8dIVXp8Y/aAOrk=";
   };
 
-  buildInputs = [
-    boost
-    cgal
-    gpp
-    mpfr
-    qtbase
-    qtimageformats
-    qtsvg
-  ];
+  buildInputs =
+    [
+      boost
+      cgal
+      gpp
+      mpfr
+    ]
+    ++ (with qt6Packages; [
+      qtbase
+      qtimageformats
+      qtsvg
+    ]);
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ccoors/Valeronoi/";
     description = "WiFi mapping companion app for Valetudo";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       nova-madeline
       maeve
     ];
     mainProgram = "valeronoi";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab8bb5f20946..a758e9d83d63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1154,8 +1154,6 @@ with pkgs;
 
   ufolint = with python3Packages; toPythonApplication ufolint;
 
-  valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };
-
   veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
 
   ventoy-full = ventoy.override {