diff --git a/config/default.nix b/config/default.nix
index 6e7eac9ad..d844d0d8d 100644
--- a/config/default.nix
+++ b/config/default.nix
@@ -8,6 +8,7 @@
   ./factory
   ./ghostty
   ./hammerspoon
+  ./jj
   ./k3s
   ./karabiner
   ./opencode
diff --git a/config/jj/config.toml b/config/jj/config.toml
new file mode 100644
index 000000000..3c2b928e0
--- /dev/null
+++ b/config/jj/config.toml
@@ -0,0 +1,5 @@
+#:schema https://docs.jj-vcs.dev/latest/config-schema.json
+
+[user]
+name = "Shun Kakinoki"
+email = "shunkakinoki@gmail.com"
diff --git a/config/jj/default.nix b/config/jj/default.nix
new file mode 100644
index 000000000..998048f54
--- /dev/null
+++ b/config/jj/default.nix
@@ -0,0 +1,6 @@
+{ config, ... }:
+{
+  xdg.configFile."jj/config.toml" = {
+    source = config.lib.file.mkOutOfStoreSymlink ./config.toml;
+  };
+}
diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index ee0a99ad6..710c2a18a 100644
--- a/home-manager/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
@@ -47,6 +47,7 @@
       cat = "bat";
       e = "nvim";
       g = "git";
+      j = "jj";
       lzd = "lazydocker";
       lzg = "lazygit";
       sag = "_ssh_add_github";
diff --git a/nix-darwin/config/homebrew.nix b/nix-darwin/config/homebrew.nix
index e60cbda9a..5fdee3d75 100644
--- a/nix-darwin/config/homebrew.nix
+++ b/nix-darwin/config/homebrew.nix
@@ -30,6 +30,7 @@
       "gnupg"
       "graphviz"
       "helm"
+      "jjui"
       "kurtosis-cli"
       "mas"
       "opencode"