diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/shells/hishtory/default.nix
new file mode 100644
index 000000000000..818dd4b11281
--- /dev/null
+++ b/pkgs/shells/hishtory/default.nix
@@ -0,0 +1,37 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "hishtory";
+  version = "0.208";
+
+  src = fetchFromGitHub {
+    owner = "ddworken";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-TEto5lLH5nwqJ9PaYKrYCNW4/zrIICANQlGmqwDbOm4=";
+  };
+
+  vendorHash = "sha256-FodgIELV5JbqP3h/mIDDYARZcols9ZEtVREW1853EOI=";
+
+  ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ];
+
+  excludedPackages = [ "backend/server" ];
+
+  postInstall = ''
+    mkdir -p $out/share/hishtory
+    cp client/lib/config.* $out/share/hishtory
+  '';
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Your shell history: synced, queryable, and in context";
+    homepage = "https://github.com/ddworken/hishtory";
+    license = licenses.mit;
+    maintainers = with maintainers; [ Enzime ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac3acd1fd63b..400811b3c124 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14481,6 +14481,8 @@ with pkgs;
 
   fzf-git-sh = callPackage ../shells/fzf-git-sh { };
 
+  hishtory = callPackage ../shells/hishtory { };
+
   ion = callPackage ../shells/ion { };
 
   jush = callPackage ../shells/jush { };