From e0efe0fa3b01d90ded22d58e05749a55917770bb Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:27:04 +0200
Subject: [PATCH 01/38] bitwarden-menu: migrate to by-name

---
 .../default.nix => by-name/bi/bitwarden-menu/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/bitwarden-menu/default.nix => by-name/bi/bitwarden-menu/package.nix} (100%)

diff --git a/pkgs/applications/misc/bitwarden-menu/default.nix b/pkgs/by-name/bi/bitwarden-menu/package.nix
similarity index 100%
rename from pkgs/applications/misc/bitwarden-menu/default.nix
rename to pkgs/by-name/bi/bitwarden-menu/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cb689540262..0f352ad4d878 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1417,8 +1417,6 @@ with pkgs;
     bitwarden-directory-connector
     ;
 
-  bitwarden-menu = callPackage ../applications/misc/bitwarden-menu { };
-
   blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
 
   bucklespring-x11 = callPackage ../by-name/bu/bucklespring-libinput/package.nix { legacy = true; };

From a63cf1c6a418fc461f038df91a9e86b877e82e68 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:28:15 +0200
Subject: [PATCH 02/38] bluetooth_battery: migrate to by-name

---
 .../default.nix => by-name/bl/bluetooth_battery/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/bluetooth_battery/default.nix => by-name/bl/bluetooth_battery/package.nix} (100%)

diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/by-name/bl/bluetooth_battery/package.nix
similarity index 100%
rename from pkgs/applications/misc/bluetooth_battery/default.nix
rename to pkgs/by-name/bl/bluetooth_battery/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f352ad4d878..6bac179f7a65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1970,8 +1970,6 @@ with pkgs;
 
   blacken-docs = with python3Packages; toPythonApplication blacken-docs;
 
-  bluetooth_battery = callPackage ../applications/misc/bluetooth_battery { };
-
   cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;
 
   clickhouse-lts = callPackage ../by-name/cl/clickhouse/lts.nix { };

From 6427ceea1fadc52e6092f56b843cb9f2f169ade4 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:29:25 +0200
Subject: [PATCH 03/38] remarkable-mouse: migrate to by-name

---
 .../default.nix => by-name/re/remarkable-mouse/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/remarkable/remarkable-mouse/default.nix => by-name/re/remarkable-mouse/package.nix} (100%)

diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/by-name/re/remarkable-mouse/package.nix
similarity index 100%
rename from pkgs/applications/misc/remarkable/remarkable-mouse/default.nix
rename to pkgs/by-name/re/remarkable-mouse/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6bac179f7a65..123be04ab04d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1810,8 +1810,6 @@ with pkgs;
 
   pixcat = with python3Packages; toPythonApplication pixcat;
 
-  remarkable-mouse = callPackage ../applications/misc/remarkable/remarkable-mouse { };
-
   ropgadget = with python3Packages; toPythonApplication ropgadget;
 
   scour = with python3Packages; toPythonApplication scour;

From 9ff118082422da0bd342e958c4e61ca21ad507ab Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:30:47 +0200
Subject: [PATCH 04/38] termpdfpy: migrate to by-name

---
 .../termpdf.py/default.nix => by-name/te/termpdfpy/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/termpdf.py/default.nix => by-name/te/termpdfpy/package.nix} (100%)

diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/by-name/te/termpdfpy/package.nix
similarity index 100%
rename from pkgs/applications/misc/termpdf.py/default.nix
rename to pkgs/by-name/te/termpdfpy/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 123be04ab04d..e63209d1f27d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11258,8 +11258,6 @@ with pkgs;
     hasktags = haskellPackages.hasktags;
   };
 
-  termpdfpy = callPackage ../applications/misc/termpdf.py { };
-
   inherit (callPackage ../applications/networking/cluster/terraform { })
     mkTerraform
     terraform_1

From 2c4fd9af61f9a2b00162dffb7227098af1a97a30 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:31:33 +0200
Subject: [PATCH 05/38] yokadi: migrate to by-name

---
 .../misc/yokadi/default.nix => by-name/yo/yokadi/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/yokadi/default.nix => by-name/yo/yokadi/package.nix} (100%)

diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/by-name/yo/yokadi/package.nix
similarity index 100%
rename from pkgs/applications/misc/yokadi/default.nix
rename to pkgs/by-name/yo/yokadi/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e63209d1f27d..dc317a818479 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10113,8 +10113,6 @@ with pkgs;
 
   ydiff = with python3.pkgs; toPythonApplication ydiff;
 
-  yokadi = callPackage ../applications/misc/yokadi { };
-
   your-editor = callPackage ../applications/editors/your-editor { stdenv = gccStdenv; };
 
   youtube-dl = with python3Packages; toPythonApplication youtube-dl;

From 52757fb65fc8c06bc8ea94f77fd9d9b5a697d06f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:32:12 +0200
Subject: [PATCH 06/38] droopy: migrate to by-name

---
 .../droopy/default.nix => by-name/dr/droopy/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/droopy/default.nix => by-name/dr/droopy/package.nix} (100%)

diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/by-name/dr/droopy/package.nix
similarity index 100%
rename from pkgs/applications/networking/droopy/default.nix
rename to pkgs/by-name/dr/droopy/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc317a818479..46aef598745e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8807,8 +8807,6 @@ with pkgs;
 
   drawterm-wayland = callPackage ../by-name/dr/drawterm/package.nix { withWayland = true; };
 
-  droopy = callPackage ../applications/networking/droopy { };
-
   evilwm = callPackage ../applications/window-managers/evilwm {
     patches = config.evilwm.patches or [ ];
   };

From 23a2251a4fbb361a86f8571514f0d790b52b4096 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:33:03 +0200
Subject: [PATCH 07/38] matrix-commander: migrate to by-name

---
 .../default.nix => by-name/ma/matrix-commander/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/matrix-commander/default.nix => by-name/ma/matrix-commander/package.nix} (100%)

diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/by-name/ma/matrix-commander/package.nix
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
rename to pkgs/by-name/ma/matrix-commander/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46aef598745e..51f64e221199 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9312,8 +9312,6 @@ with pkgs;
     shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { };
   };
 
-  matrix-commander = callPackage ../applications/networking/instant-messengers/matrix-commander { };
-
   mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; };
   mediaelch-qt6 = mediaelch;
 

From 86a650ba837f627ab0755605aeb64ffe3662b35e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:33:58 +0200
Subject: [PATCH 08/38] mavproxy: migrate to by-name

---
 .../mavproxy/default.nix => by-name/ma/mavproxy/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/robotics/mavproxy/default.nix => by-name/ma/mavproxy/package.nix} (100%)

diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/by-name/ma/mavproxy/package.nix
similarity index 100%
rename from pkgs/applications/science/robotics/mavproxy/default.nix
rename to pkgs/by-name/ma/mavproxy/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51f64e221199..089b5e867e78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5448,8 +5448,6 @@ with pkgs;
   maven3 = maven;
   inherit (maven) buildMaven;
 
-  mavproxy = callPackage ../applications/science/robotics/mavproxy { };
-
   python-matter-server =
     with python3Packages;
     toPythonApplication (

From 9c30dc238a63ec23922e56feb0426045ede74fd3 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:34:46 +0200
Subject: [PATCH 09/38] sumorobot-manager: migrate to by-name

---
 .../default.nix => by-name/su/sumorobot-manager/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/science/robotics/sumorobot-manager/default.nix => by-name/su/sumorobot-manager/package.nix} (100%)

diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/by-name/su/sumorobot-manager/package.nix
similarity index 100%
rename from pkgs/applications/science/robotics/sumorobot-manager/default.nix
rename to pkgs/by-name/su/sumorobot-manager/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 089b5e867e78..4a33955ecc02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3079,8 +3079,6 @@ with pkgs;
 
   strip-nondeterminism = perlPackages.strip-nondeterminism;
 
-  sumorobot-manager = callPackage ../applications/science/robotics/sumorobot-manager { };
-
   sslscan = callPackage ../tools/security/sslscan {
     openssl = openssl.override { withZlib = true; };
   };

From fda2f1053772a5daa1904e58928c7a6425430c47 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:35:38 +0200
Subject: [PATCH 10/38] jellyfin-mpv-shim: migrate to by-name

---
 .../default.nix => by-name/je/jellyfin-mpv-shim/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/video/jellyfin-mpv-shim/default.nix => by-name/je/jellyfin-mpv-shim/package.nix} (100%)

diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/by-name/je/jellyfin-mpv-shim/package.nix
similarity index 100%
rename from pkgs/applications/video/jellyfin-mpv-shim/default.nix
rename to pkgs/by-name/je/jellyfin-mpv-shim/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a33955ecc02..2eec051937c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1731,8 +1731,6 @@ with pkgs;
 
   intensity-normalization = with python3Packages; toPythonApplication intensity-normalization;
 
-  jellyfin-mpv-shim = callPackage ../applications/video/jellyfin-mpv-shim { };
-
   klaus = with python3Packages; toPythonApplication klaus;
 
   klipper = callPackage ../servers/klipper { };

From 51277308b520ed1b144d77e550f839685d538c72 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:37:41 +0200
Subject: [PATCH 11/38] plex-mpv-shim: migrate to by-name

---
 .../default.nix => by-name/pl/plex-mpv-shim/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/video/plex-mpv-shim/default.nix => by-name/pl/plex-mpv-shim/package.nix} (100%)

diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/by-name/pl/plex-mpv-shim/package.nix
similarity index 100%
rename from pkgs/applications/video/plex-mpv-shim/default.nix
rename to pkgs/by-name/pl/plex-mpv-shim/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2eec051937c2..6777e8244728 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9499,8 +9499,6 @@ with pkgs;
 
   inherit (pidginPackages) pidgin;
 
-  plex-mpv-shim = callPackage ../applications/video/plex-mpv-shim { };
-
   # perhaps there are better apps for this task? It's how I had configured my previous system.
   # And I don't want to rewrite all rules
   profanity = callPackage ../applications/networking/instant-messengers/profanity (

From de1ca5536f9a53d0f22c0e9908baefb304435548 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:39:46 +0200
Subject: [PATCH 12/38] hyprshade: migrate to by-name

---
 .../hyprshade/default.nix => by-name/hy/hyprshade/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/window-managers/hyprwm/hyprshade/default.nix => by-name/hy/hyprshade/package.nix} (100%)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/by-name/hy/hyprshade/package.nix
similarity index 100%
rename from pkgs/applications/window-managers/hyprwm/hyprshade/default.nix
rename to pkgs/by-name/hy/hyprshade/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6777e8244728..b66056a16e82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1723,8 +1723,6 @@ with pkgs;
     cairo = cairo.override { xcbSupport = true; };
   };
 
-  hyprshade = callPackage ../applications/window-managers/hyprwm/hyprshade { };
-
   hyprlandPlugins = recurseIntoAttrs (
     callPackage ../applications/window-managers/hyprwm/hyprland-plugins { }
   );

From 2de2a10ff59087dec2d70131bbbb7eb61e95a721 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:40:35 +0200
Subject: [PATCH 13/38] asn2quickder: migrate to by-name

---
 .../default.nix => by-name/as/asn2quickder/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/asn2quickder/default.nix => by-name/as/asn2quickder/package.nix} (100%)

diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/by-name/as/asn2quickder/package.nix
similarity index 100%
rename from pkgs/development/tools/asn2quickder/default.nix
rename to pkgs/by-name/as/asn2quickder/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b66056a16e82..866e8bae4bbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5029,8 +5029,6 @@ with pkgs;
 
   apacheKafka = apacheKafka_4_2;
 
-  asn2quickder = callPackage ../development/tools/asn2quickder { };
-
   libastyle = astyle.override { asLibrary = true; };
 
   aws-adfs = with python3Packages; toPythonApplication aws-adfs;

From 999b01b89e6755a5475de8f325b7e5dd3bc1d332 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:41:13 +0200
Subject: [PATCH 14/38] enochecker-test: migrate to by-name

---
 .../default.nix => by-name/en/enochecker-test/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/enochecker-test/default.nix => by-name/en/enochecker-test/package.nix} (100%)

diff --git a/pkgs/development/tools/enochecker-test/default.nix b/pkgs/by-name/en/enochecker-test/package.nix
similarity index 100%
rename from pkgs/development/tools/enochecker-test/default.nix
rename to pkgs/by-name/en/enochecker-test/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 866e8bae4bbb..b1a0f534ed5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -407,8 +407,6 @@ with pkgs;
 
   dnf4 = python3Packages.callPackage ../development/python-modules/dnf4/wrapper.nix { };
 
-  enochecker-test = callPackage ../development/tools/enochecker-test { };
-
   inherit (gridlock) nyarr;
 
   lshw-gui = lshw.override { withGUI = true; };

From 19c199ecf9f3bb1ac4948ef900be828ad389fb0a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:43:10 +0200
Subject: [PATCH 15/38] gdbgui: migrate to by-name

---
 .../misc/gdbgui/default.nix => by-name/gd/gdbgui/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/misc/gdbgui/default.nix => by-name/gd/gdbgui/package.nix} (100%)

diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/by-name/gd/gdbgui/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/gdbgui/default.nix
rename to pkgs/by-name/gd/gdbgui/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1a0f534ed5f..7d75fc4901cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5377,8 +5377,6 @@ with pkgs;
     haskellPackages.callPackage ../tools/misc/fffuu { }
   );
 
-  gdbgui = callPackage ../development/tools/misc/gdbgui { };
-
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
   flex = callPackage ../development/tools/parsing/flex { };
 

From 877e629311ff58a4ecba08c996f010f9138bd58b Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:44:07 +0200
Subject: [PATCH 16/38] yakut: migrate to by-name

---
 .../misc/yakut/default.nix => by-name/ya/yakut/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/misc/yakut/default.nix => by-name/ya/yakut/package.nix} (100%)

diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/by-name/ya/yakut/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/yakut/default.nix
rename to pkgs/by-name/ya/yakut/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d75fc4901cc..c099c7c7eec9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4995,8 +4995,6 @@ with pkgs;
 
   ansible-builder = with python3Packages; toPythonApplication ansible-builder;
 
-  yakut = callPackage ../development/tools/misc/yakut { };
-
   ### DEVELOPMENT / TOOLS / LANGUAGE-SERVERS
 
   inherit (callPackages ../development/tools/language-servers/nixd { }) nixf nixt nixd;

From 5b219f4aca472522ea2aa169c68c6c5f88ddfdfb Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:45:08 +0200
Subject: [PATCH 17/38] cpupower-gui: migrate to by-name

---
 .../default.nix => by-name/cp/cpupower-gui/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{os-specific/linux/cpupower-gui/default.nix => by-name/cp/cpupower-gui/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/by-name/cp/cpupower-gui/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/cpupower-gui/default.nix
rename to pkgs/by-name/cp/cpupower-gui/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c099c7c7eec9..8954b31b8837 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7994,8 +7994,6 @@ with pkgs;
     // config.conky or { }
   );
 
-  cpupower-gui = callPackage ../os-specific/linux/cpupower-gui { };
-
   # Darwin package set
   #
   # Even though this is a set of packages not single package, use `callPackage`

From edf28f2d92486610f56e52ec983c5bf7c660979f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:45:45 +0200
Subject: [PATCH 18/38] input-remapper: migrate to by-name

---
 .../default.nix => by-name/in/input-remapper/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/inputmethods/input-remapper/default.nix => by-name/in/input-remapper/package.nix} (100%)

diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/by-name/in/input-remapper/package.nix
similarity index 100%
rename from pkgs/tools/inputmethods/input-remapper/default.nix
rename to pkgs/by-name/in/input-remapper/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8954b31b8837..53ab5f0defae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2388,8 +2388,6 @@ with pkgs;
 
   infisical = callPackage ../development/tools/infisical { };
 
-  input-remapper = callPackage ../tools/inputmethods/input-remapper { };
-
   internetarchive = with python3Packages; toPythonApplication internetarchive;
 
   iocextract = with python3Packages; toPythonApplication iocextract;

From 0747e884ad75a7b42801eb4c8d486083d2bc2ab7 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:46:41 +0200
Subject: [PATCH 19/38] online-judge-template-g-generator: migrate to by-name

---
 .../on/online-judge-template-generator/package.nix}             | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/online-judge-template-generator/default.nix => by-name/on/online-judge-template-generator/package.nix} (100%)

diff --git a/pkgs/tools/misc/online-judge-template-generator/default.nix b/pkgs/by-name/on/online-judge-template-generator/package.nix
similarity index 100%
rename from pkgs/tools/misc/online-judge-template-generator/default.nix
rename to pkgs/by-name/on/online-judge-template-generator/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53ab5f0defae..57158b91b329 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1794,8 +1794,6 @@ with pkgs;
 
   ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf;
 
-  online-judge-template-generator = callPackage ../tools/misc/online-judge-template-generator { };
-
   online-judge-tools = with python3.pkgs; toPythonApplication online-judge-tools;
 
   inherit (ocamlPackages) patdiff;

From 2374a452039f0289199468c680cd629037ba45b5 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:48:15 +0200
Subject: [PATCH 20/38] pandoc-acro: migrate to by-name

---
 .../default.nix => by-name/pa/pandoc-acro/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/pandoc-acro/default.nix => by-name/pa/pandoc-acro/package.nix} (100%)

diff --git a/pkgs/tools/misc/pandoc-acro/default.nix b/pkgs/by-name/pa/pandoc-acro/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-acro/default.nix
rename to pkgs/by-name/pa/pandoc-acro/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57158b91b329..6dac915c6519 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,8 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-acro = callPackage ../tools/misc/pandoc-acro { };
-
   pandoc-imagine = callPackage ../tools/misc/pandoc-imagine { };
 
   pandoc-include = callPackage ../tools/misc/pandoc-include { };

From d94038dc7120b51bb088a7e65e727e646762d31a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:48:38 +0200
Subject: [PATCH 21/38] pandoc-imagine: migrate to by-name

---
 .../default.nix => by-name/pa/pandoc-imagine/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/pandoc-imagine/default.nix => by-name/pa/pandoc-imagine/package.nix} (100%)

diff --git a/pkgs/tools/misc/pandoc-imagine/default.nix b/pkgs/by-name/pa/pandoc-imagine/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-imagine/default.nix
rename to pkgs/by-name/pa/pandoc-imagine/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dac915c6519..49558fae2ef0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,8 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-imagine = callPackage ../tools/misc/pandoc-imagine { };
-
   pandoc-include = callPackage ../tools/misc/pandoc-include { };
 
   pandoc-drawio-filter = callPackage ../tools/misc/pandoc-drawio-filter { };

From 161d0eecaaf35311cab442efb92a7e7979a4f23c Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:49:06 +0200
Subject: [PATCH 22/38] pandoc-include: migrate to by-name

---
 .../default.nix => by-name/pa/pandoc-include/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/pandoc-include/default.nix => by-name/pa/pandoc-include/package.nix} (100%)

diff --git a/pkgs/tools/misc/pandoc-include/default.nix b/pkgs/by-name/pa/pandoc-include/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-include/default.nix
rename to pkgs/by-name/pa/pandoc-include/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49558fae2ef0..57bea220e933 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,8 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-include = callPackage ../tools/misc/pandoc-include { };
-
   pandoc-drawio-filter = callPackage ../tools/misc/pandoc-drawio-filter { };
 
   pandoc-plantuml-filter = callPackage ../tools/misc/pandoc-plantuml-filter { };

From 7437d3628c20987a96739f0c9c674d01b24c6c67 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:49:28 +0200
Subject: [PATCH 23/38] pandoc-drawio-filter: migrate to by-name

---
 .../default.nix => by-name/pa/pandoc-drawio-filter/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/pandoc-drawio-filter/default.nix => by-name/pa/pandoc-drawio-filter/package.nix} (100%)

diff --git a/pkgs/tools/misc/pandoc-drawio-filter/default.nix b/pkgs/by-name/pa/pandoc-drawio-filter/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-drawio-filter/default.nix
rename to pkgs/by-name/pa/pandoc-drawio-filter/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57bea220e933..7c1e3a0ef63c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,8 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-drawio-filter = callPackage ../tools/misc/pandoc-drawio-filter { };
-
   pandoc-plantuml-filter = callPackage ../tools/misc/pandoc-plantuml-filter { };
 
   pandoc-eqnos = callPackage ../tools/misc/pandoc-eqnos { };

From 3c6927e59188e49a96a75d2f62d323dbfc263afc Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:50:01 +0200
Subject: [PATCH 24/38] pandoc-plantuml-filter: migrate to by-name

---
 .../pa/pandoc-plantuml-filter/package.nix}                      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/pandoc-plantuml-filter/default.nix => by-name/pa/pandoc-plantuml-filter/package.nix} (100%)

diff --git a/pkgs/tools/misc/pandoc-plantuml-filter/default.nix b/pkgs/by-name/pa/pandoc-plantuml-filter/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-plantuml-filter/default.nix
rename to pkgs/by-name/pa/pandoc-plantuml-filter/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c1e3a0ef63c..88ccadc170c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,8 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-plantuml-filter = callPackage ../tools/misc/pandoc-plantuml-filter { };
-
   pandoc-eqnos = callPackage ../tools/misc/pandoc-eqnos { };
   pandoc-fignos = callPackage ../tools/misc/pandoc-fignos { };
   pandoc-secnos = callPackage ../tools/misc/pandoc-secnos { };

From 9bcc9690e99410bd7ef9474082b8d76de458931a Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:50:56 +0200
Subject: [PATCH 25/38] pandoc-eqnos: migrate to by-name

---
 .../default.nix => by-name/pa/pandoc-eqnos/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{tools/misc/pandoc-eqnos/default.nix => by-name/pa/pandoc-eqnos/package.nix} (100%)

diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/by-name/pa/pandoc-eqnos/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-eqnos/default.nix
rename to pkgs/by-name/pa/pandoc-eqnos/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88ccadc170c9..7990e8e54065 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,7 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-eqnos = callPackage ../tools/misc/pandoc-eqnos { };
   pandoc-fignos = callPackage ../tools/misc/pandoc-fignos { };
   pandoc-secnos = callPackage ../tools/misc/pandoc-secnos { };
   pandoc-tablenos = callPackage ../tools/misc/pandoc-tablenos { };

From 9abcd7e905b40017ee89bfeca10bdc3d06a4104d Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:51:19 +0200
Subject: [PATCH 26/38] pandoc-fignos: migrate to by-name

---
 .../default.nix => by-name/pa/pandoc-fignos/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{tools/misc/pandoc-fignos/default.nix => by-name/pa/pandoc-fignos/package.nix} (100%)

diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/by-name/pa/pandoc-fignos/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-fignos/default.nix
rename to pkgs/by-name/pa/pandoc-fignos/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7990e8e54065..ba7c50676f95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,7 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-fignos = callPackage ../tools/misc/pandoc-fignos { };
   pandoc-secnos = callPackage ../tools/misc/pandoc-secnos { };
   pandoc-tablenos = callPackage ../tools/misc/pandoc-tablenos { };
 

From b703eedd203eb83fe179728b12881dbec510ae0f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:51:47 +0200
Subject: [PATCH 27/38] pandoc-secnos: migrate to by-name

---
 .../default.nix => by-name/pa/pandoc-secnos/package.nix}         | 0
 .../misc => by-name/pa}/pandoc-secnos/patch/fix-manifest.patch   | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 3 files changed, 1 deletion(-)
 rename pkgs/{tools/misc/pandoc-secnos/default.nix => by-name/pa/pandoc-secnos/package.nix} (100%)
 rename pkgs/{tools/misc => by-name/pa}/pandoc-secnos/patch/fix-manifest.patch (100%)

diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/by-name/pa/pandoc-secnos/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-secnos/default.nix
rename to pkgs/by-name/pa/pandoc-secnos/package.nix
diff --git a/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch b/pkgs/by-name/pa/pandoc-secnos/patch/fix-manifest.patch
similarity index 100%
rename from pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch
rename to pkgs/by-name/pa/pandoc-secnos/patch/fix-manifest.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba7c50676f95..3dc93a79d9c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,7 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-secnos = callPackage ../tools/misc/pandoc-secnos { };
   pandoc-tablenos = callPackage ../tools/misc/pandoc-tablenos { };
 
   pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };

From f333cfa682f8d6666880aff6a52e1d501ccf990c Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:52:22 +0200
Subject: [PATCH 28/38] pandoc-tablenos: migrate to by-name

---
 .../default.nix => by-name/pa/pandoc-tablenos/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/pandoc-tablenos/default.nix => by-name/pa/pandoc-tablenos/package.nix} (100%)

diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/by-name/pa/pandoc-tablenos/package.nix
similarity index 100%
rename from pkgs/tools/misc/pandoc-tablenos/default.nix
rename to pkgs/by-name/pa/pandoc-tablenos/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3dc93a79d9c6..471d85487f24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2743,8 +2743,6 @@ with pkgs;
 
   nvfetcher = haskell.lib.compose.justStaticExecutables haskellPackages.nvfetcher;
 
-  pandoc-tablenos = callPackage ../tools/misc/pandoc-tablenos { };
-
   pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
 
   nsjail = callPackage ../tools/security/nsjail {

From 24f4fe666e4b33b1220a0e89491fae67482c1dca Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:53:40 +0200
Subject: [PATCH 29/38] pdd: migrate to by-name

---
 pkgs/{tools/misc/pdd/default.nix => by-name/pd/pdd/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/pdd/default.nix => by-name/pd/pdd/package.nix} (100%)

diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/by-name/pd/pdd/package.nix
similarity index 100%
rename from pkgs/tools/misc/pdd/default.nix
rename to pkgs/by-name/pd/pdd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 471d85487f24..6977bf140a6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2870,8 +2870,6 @@ with pkgs;
     polkitSupport = true;
   };
 
-  pdd = callPackage ../tools/misc/pdd { };
-
   pdfminer = with python3Packages; toPythonApplication pdfminer-six;
 
   pdfium-binaries-v8 = pdfium-binaries.override { withV8 = true; };

From a172c8d65b98cc7abdf29c184f958ff8530bf956 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:54:16 +0200
Subject: [PATCH 30/38] remote-exec: migrate to by-name

---
 .../default.nix => by-name/re/remote-exec/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/remote-exec/default.nix => by-name/re/remote-exec/package.nix} (100%)

diff --git a/pkgs/tools/misc/remote-exec/default.nix b/pkgs/by-name/re/remote-exec/package.nix
similarity index 100%
rename from pkgs/tools/misc/remote-exec/default.nix
rename to pkgs/by-name/re/remote-exec/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6977bf140a6a..c9e65da0eaf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2976,8 +2976,6 @@ with pkgs;
 
   recoll-nox = recoll.override { withGui = false; };
 
-  remote-exec = callPackage ../tools/misc/remote-exec { };
-
   reptor = with python3.pkgs; toPythonApplication reptor;
 
   inherit (callPackage ../development/misc/resholve { })

From 4ec02b3b4cc1a01c84d4c2e897b8c23158a9ded0 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:54:48 +0200
Subject: [PATCH 31/38] vimwiki-markdown: migrate to by-name

---
 .../default.nix => by-name/vi/vimwiki-markdown/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/vimwiki-markdown/default.nix => by-name/vi/vimwiki-markdown/package.nix} (100%)

diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/by-name/vi/vimwiki-markdown/package.nix
similarity index 100%
rename from pkgs/tools/misc/vimwiki-markdown/default.nix
rename to pkgs/by-name/vi/vimwiki-markdown/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9e65da0eaf7..c307d1b71d3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3138,8 +3138,6 @@ with pkgs;
   vimpager = callPackage ../tools/misc/vimpager { };
   vimpager-latest = callPackage ../tools/misc/vimpager/latest.nix { };
 
-  vimwiki-markdown = callPackage ../tools/misc/vimwiki-markdown { };
-
   voxtype-vulkan = callPackage ../by-name/vo/voxtype/package.nix { vulkanSupport = true; };
   voxtype-onnx = callPackage ../by-name/vo/voxtype/package.nix { onnxSupport = true; };
 

From 9be717162a4793602642aae8a8dd42d344a83d86 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:55:38 +0200
Subject: [PATCH 32/38] namespaced-openvpn: migrate to by-name

---
 .../default.nix => by-name/na/namespaced-openvpn/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/networking/namespaced-openvpn/default.nix => by-name/na/namespaced-openvpn/package.nix} (100%)

diff --git a/pkgs/tools/networking/namespaced-openvpn/default.nix b/pkgs/by-name/na/namespaced-openvpn/package.nix
similarity index 100%
rename from pkgs/tools/networking/namespaced-openvpn/default.nix
rename to pkgs/by-name/na/namespaced-openvpn/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c307d1b71d3c..42d84c36d69c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2811,8 +2811,6 @@ with pkgs;
     inherit (llvmPackages) stdenv;
   };
 
-  namespaced-openvpn = callPackage ../tools/networking/namespaced-openvpn { };
-
   update-dotdee = with python3Packages; toPythonApplication update-dotdee;
 
   update-nix-fetchgit = haskell.lib.compose.justStaticExecutables haskellPackages.update-nix-fetchgit;

From 8bba00bf25d4ae36487a01f40c9e9c0e6ca3b479 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:56:20 +0200
Subject: [PATCH 33/38] s3cmd: migrate to by-name

---
 .../s3cmd/default.nix => by-name/s3/s3cmd/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/networking/s3cmd/default.nix => by-name/s3/s3cmd/package.nix} (100%)

diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/by-name/s3/s3cmd/package.nix
similarity index 100%
rename from pkgs/tools/networking/s3cmd/default.nix
rename to pkgs/by-name/s3/s3cmd/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 42d84c36d69c..aa067b08a81e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2998,8 +2998,6 @@ with pkgs;
 
   ruby-lsp = rubyPackages.ruby-lsp;
 
-  s3cmd = callPackage ../tools/networking/s3cmd { };
-
   s3-credentials = with python3Packages; toPythonApplication s3-credentials;
 
   safety-cli = with python3.pkgs; toPythonApplication safety;

From ced166d25f031097b42dc91fc381b6cbd3ba5c15 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:57:02 +0200
Subject: [PATCH 34/38] vpn-slice: migrate to by-name

---
 .../vpn-slice/default.nix => by-name/vp/vpn-slice/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/networking/vpn-slice/default.nix => by-name/vp/vpn-slice/package.nix} (100%)

diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/by-name/vp/vpn-slice/package.nix
similarity index 100%
rename from pkgs/tools/networking/vpn-slice/default.nix
rename to pkgs/by-name/vp/vpn-slice/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa067b08a81e..f58e7bf4ac84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3137,8 +3137,6 @@ with pkgs;
   voxtype-vulkan = callPackage ../by-name/vo/voxtype/package.nix { vulkanSupport = true; };
   voxtype-onnx = callPackage ../by-name/vo/voxtype/package.nix { onnxSupport = true; };
 
-  vpn-slice = callPackage ../tools/networking/vpn-slice { };
-
   openconnectPackages = callPackage ../tools/networking/openconnect { };
 
   inherit (openconnectPackages) openconnect openconnect_openssl;

From eee73dc65ba509d793591a04ee41861904aba7e3 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:57:36 +0200
Subject: [PATCH 35/38] cve-bin-tool: migrate to by-name

---
 .../default.nix => by-name/cv/cve-bin-tool/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/cve-bin-tool/default.nix => by-name/cv/cve-bin-tool/package.nix} (100%)

diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/by-name/cv/cve-bin-tool/package.nix
similarity index 100%
rename from pkgs/tools/security/cve-bin-tool/default.nix
rename to pkgs/by-name/cv/cve-bin-tool/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f58e7bf4ac84..454b3f4d509e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2033,8 +2033,6 @@ with pkgs;
     ngtcp2 = ngtcp2-gnutls;
   };
 
-  cve-bin-tool = callPackage ../tools/security/cve-bin-tool { };
-
   dconf2nix = callPackage ../development/tools/haskell/dconf2nix { };
 
   inherit (callPackages ../applications/networking/p2p/deluge { })

From 90e651958e773155b329c0460be6dd12b8ffbe5b Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:58:27 +0200
Subject: [PATCH 36/38] nitrokey-app2: migrate to by-name

---
 .../default.nix => by-name/ni/nitrokey-app2/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/nitrokey-app2/default.nix => by-name/ni/nitrokey-app2/package.nix} (100%)

diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/by-name/ni/nitrokey-app2/package.nix
similarity index 100%
rename from pkgs/tools/security/nitrokey-app2/default.nix
rename to pkgs/by-name/ni/nitrokey-app2/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 454b3f4d509e..5467ccf744c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11309,8 +11309,6 @@ with pkgs;
 
   torcs-without-data = callPackage ../by-name/to/torcs/without-data.nix { };
 
-  nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { };
-
   hy = with python3Packages; toPythonApplication hy;
 
   ghc-standalone-archive =

From 429b3932ad9aac93210f6c7b0236f88ea43a7ddd Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:59:02 +0200
Subject: [PATCH 37/38] pass2csv: migrate to by-name

---
 .../pass2csv/default.nix => by-name/pa/pass2csv/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/pass2csv/default.nix => by-name/pa/pass2csv/package.nix} (100%)

diff --git a/pkgs/tools/security/pass2csv/default.nix b/pkgs/by-name/pa/pass2csv/package.nix
similarity index 100%
rename from pkgs/tools/security/pass2csv/default.nix
rename to pkgs/by-name/pa/pass2csv/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5467ccf744c1..89f8644de59c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9071,8 +9071,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  pass2csv = callPackage ../tools/security/pass2csv { };
-
   pinboard = with python3Packages; toPythonApplication pinboard;
 
   pinboard-notes-backup = haskell.lib.compose.justStaticExecutables haskellPackages.pinboard-notes-backup;

From 7b6e892ead29e5376e9e656e905eeaa7d226ad1c Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:59:46 +0200
Subject: [PATCH 38/38] cm-rgb: migrate to by-name

---
 .../system/cm-rgb/default.nix => by-name/cm/cm-rgb/package.nix} | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/system/cm-rgb/default.nix => by-name/cm/cm-rgb/package.nix} (100%)

diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/by-name/cm/cm-rgb/package.nix
similarity index 100%
rename from pkgs/tools/system/cm-rgb/default.nix
rename to pkgs/by-name/cm/cm-rgb/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89f8644de59c..9320a56ea5d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7951,8 +7951,6 @@ with pkgs;
   };
   busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { };
 
-  cm-rgb = callPackage ../tools/system/cm-rgb { };
-
   conky = callPackage ../os-specific/linux/conky (
     {
       lua = lua5_4;