From 58d2b4a2031f76c8ef5d536a0c600254bf7050bc Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 27 Feb 2025 06:11:38 -0500
Subject: [PATCH] revert: "seth/jj: drop"

Refs: 1067034
---
 users/seth/mixins/default.nix |  1 +
 users/seth/mixins/jj.nix      | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 users/seth/mixins/jj.nix

diff --git a/users/seth/mixins/default.nix b/users/seth/mixins/default.nix
index e898b0ee..1668f234 100644
--- a/users/seth/mixins/default.nix
+++ b/users/seth/mixins/default.nix
@@ -11,6 +11,7 @@
     ./git.nix
     ./gnome.nix
     ./gpg.nix
+    ./jj.nix
     ./mangohud.nix
     ./niri.nix
     ./nu.nix
diff --git a/users/seth/mixins/jj.nix b/users/seth/mixins/jj.nix
new file mode 100644
index 00000000..54b83a1e
--- /dev/null
+++ b/users/seth/mixins/jj.nix
@@ -0,0 +1,33 @@
+{ config, lib, ... }:
+
+{
+  assertions = [
+    {
+      assertion =
+        config.programs.jujutsu.enable -> (config.programs.git.enable && config.programs.gh.enable);
+      message = "`programs.git` and `programs.gh` are required to use `programs.jujutsu`";
+    }
+  ];
+
+  programs = {
+    jujutsu = {
+      enable = lib.mkDefault config.programs.git.enable;
+
+      settings = {
+        user = {
+          name = "Seth Flynn";
+          email = "getchoo@tuta.io";
+
+          # https://github.com/jj-vcs/jj/issues/4979
+          git.subprocess = true;
+        };
+
+        signing = {
+          sign-all = true;
+          backend = "gpg";
+          key = "D31BD0D494BBEE86";
+        };
+      };
+    };
+  };
+}