diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/by-name/jw/jwm-settings-manager/package.nix
similarity index 88%
rename from pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
rename to pkgs/by-name/jw/jwm-settings-manager/package.nix
index ba57e5bae6f7..a6044f76152a 100644
--- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix
+++ b/pkgs/by-name/jw/jwm-settings-manager/package.nix
@@ -14,14 +14,14 @@
   which,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jwm-settings-manager";
   version = "2019-01-27";
 
   src = fetchbzr {
-    url = "lp:${pname}";
+    url = "lp:jwm-settings-manager";
     rev = "292";
-    sha256 = "1yqc1ac2pbkc88z7p1qags1jygdlr5y1rhc5mx6gapcf54bk0lmi";
+    hash = "sha256-sVIwFymOXfVMr4XBHHzJtD0vg34Kh3s+QmyuK5gKDPs=";
   };
 
   nativeBuildInputs = [
@@ -55,4 +55,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.romildo ];
   };
-}
+})
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/by-name/jw/jwm/package.nix
similarity index 94%
rename from pkgs/applications/window-managers/jwm/default.nix
rename to pkgs/by-name/jw/jwm/package.nix
index e1c9c32e4e30..a7fa4ef9f5c4 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/by-name/jw/jwm/package.nix
@@ -27,14 +27,14 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jwm";
   version = "2.4.6";
 
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-odGqHdm8xnjEcXmpKMy51HEhbjcROLL3hRSdlbmTr2g=";
   };
 
@@ -86,4 +86,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.romildo ];
     mainProgram = "jwm";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a5b07f5deb6..64c35b16c952 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9772,10 +9772,6 @@ with pkgs;
 
   jackmix_jack1 = jackmix.override { jack = jack1; };
 
-  jwm = callPackage ../applications/window-managers/jwm { };
-
-  jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { };
-
   inherit (callPackage ../applications/networking/cluster/k3s { })
     k3s_1_33
     k3s_1_34