diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix
index 545fb42122..eab1b703bb 100644
--- a/nix/pkgs/default.nix
+++ b/nix/pkgs/default.nix
@@ -72,4 +72,5 @@
 
   authentik = import ./authentik args;
   flipperzero-firmware = import ./flipperzero-firmware args;
+  jj = import ./jj.nix args;
 } // (import ./heptapod-runner args)
diff --git a/nix/pkgs/jj.nix b/nix/pkgs/jj.nix
new file mode 100644
index 0000000000..fbcb21f58c
--- /dev/null
+++ b/nix/pkgs/jj.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+let
+  rev = "c52a14eac6532ba814c88f2c8c740415293bfb1a";
+  src = (pkgs.fetchFromGitHub {
+    owner = "martinvonz";
+    repo = "jj";
+    inherit rev;
+    sha256 = "1lzx4g34m2bz79jn3lqr534qwqg2wy64nxbjm2jz8razh1b3circ";
+  }) // {
+    shortRev = rev;
+  };
+  flake = (import "${src}/flake.nix").outputs {
+    self = src;
+    nixpkgs = pkgs;
+  };
+  fromFlake = (flake.overlay pkgs pkgs).jujutsu;
+in
+fromFlake
diff --git a/ops/nixos/lib/home-manager/client.nix b/ops/nixos/lib/home-manager/client.nix
index a1b440e002..99a47c1391 100644
--- a/ops/nixos/lib/home-manager/client.nix
+++ b/ops/nixos/lib/home-manager/client.nix
@@ -47,6 +47,7 @@ in
     gopls
     gotools
     graphicsmagick-imagemagick-compat
+    jj
     vault
     youtube-dl
   ] ++ lib.optionals isLinux [