From 52789b71e75baaa5ad939840e646cda2694de8eb Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Mon, 3 Feb 2025 15:32:23 +0100
Subject: [PATCH] jj: use upstream main w/git subprocess support

---
 flake.nix           | 2 +-
 home/common/vcs.nix | 7 ++++++-
 home/dln/home.nix   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index f72d553..d4de165 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
 
   inputs = {
     ghostty.url = "github:ghostty-org/ghostty";
-    jujutsu.url = "github:dln/jj/openssh";
+    jujutsu.url = "github:jj-vcs/jj/main";
     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
diff --git a/home/common/vcs.nix b/home/common/vcs.nix
index 956612a..4e3d18a 100644
--- a/home/common/vcs.nix
+++ b/home/common/vcs.nix
@@ -1,4 +1,9 @@
-{ config, inputs, pkgs, ... }:
+{
+  config,
+  inputs,
+  pkgs,
+  ...
+}:
 {
 
   home.packages = with pkgs; [
diff --git a/home/dln/home.nix b/home/dln/home.nix
index 8288f2c..b78fe99 100644
--- a/home/dln/home.nix
+++ b/home/dln/home.nix
@@ -43,7 +43,6 @@ in
 
   programs.helix = {
     enable = true;
-    # extraPackages = [];
   };
 
   programs.jujutsu = {
@@ -62,6 +61,7 @@ in
 
       git = {
         push-bookmark-prefix = "dln/push-";
+        subprocess = true;
       };
 
       ui = {