diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix
new file mode 100644
index 000000000000..db20f0e920cf
--- /dev/null
+++ b/pkgs/servers/search/khoj/default.nix
@@ -0,0 +1,75 @@
+{ lib
+, fetchFromGitHub
+, python3Packages
+, qt6
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "khoj";
+  version = "0.2.5";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "debanjum";
+    repo = "khoj";
+    rev = version;
+    hash = "sha256-cylZNRyHMFJiBjlEtKMpRjRjwQyb7pgOjMtxFhKFU4k=";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    aiofiles
+    dateparser
+    defusedxml
+    fastapi
+    huggingface-hub
+    jinja2
+    numpy
+    openai
+    pillow
+    pydantic
+    pyqt6
+    pyyaml
+    schedule
+    sentence-transformers
+    torch
+    torchvision
+    transformers
+    uvicorn
+  ];
+
+  buildInputs = with qt6; [
+    qtwayland
+  ];
+
+  nativeBuildInputs = with qt6; [
+    wrapQtAppsHook
+  ];
+
+  checkInputs = with python3Packages; [
+    pytest
+  ];
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "aiofiles == 0.8.0" "aiofiles >= 0.8.0" \
+      --replace "openai == 0.20.0" "openai >= 0.20.0" \
+      --replace "pytest == 7.1.2" "pytest >= 7.1.2" \
+      --replace "fastapi == 0.77.1" "fastapi >= 0.77.1" \
+      --replace "numpy == 1.22.4" "numpy >= 1.22.4" \
+      --replace "huggingface_hub == 0.8.1" "huggingface_hub >= 0.8.1" \
+      --replace "dateparser == 1.1.1" "dateparser >= 1.1.1" \
+      --replace "sentence-transformers == 2.1.0" "sentence-transformers >= 2.1.0" \
+      --replace "transformers == 4.21.0" "transformers >= 4.21.0" \
+      --replace "torchvision == 0.14.1" "torchvision" \
+      --replace "pydantic == 1.9.1" "pydantic >= 1.9.1" \
+      --replace "pyqt6 == 6.3.1" "pyqt6 >= 6.3.1" \
+      --replace "uvicorn == 0.17.6" "uvicorn >= 0.17.6"
+  '';
+
+  meta = with lib; {
+    description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos";
+    homepage = "https://github.com/debanjum/khoj";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ dit7ya ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 170a9195d1f1..dd7b79297311 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30628,6 +30628,8 @@ with pkgs;
 
   khal = callPackage ../applications/misc/khal { };
 
+  khoj = callPackage ../servers/search/khoj { };
+
   khard = callPackage ../applications/misc/khard { };
 
   kid3 = libsForQt5.callPackage ../applications/audio/kid3 { };