Noratrieb/nixos
1
0
Fork 0
mirror of https://github.com/Noratrieb/nixos.git synced 2026-01-14 11:45:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

jj

Browse source
This commit is contained in:
nora 2024-02-24 10:56:39 +01:00
parent cbb2b5bdbd
commit a2629a1a6e
6 changed files with 89 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
custom-pkgs/default.nix
View file

@ -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; };
}

81
flake.lock generated
View file

@ -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",

3
flake.nix
View file

@ -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";
};

4
home-manager/common-packages.nix
View file

@ -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

3
home-manager/desktop.nix
View file

@ -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;

1
home-manager/laptop.nix
View file

@ -11,6 +11,7 @@
# });
# })
inputs.nur.overlay
inputs.jujutsu.overlay
];
# Configure your nixpkgs instance
config = {