feat: use jj pr for lfs support

This commit is contained in:
Moritz Böhme 2025-07-31 16:19:36 +02:00
parent cf2bc5243c
commit 713c40d617
No known key found for this signature in database
GPG key ID: 970C6E89EB0547A9
3 changed files with 53 additions and 0 deletions

47
flake.lock generated
View file

@ -554,6 +554,31 @@
"type": "github" "type": "github"
} }
}, },
"jj": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1753688201,
"narHash": "sha256-w/9KRAo73+tEnn6FTewH5/FOIwf23W8UqXSDc9MCix4=",
"owner": "gusinacio",
"repo": "jj",
"rev": "8b0a360c6cf10b0dfa6ba6ecd423a4e603d8272a",
"type": "github"
},
"original": {
"owner": "gusinacio",
"ref": "lfs",
"repo": "jj",
"type": "github"
}
},
"jovian": { "jovian": {
"inputs": { "inputs": {
"nix-github-actions": "nix-github-actions", "nix-github-actions": "nix-github-actions",
@ -1062,6 +1087,7 @@
"helix": "helix", "helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"jj": "jj",
"jovian": "jovian", "jovian": "jovian",
"master": "master", "master": "master",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
@ -1121,6 +1147,27 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"jj",
"nixpkgs"
]
},
"locked": {
"lastModified": 1752892850,
"narHash": "sha256-LLvDqLiK2+dr7bQqKTnZIZ8F1H67DLt3FUyVrGolGVw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "742248f12aed0183a124637e8b27a238a47f46a2",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View file

@ -161,6 +161,7 @@
rofi-nix.url = "git+https://git.sr.ht/~fgaz/rofi-nix"; rofi-nix.url = "git+https://git.sr.ht/~fgaz/rofi-nix";
rofi.url = "github:davatorium/rofi/next"; rofi.url = "github:davatorium/rofi/next";
rofi.flake = false; rofi.flake = false;
jj.url = "github:gusinacio/jj/lfs"; # HACK: to get lfs support early
# Neovim # Neovim
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
@ -193,6 +194,8 @@
git-hooks.inputs.nixpkgs.follows = "nixpkgs"; git-hooks.inputs.nixpkgs.follows = "nixpkgs";
helix.inputs.nixpkgs.follows = "nixpkgs"; helix.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
jj.inputs.flake-utils.follows = "flake-utils";
jj.inputs.nixpkgs.follows = "nixpkgs";
jovian.inputs.nixpkgs.follows = "nixpkgs"; jovian.inputs.nixpkgs.follows = "nixpkgs";
neovim-nightly-overlay.inputs.flake-compat.follows = "flake-compat"; neovim-nightly-overlay.inputs.flake-compat.follows = "flake-compat";
neovim-nightly-overlay.inputs.flake-parts.follows = "flake-parts"; neovim-nightly-overlay.inputs.flake-parts.follows = "flake-parts";

View file

@ -1,6 +1,8 @@
{ {
lib, lib,
config, config,
inputs,
pkgs,
... ...
}: let }: let
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;
@ -11,6 +13,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.moritz.programs.jujutsu = { home-manager.users.moritz.programs.jujutsu = {
enable = true; enable = true;
package = inputs.jj.packages.${pkgs.system}.default;
settings = { settings = {
user = { user = {
email = "mail@moritzboeh.me"; email = "mail@moritzboeh.me";