diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/by-name/lu/lunatask/package.nix
similarity index 55%
rename from pkgs/applications/misc/lunatask/default.nix
rename to pkgs/by-name/lu/lunatask/package.nix
index 82b30866f842..92277537961a 100644
--- a/pkgs/applications/misc/lunatask/default.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -1,32 +1,36 @@
-{ lib, appimageTools, fetchurl }:
+{
+  lib,
+  appimageTools,
+  fetchurl,
+}:
 
 let
-  version = "2.0.11";
+  version = "2.0.12";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://lunatask.app/download/Lunatask-${version}.AppImage";
-    sha256 = "sha256-aGU8WsC3jLg8xOF7HzW6oGxizBa3afiT+qS1oyi1r7o=";
+    hash = "sha256-z1c3ACIRF8+iIy4ihEWqRDzalHyN5AvOdBxQG9sCXVs=";
   };
 
-  appimageContents = appimageTools.extractType2 {
+  appimageContents = appimageTools.extract {
     inherit pname version src;
   };
 
 in
-appimageTools.wrapType2 rec {
+appimageTools.wrapType2 {
   inherit pname version src;
 
   extraInstallCommands = ''
-    install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
-    install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace 'Exec=AppRun' 'Exec=${pname}'
+    install -m 444 -D -t $out/share/applications ${appimageContents}/lunatask.desktop
+    install -m 444 -D -t $out/share/icons/hicolor/512x512/apps ${appimageContents}/lunatask.png
+    substituteInPlace $out/share/applications/lunatask.desktop \
+      --replace-fail 'Exec=AppRun' 'Exec=lunatask'
   '';
 
   passthru.updateScript = ./update.py;
 
-  meta = with lib; {
+  meta = {
     description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app";
     longDescription = ''
       Lunatask is an all-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app. It remembers stuff for you and keeps track of your mental health.
@@ -34,9 +38,9 @@ appimageTools.wrapType2 rec {
     homepage = "https://lunatask.app";
     downloadPage = "https://lunatask.app/download";
     changelog = "https://lunatask.app/releases/${version}";
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ henkery ];
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ zi3m5f ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "lunatask";
   };
diff --git a/pkgs/applications/misc/lunatask/update.py b/pkgs/by-name/lu/lunatask/update.py
similarity index 100%
rename from pkgs/applications/misc/lunatask/update.py
rename to pkgs/by-name/lu/lunatask/update.py
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f199f58a0e66..1d3c9fa021e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9089,8 +9089,6 @@ with pkgs;
 
   ltwheelconf = callPackage ../applications/misc/ltwheelconf { };
 
-  lunatask = callPackage ../applications/misc/lunatask { };
-
   lvmsync = callPackage ../tools/backup/lvmsync { };
 
   kapp = callPackage ../tools/networking/kapp { };