diff --git a/modules/home/default.nix b/modules/home/default.nix
index 09ddaee..38811b8 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 f982fab..6a31c91 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 5ebf066..de5840b 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 {