From 09301505154d9a50db0efffe27805e1a76ed3a66 Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Thu, 22 Feb 2024 00:14:23 -0800
Subject: [PATCH] jujutsu on git ver

---
 extras/dev.nix     |  4 +--
 flake.lock         | 81 ++++++++++++++++++++++++++++++++++++++++++++++
 flake.nix          |  4 ++-
 users/tao/home.nix |  1 +
 4 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/extras/dev.nix b/extras/dev.nix
index 79d491e..4cde316 100644
--- a/extras/dev.nix
+++ b/extras/dev.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ inputs, pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     # pijul
     # vulkan-loader
@@ -6,7 +6,7 @@
     # freecad
     hyperfine
     jq
-    jujutsu
+    inputs.helix.packages.${pkgs.system}.default
     just
     lldb
     sqlite
diff --git a/flake.lock b/flake.lock
index a9b9c98..5408a27 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,6 +39,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "helix": {
       "inputs": {
         "crane": "crane",
@@ -82,6 +100,28 @@
         "type": "github"
       }
     },
+    "jujutsu": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
+        "lastModified": 1708615558,
+        "narHash": "sha256-Bt3gjUO81wIPLqm7qOz9f7fdimXkas2ReBQho7ldJOc=",
+        "owner": "martinvonz",
+        "repo": "jj",
+        "rev": "62f0cb8c3f03ade34e8862ba0cd600603fc4a91a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "martinvonz",
+        "repo": "jj",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1708091350,
@@ -165,6 +205,7 @@
       "inputs": {
         "helix": "helix",
         "home-manager": "home-manager",
+        "jujutsu": "jujutsu",
         "nixos-hardware": "nixos-hardware",
         "nixos-raspberrypi": "nixos-raspberrypi",
         "nixpkgs": "nixpkgs_2"
@@ -195,6 +236,31 @@
         "type": "github"
       }
     },
+    "rust-overlay_2": {
+      "inputs": {
+        "flake-utils": [
+          "jujutsu",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "jujutsu",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1707444620,
+        "narHash": "sha256-P8kRkiJLFttN+hbAOlm11wPxUrQZqKle+QtVCqFiGXY=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "78503e9199010a4df714f29a4f9c00eb2ccae071",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -209,6 +275,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 80d0d18..07ff1f5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,8 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     helix.url = "github:helix-editor/helix";
     helix.inputs.nixpkgs.follows = "nixpkgs";
+    jujutsu.url = "github:martinvonz/jj";
+    jujutsu.inputs.nixpkgs.follows = "nixpkgs";
     # hyprland.url = "github:hyprwm/Hyprland";
     # aagl.url = "github:ezKEa/aagl-gtk-on-nix";
     # aagl.inputs.nixpkgs.follows = "nixpkgs";
@@ -26,7 +28,7 @@
   };
 
   # outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, helix, aagl, ... }@inputs:
-  outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, helix, ... }@inputs:
+  outputs = { self, nixpkgs, nixos-hardware, nixos-raspberrypi, home-manager, helix, jujutsu, ... }@inputs:
     {
       nixosConfigurations = {
         NOcomputer = nixpkgs.lib.nixosSystem {
diff --git a/users/tao/home.nix b/users/tao/home.nix
index 0cf552a..b4417a3 100644
--- a/users/tao/home.nix
+++ b/users/tao/home.nix
@@ -18,6 +18,7 @@
             default-command = "log";
           };
       };
+      package = inputs.jujutsu.packages.${pkgs.system}.default;
     };
 
     git = {