This commit is contained in:
nora 2024-12-20 23:50:14 +01:00
parent 4c704ec729
commit 7c3c25bd9b
5 changed files with 15 additions and 96 deletions

101
flake.lock generated
View file

@ -21,24 +21,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -46,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733484277, "lastModified": 1734622215,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,28 +41,6 @@
"type": "github" "type": "github"
} }
}, },
"jujutsu": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1733537181,
"narHash": "sha256-xGok4RSoVbno7UekyYRnCw9pj3CxQpCCBORWqrP8MZk=",
"owner": "martinvonz",
"repo": "jj",
"rev": "da3c75b3cb09d1ae98a3e07c54b6a0f06ff70ed4",
"type": "github"
},
"original": {
"owner": "martinvonz",
"repo": "jj",
"type": "github"
}
},
"minegrub-theme": { "minegrub-theme": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -104,11 +64,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733392399, "lastModified": 1734424634,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -136,11 +96,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733392399, "lastModified": 1734424634,
"narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -157,11 +117,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1733604405, "lastModified": 1734733981,
"narHash": "sha256-OaKk3KzO9E1P+kkO18axtXnBbgRUrAMHVKIjDMYcgl0=", "narHash": "sha256-hVF82L5TkfM6j9JlGZAWcajY9/NCPE+dWSfHmLXZpOo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e85a3e10d7626d651beb9c35f8f9fb573b20b924", "rev": "7fcecf724bae5ec4b70d94722563238dac97ec74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,49 +133,12 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"jujutsu": "jujutsu",
"minegrub-theme": "minegrub-theme", "minegrub-theme": "minegrub-theme",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nur": "nur" "nur": "nur"
} }
}, },
"rust-overlay": {
"inputs": {
"nixpkgs": [
"jujutsu",
"nixpkgs"
]
},
"locked": {
"lastModified": 1732242723,
"narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a",
"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"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View file

@ -20,9 +20,6 @@
# for firefox-nightly # for firefox-nightly
# firefox.url = "github:nix-community/flake-firefox-nightly"; # firefox.url = "github:nix-community/flake-firefox-nightly";
# firefox.inputs.nixpkgs.follows = "nixpkgs"; # firefox.inputs.nixpkgs.follows = "nixpkgs";
jujutsu.url = "github:martinvonz/jj";
jujutsu.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = { nixpkgs, home-manager, nur, ... }@inputs: { outputs = { nixpkgs, home-manager, nur, ... }@inputs: {

View file

@ -10,7 +10,7 @@ with pkgs; [
cargo-expand cargo-expand
cargo-mommy cargo-mommy
cargo-nextest cargo-nextest
inputs.jujutsu.packages.${pkgs.system}.jujutsu jujutsu
dig dig
fzf fzf
gcc gcc

View file

@ -10,8 +10,7 @@
# patches = [ ./change-hello-to-hi.patch ]; # patches = [ ./change-hello-to-hi.patch ];
# }); # });
# }) # })
inputs.nur.overlay inputs.nur.overlays.default
inputs.jujutsu.overlay
]; ];
# Configure your nixpkgs instance # Configure your nixpkgs instance
config = { config = {

View file

@ -24,7 +24,7 @@ in
overlays = [ overlays = [
# If you want to use overlays exported from other flakes: # If you want to use overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default # neovim-nightly-overlay.overlays.default
inputs.nur.overlay inputs.nur.overlays.default
# final: prev: { # final: prev: {
# curl = prev.curl.override { # curl = prev.curl.override {
# # vquic is sad right now. # # vquic is sad right now.