From 45482ab529279dbbd47b87a9603ebd2e129f01ff Mon Sep 17 00:00:00 2001
From: clover caruso <git@paperclover.net>
Date: Sun, 31 Aug 2025 21:30:48 -0700
Subject: [PATCH] add jujutsu

---
 modules/home/default.nix   | 22 ++++++++++++++++++++++
 modules/neovim/default.nix |  1 +
 users/clover/home.nix      |  2 ++
 3 files changed, 25 insertions(+)

diff --git a/modules/home/default.nix b/modules/home/default.nix
index 09ddaee898e5e9bfc907f4e79de87ce51af4f6ad..38811b880fb60af75ae564d2ba787a1a7c7f2dd7 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -77,6 +77,7 @@ in
           # ViM and Neovim
           ".*.swp"
           ".nvimlog"
+          ".jj"
         ];
       };
 
@@ -134,6 +135,27 @@ in
         autocd = true;
         history.size = 10000;
       };
+      jujutsu = {
+        settings = {
+          user = {
+            email = config.programs.git.userEmail;
+            name = config.programs.git.userName;
+          };
+          signing = {
+            behavior = "own";
+            backend = "ssh";
+            key = "~/.ssh/id_ed25519.pub";
+          };
+          git = {
+            sign-on-push = true;
+            push-new-bookmarks = true;
+          };
+          ui = {
+            default-command = "log";
+            pager = "${pkgs.bat}/bin/bat --style=plain";
+          };
+        };
+      };
 
       ghostty.settings.custom-shader = lib.mkIf (
         cfg.ghostty.shader != null
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index f982fab390bef61b56284ceb5d8d92281adfc658..6a31c91a848672da9814e0b6bd9e5c5ad48a29f8 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -131,6 +131,7 @@
           hide_dotfiles = false;
           never_show = [
             ".git"
+            ".jj"
             ".DS_Store" # macOS
             "thumbs.db" # Windows
           ];
diff --git a/users/clover/home.nix b/users/clover/home.nix
index 5ebf066d1c06a405cd19d06fca99618d6a85738f..de5840b081b97253c5991ee78fac02dba651a767 100644
--- a/users/clover/home.nix
+++ b/users/clover/home.nix
@@ -81,6 +81,8 @@ in
     # use a git-specific email
     git.userEmail = "git@paperclover.net";
 
+    jujutsu.enable = true;
+
     ssh = {
       enable = true;
       matchBlocks = rec {
-- 
2.54.0