diff --git a/README.md b/README.md
index f1d5ec8..812490e 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ yay -Syu --needed $(cat arch-{shell,desktop}-packages)
 #### Install dotfiles
 ```
 rm -rf ~/.config/fish
-stow -d dotfiles bin cpupower direnv fish git gtk neofetch nvim pacman ripgrep mise starship stow wayland yay ghostty
+stow -d dotfiles bin cpupower direnv fish git gtk neofetch nvim pacman ripgrep mise starship stow wayland yay ghostty jj
 ```
 
 #### Use systemd-resolved
diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml
new file mode 100644
index 0000000..cf324e4
--- /dev/null
+++ b/jj/.config/jj/config.toml
@@ -0,0 +1,34 @@
+#:schema https://jj-vcs.github.io/jj/latest/config-schema.json
+
+[user]
+name = "Bas van den Wollenberg"
+email = "hi@bas.sh"
+
+[aliases]
+stack = ["util", "exec", "--", "bunx", "jj-stack"]
+spr = ["util", "exec", "--", "jj-spr"]
+
+[ui]
+default-command = "log"
+diff-formatter = "delta"
+
+[merge-tools.delta]
+diff-args=["--side-by-side", "$left", "$right", "--width=$width"]
+diff-expected-exit-codes = [0, 1]
+
+[signing]
+behavior = "own"
+backend = "ssh"
+key = "~/.ssh/id_ed25519_bas.pub"
+
+[templates]
+draft_commit_description = '''
+concat(
+  builtin_draft_commit_description,
+  "\nJJ: ignore-rest\n",
+  diff.git(),
+)
+'''
+
+[gg.ui]
+recent-workspaces = ["/home/bas/dev/server"]