diff --git a/custom-pkgs/default.nix b/custom-pkgs/default.nix index 9c38191..f251762 100644 --- a/custom-pkgs/default.nix +++ b/custom-pkgs/default.nix @@ -1,5 +1,21 @@ 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/home-manager/common-packages.nix b/home-manager/common-packages.nix index c419423..5ef4ec5 100644 --- a/home-manager/common-packages.nix +++ b/home-manager/common-packages.nix @@ -1,5 +1,6 @@ { pkgs, ... }: let + customPkgs = import ../custom-pkgs pkgs; crates = import ../custom-pkgs/crates pkgs; in with pkgs; [ @@ -9,6 +10,7 @@ with pkgs; [ cargo-expand cargo-mommy cargo-nextest + customPkgs.jujutsu dig fzf gcc diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index d1b1a2a..a73c0fb 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -1,9 +1,7 @@ # This is your home-manager configuration file # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) -{ inputs -, lib -, config +{ lib , pkgs , ... }: