From 52340d132f4888552e489876db493806068bedb4 Mon Sep 17 00:00:00 2001
From: Nicholas Novak <nick@pylonlending.com>
Date: Tue, 1 Sep 2026 22:54:23 +0000
Subject: [PATCH] Added Colin's jj settings to my config

---
 jj/.config/jj/config.toml | 49 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml
index 1166ebd..ff119df 100644
--- a/jj/.config/jj/config.toml
+++ b/jj/.config/jj/config.toml
@@ -4,3 +4,52 @@
 name = "Nicholas Novak"
 email = "nick@pylonlending.com"
 
+[ui]
+default-command = "log"
+pager = "less"
+
+[aliases]
+dup = ["duplicate"]
+fetch = ["git", "fetch"]
+push = ["git", "push"]
+recommit = ["metaedit", "--force-rewrite"]
+top = ["new", "top"]
+bottom = ["new", "bottom"]
+
+[remotes.origin]
+auto-track-bookmarks = "nick/*"
+
+[revset-aliases]
+tip = "latest(visible())"
+
+# Stack navigation
+current = "coalesce((@ & empty() & heads(@::))-, @)"
+tops = "heads(current:: ~ empty() & visible())"
+top = "exactly(tops, 1)"
+bottoms = "roots(::current & mutable() & visible())"
+bottom = "exactly(bottoms, 1)"
+stack = "bottom::top"
+stack_context = "bottoms-::heads(current:: & visible())"
+base = "exactly(coalesce(bottoms-, @), 1)"
+
+# Allow changes with graphite bookmarks to remain mutable
+"immutable_heads()" = "builtin_immutable_heads() ~ (bookmarks() & (remote_bookmarks(graphite-base/*) | remote_bookmarks(gtmq_*)))"
+
+[revsets]
+bookmark-advance-to = "@-"
+log-graph-prioritize = "coalesce(tops, trunk())"
+
+[templates]
+file_annotate = "join(' ', commit.commit_id().short(8), pad_start(12, truncate_end(12, commit.author().timestamp().ago())), pad_start(9, truncate_end(9, commit.author().name())), pad_start(3, line_number), content)"
+git_push_bookmark = '"nick/push-" ++ change_id.short(8)'
+log = '''replace(
+  regex:'#(\d{4,7})',
+  builtin_log_compact,
+  |captures| hyperlink(
+    git_web_url() ++ '/pull/' ++ captures.get(1),
+    captures.get(0)
+  )
+)'''
+
+[template-aliases]
+"format_short_signature(signature)" = "signature.name()"