From 39a553dc78c058de8e35b77608f0fe418df3cb87 Mon Sep 17 00:00:00 2001
From: Noratrieb <48135649+Noratrieb@users.noreply.github.com>
Date: Sat, 24 Feb 2024 10:56:39 +0100
Subject: [PATCH] jj

---
 custom-pkgs/default.nix          | 16 -------
 flake.lock                       | 81 ++++++++++++++++++++++++++++++++
 flake.nix                        |  3 ++
 home-manager/common-packages.nix |  4 +-
 home-manager/desktop.nix         |  3 +-
 home-manager/laptop.nix          |  1 +
 6 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/custom-pkgs/default.nix b/custom-pkgs/default.nix
index f251762..9c38191 100644
--- a/custom-pkgs/default.nix
+++ b/custom-pkgs/default.nix
@@ -1,21 +1,5 @@
 pkgs: {
   cargo-bisect-rustc = import ./cargo-bisect-rustc/default.nix pkgs;
-  jujutsu = pkgs.stdenv.mkDerivation {
-    name = "jujutsu";
-    src = pkgs.fetchurl {
-      url = "https://github.com/martinvonz/jj/releases/download/v0.14.0/jj-v0.14.0-x86_64-unknown-linux-musl.tar.gz";
-      hash = "sha256-/4HbDUk9g1tqYv0Y0n/tHLP80CKqlaLKXDWxUI6aRYc=";
-    };
-    # the unpacker is too stupid to accept archives that don't have subdiretories
-    sourceRoot = ".";
-    installPhase = ''
-      mkdir -p $out/bin
-      cp jj $out/bin/jj
-    '';
-    meta = {
-      mainProgram = "jj";
-    };
-  };
   monaspace = import ./monaspace.nix pkgs;
   x = import ./x { inherit pkgs; };
 }
diff --git a/flake.lock b/flake.lock
index 6be85c3..c0b77b3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -20,6 +38,28 @@
         "type": "github"
       }
     },
+    "jujutsu": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1708757710,
+        "narHash": "sha256-oL3Zao6Ynku0l5JOMbbpch1Je8ht8WwEIK/uO4LVXHk=",
+        "owner": "martinvonz",
+        "repo": "jj",
+        "rev": "a67aa089959068db22aa6dea46864e5bd662e62b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "martinvonz",
+        "repo": "jj",
+        "type": "github"
+      }
+    },
     "minegrub-theme": {
       "inputs": {
         "nixpkgs": [
@@ -91,11 +131,52 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "jujutsu": "jujutsu",
         "minegrub-theme": "minegrub-theme",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur"
       }
+    },
+    "rust-overlay": {
+      "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,
+        "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 ec88d2d..437bebb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,9 @@
     minegrub-theme.url = "github:Lxtharia/minegrub-theme/b6f8a3a7e2fd22d72e2dbdaf563ad0bcb5c78e45";
     minegrub-theme.inputs.nixpkgs.follows = "nixpkgs";
 
+    jujutsu.url = "github:martinvonz/jj";
+    jujutsu.inputs.nixpkgs.follows = "nixpkgs";
+
     # TODO: Add any other flake you might need
     # hardware.url = "github:nixos/nixos-hardware";
   };
diff --git a/home-manager/common-packages.nix b/home-manager/common-packages.nix
index 5ef4ec5..aac29b7 100644
--- a/home-manager/common-packages.nix
+++ b/home-manager/common-packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 let
   customPkgs = import ../custom-pkgs pkgs;
   crates = import ../custom-pkgs/crates pkgs;
@@ -10,7 +10,7 @@ with pkgs; [
   cargo-expand
   cargo-mommy
   cargo-nextest
-  customPkgs.jujutsu
+  jujutsu
   dig
   fzf
   gcc
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index a73c0fb..6b2f48e 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -3,6 +3,7 @@
 
 { lib
 , pkgs
+, inputs
 , ...
 }:
 let
@@ -38,7 +39,7 @@ in
     spotify
     # rustup from nix for rust :)
     rustup
-  ] ++ import ./common-packages.nix { inherit pkgs; };
+  ] ++ import ./common-packages.nix { inherit pkgs inputs; };
 
   programs.fish = {
     enable = true;
diff --git a/home-manager/laptop.nix b/home-manager/laptop.nix
index e3c14db..edd1295 100644
--- a/home-manager/laptop.nix
+++ b/home-manager/laptop.nix
@@ -11,6 +11,7 @@
       #   });
       # })
       inputs.nur.overlay
+      inputs.jujutsu.overlay
     ];
     # Configure your nixpkgs instance
     config = {