From 37520496e6a463db6530ed1bd5d55d49e75b9c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Fri, 25 Apr 2025 00:58:12 +0200
Subject: [PATCH] Upgrade jj

"Unable to exchange encryption" the old one tells me.
---
 flake.nix              | 1 +
 hm/git/default.nix     | 9 ++-------
 nod/common/default.nix | 3 +++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index ee94e18..3809a3c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,6 +64,7 @@
             in
             {
               jjui = upkgs.jjui;
+              jujutsu = upkgs.jujutsu; # 24.11 version of libgit2 doesn't work with newer GitLab
               labelle = upkgs.labelle;
               orca-slicer = upkgs.orca-slicer; # Not prebuilt in 24.11 for some reason
               nextcloud-client = upkgs.nextcloud-client; # Need https://github.com/nextcloud/desktop/pull/7714
diff --git a/hm/git/default.nix b/hm/git/default.nix
index 7742d2f..c97b27f 100644
--- a/hm/git/default.nix
+++ b/hm/git/default.nix
@@ -11,7 +11,6 @@ in
   config = lib.mkIf cfg.enable {
     home.packages = [
       pkgs.jjui
-      pkgs.lazyjj
       (pkgs.writeShellApplication {
         name = "git-sync";
         text = (
@@ -89,12 +88,8 @@ in
       };
       jujutsu = {
         enable = true;
-        # Current version doesn't have the "none" signing backend
         settings = {
-          git = {
-            auto-local-bookmark = true;
-            auto-local-branch = true;
-          };
+          git.auto-local-bookmark = true;
           user = {
             email = cfg.userEmail;
             name = cfg.userName;
@@ -106,7 +101,7 @@ in
             merge-editor = "meld";
           };
           signing = lib.mkIf (!builtins.isNull cfg.signing) {
-            sign-all = true;
+            behaviour = "own";
             backend = "gpg";
             inherit (cfg.signing) key;
             backends.gpg.allow-expired-keys = false;
diff --git a/nod/common/default.nix b/nod/common/default.nix
index 0e3e969..360d2f3 100644
--- a/nod/common/default.nix
+++ b/nod/common/default.nix
@@ -34,3 +34,6 @@
   }/share/fonts/truetype/NerdFonts/DejaVuSansMNerdFont-Regular.ttf";
   time.timeZone = "Europe/Amsterdam";
 }
+# TODO SSH: https://github.com/nix-community/nix-on-droid/wiki/SSH-access#nix-on-droid-config but using /etc or something. ssh-keygen -A should work then
+# TODO OpenKeyChain support. https://github.com/DDoSolitary/okc-agents compiles with nixpkgs#{cargo,gcc} and okc-gpg works out of the box.
+# okc-ssh-agent doesn't seem to get/process answers from OkcAgent, despite connection being done (logs not printing is a different issue, s/tokio::Command/std::process::Command/ to fix).