From 1abefd242c8c8ca09078d6d338f5b6322472d636 Mon Sep 17 00:00:00 2001
From: gwg313 <gwg313@pm.me>
Date: Fri, 24 Apr 2026 01:13:55 -0400
Subject: [PATCH] update jujutsu config

---
 modules/features/programs/cli/vc-jujutsu.nix | 32 ++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/modules/features/programs/cli/vc-jujutsu.nix b/modules/features/programs/cli/vc-jujutsu.nix
index deaaf28..ff6aae4 100644
--- a/modules/features/programs/cli/vc-jujutsu.nix
+++ b/modules/features/programs/cli/vc-jujutsu.nix
@@ -16,7 +16,39 @@
                 behavior = "own";
                 backend = "gpg";
               };
+              revset-aliases = {
+                "closest_merge(to)" = "heads(::to & merges())";
+              };
               aliases = {
+                set-trunk = [
+                  "config"
+                  "set"
+                  "--repo"
+                  "revset-aliases.'trunk()'"
+                ];
+
+                stack = [
+                  "rebase"
+                  "--after"
+                  "trunk()"
+                  "--before"
+                  "closest_merge(@)"
+                  "--revision"
+                ];
+
+                stage = [
+                  "stack"
+                  "closest_merge(@)+:: ~ empty()"
+                ];
+
+                restack = [
+                  "rebase"
+                  "--onto"
+                  "trunk()"
+                  "--source"
+                  "roots(trunk()..) & mutable()"
+                  "--simplify-parents"
+                ];
                 c = [ "commit" ];
                 ci = [
                   "commit"