From 1c89f03799304c363d8efffa104ea494aa8a4a04 Mon Sep 17 00:00:00 2001
From: Charlotte <charlotte@lottia.net>
Date: Mon, 21 Oct 2024 16:41:43 +1100
Subject: [PATCH] jujutsu: use https://github.com/martinvonz/jj/pull/3191

---
 flake.lock              | 75 ++++++++++++++++++++++++++++++++++++-----
 flake.nix               | 23 ++++++++++---
 modules/git/default.nix |  7 +---
 3 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 990d130..3276671 100644
--- a/flake.lock
+++ b/flake.lock
@@ -84,6 +84,29 @@
         "type": "github"
       }
     },
+    "jj": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": "nixpkgs",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1729491000,
+        "narHash": "sha256-9wdfsjcd+Sb+joFlQAH4mwlY744nxVD2yGpxPnXl4+Y=",
+        "owner": "charlottia",
+        "repo": "jj",
+        "rev": "d7046d4e015e0b49fe2aa5aa7a390ce9665a22ff",
+        "type": "github"
+      },
+      "original": {
+        "owner": "charlottia",
+        "ref": "ssh-openssh",
+        "repo": "jj",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -122,18 +145,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729070438,
-        "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
+        "lastModified": 1728538411,
+        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5785b6bb5eaae44e627d541023034e1601455827",
+        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "type": "indirect"
       }
     },
     "nixpkgs-stable": {
@@ -152,6 +173,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1729070438,
+        "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5785b6bb5eaae44e627d541023034e1601455827",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "plasma-manager": {
       "inputs": {
         "home-manager": [
@@ -181,13 +218,35 @@
         "flake-utils": "flake-utils",
         "furpoll": "furpoll",
         "home-manager": "home-manager",
+        "jj": "jj",
         "nix-darwin": "nix-darwin",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "plasma-manager": "plasma-manager",
         "sops-nix": "sops-nix"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "jj",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729304879,
+        "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index e677d06..a6ca6e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,34 +5,45 @@
     flake-utils.url = github:numtide/flake-utils;
 
     nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable;
+
+    nix-darwin = {
+      url = github:LnL7/nix-darwin/master;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     home-manager = {
       url = github:nix-community/home-manager;
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     sops-nix = {
       url = github:Mic92/sops-nix;
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     furpoll = {
       url = git+https://github.com/kivikakk/furpoll;
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
+
     nixos-hardware.url = github:NixOS/nixos-hardware;
+
     comenzar = {
       url = git+https://github.com/kivikakk/comenzar;
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
+
     plasma-manager = {
       url = github:nix-community/plasma-manager;
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
 
-    nix-darwin = {
-      url = github:LnL7/nix-darwin/master;
-      inputs.nixpkgs.follows = "nixpkgs";
+    jj = {
+      url = github:charlottia/jj/ssh-openssh;
+      inputs.flake-utils.follows = "flake-utils";
     };
   };
 
@@ -40,13 +51,14 @@
     self,
     flake-utils,
     nixpkgs,
+    nix-darwin,
     home-manager,
     sops-nix,
     furpoll,
     nixos-hardware,
     comenzar,
     plasma-manager,
-    nix-darwin,
+    jj,
   }: let
     mkHost = hostName: system: specifiedModules: let
       isDarwin = builtins.elem system nixpkgs.lib.platforms.darwin;
@@ -137,7 +149,8 @@
             hostConfig.module
           ]
           ++ homeManagerModules
-          ++ specifiedModules;
+          ++ specifiedModules
+          ++ [{nixpkgs.overlays = [jj.overlays.default];}];
       };
   in
     flake-utils.lib.eachDefaultSystem (system: {
diff --git a/modules/git/default.nix b/modules/git/default.nix
index a0fcad7..598a1de 100644
--- a/modules/git/default.nix
+++ b/modules/git/default.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  vyxos-git-base,
-  ...
-}: {
+{vyxos-git-base, ...}: {
   config = {
     nixpkgs.config.packageOverrides = oldPkgs: {
       vyxos-git = vyxos-git-base.overrideAttrs {