diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix
index 1befad040dec..367f36c6dbfa 100644
--- a/pkgs/by-name/do/dooit/package.nix
+++ b/pkgs/by-name/do/dooit/package.nix
@@ -5,53 +5,54 @@
   python311,
   testers,
   nix-update-script,
+  extraPackages ? [ ],
 }:
 let
   python3 = python311;
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "dooit";
-  version = "2.2.0";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "kraanzu";
+    owner = "dooit-org";
     repo = "dooit";
-    rev = "v${version}";
-    hash = "sha256-GtXRzj+o+FClleh73kqelk0JrSyafZhf847lX1BiS9k=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-DPmCADFduGc5n+6q9zl0f4x9C6RmzLvBeYh2j0ZSpH0=";
   };
 
   build-system = with python3.pkgs; [ poetry-core ];
 
   pythonRelaxDeps = [
     "tzlocal"
+    "textual"
+    "sqlalchemy"
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
-    appdirs
-    pyperclip
-    python-dateutil
-    pyyaml
-    (textual.overridePythonAttrs (oldAttrs: {
-      version = "0.47.1";
-      src = fetchFromGitHub {
-        owner = "Textualize";
-        repo = "textual";
-        rev = "refs/tags/v0.47.1";
-        hash = "sha256-RFaZKQ+0o6ZvfZxx95a1FjSHVJ0VOIAfzkdxYQXYBKU=";
-      };
-      disabledTests = [
-        "test_tracked_slugs"
-        "test_textual_env_var"
-        "test_register_language"
-        "test_register_language_existing_language"
-      ];
-    }))
-    tzlocal
-  ];
+  propagatedBuildInputs =
+    with python3.pkgs;
+    [
+      pyperclip
+      textual
+      pyyaml
+      python-dateutil
+      sqlalchemy
+      platformdirs
+      tzlocal
+      click
+    ]
+    ++ extraPackages;
 
-  # No tests available
-  doCheck = false;
+  # /homeless-shelter
+  preBuild = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  checkInputs = with python3.pkgs; [
+    pytestCheckHook
+    faker
+  ];
 
   passthru = {
     tests.version = testers.testVersion {
@@ -64,8 +65,8 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "TUI todo manager";
-    homepage = "https://github.com/kraanzu/dooit";
-    changelog = "https://github.com/kraanzu/dooit/blob/v${version}/CHANGELOG.md";
+    homepage = "https://github.com/dooit-org/dooit";
+    changelog = "https://github.com/dooit-org/dooit/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
       khaneliman