diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c111812667dc..b37ea45a0c8d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15878,6 +15878,12 @@
     githubId = 60079945;
     keys = [ { fingerprint = "7590 C9DD E19D 4497 9EE9  0B14 CE96 9670 FB4B 4A56"; } ];
   };
+  madebydamo = {
+    email = "damian.d.moser@gmail.com";
+    github = "madebydamo";
+    githubId = 94169482;
+    name = "Damian Moser";
+  };
   madeddie = {
     email = "edwin@madtech.cx";
     github = "madeddie";
diff --git a/pkgs/by-name/gr/grok-cli/package.nix b/pkgs/by-name/gr/grok-cli/package.nix
new file mode 100644
index 000000000000..8c2455771374
--- /dev/null
+++ b/pkgs/by-name/gr/grok-cli/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs_latest,
+  runCommand,
+  grok-cli,
+}:
+
+buildNpmPackage rec {
+  pname = "grok-cli";
+  version = "0.0.33";
+
+  src = fetchFromGitHub {
+    owner = "superagent-ai";
+    repo = "grok-cli";
+    tag = "@vibe-kit/grok-cli@${version}";
+    hash = "sha256-4+be/H/LEMNxNTYHW7L4wDIKPm09yuYo4r08ZeBiJ4w=";
+  };
+
+  npmDepsHash = "sha256-Yl51fCnI3soQ4sGBg4dr+kVak8zYEkMTgyUKDaRK6N0=";
+
+  nativeBuildInputs = [ nodejs_latest ];
+
+  passthru.tests = {
+    help-command = runCommand "grok-help-test" { } ''
+      output="$(${grok-cli}/bin/grok --help)"
+      echo "$output" > $out
+
+      echo "$output" | grep -Eq "Usage: grok.+"
+    '';
+  };
+
+  meta = {
+    description = "AI agent CLI powered by Grok";
+    homepage = "https://github.com/superagent-ai/grok-cli";
+    license = lib.licenses.mit;
+    maintainers = with lib; [ maintainers.madebydamo ];
+    mainProgram = "grok";
+    platforms = lib.platforms.all;
+  };
+}