diff --git a/flake.lock b/flake.lock index 43246fc..90db656 100644 --- a/flake.lock +++ b/flake.lock @@ -1,18 +1,12 @@ { "nodes": { "crane": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1717535930, - "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "lastModified": 1739936662, + "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", "owner": "ipetkov", "repo": "crane", - "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", "type": "github" }, "original": { @@ -234,35 +228,36 @@ }, "lanzaboote": { "inputs": { - "crane": "crane", + "crane": [ + "crane" + ], "flake-compat": [ "flake-compat" ], "flake-parts": [ "flake-parts" ], - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ], "pre-commit-hooks-nix": [ "git-hooks-nix" ], - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { - "lastModified": 1718178907, - "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.1", + "ref": "v0.4.2", "repo": "lanzaboote", "type": "github" } @@ -407,6 +402,7 @@ }, "root": { "inputs": { + "crane": "crane", "devshell": [ "rebmit", "devshell" @@ -440,6 +436,7 @@ ], "preservation": "preservation", "rebmit": "rebmit", + "rust-overlay": "rust-overlay", "sops-nix": "sops-nix", "treefmt-nix": [ "rebmit", @@ -449,21 +446,16 @@ }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], "nixpkgs": [ - "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1717813066, - "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "lastModified": 1740018520, + "narHash": "sha256-mU6H0Q1WPn0XuwBO9SLZb/1yeVMfvsifBJcXNlhB+Ts=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "rev": "7f6ecf3b7c5bfcc4730943a767630122efd09dc8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 43b5900..6ee59f5 100644 --- a/flake.nix +++ b/flake.nix @@ -45,11 +45,12 @@ inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.1"; + url = "github:nix-community/lanzaboote/v0.4.2"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; - inputs.flake-utils.follows = "flake-utils"; inputs.flake-compat.follows = "flake-compat"; + inputs.crane.follows = "crane"; + inputs.rust-overlay.follows = "rust-overlay"; inputs.pre-commit-hooks-nix.follows = "git-hooks-nix"; }; @@ -74,6 +75,11 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; + crane.url = "github:ipetkov/crane"; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # misc diff --git a/home-manager/profiles/git/default.nix b/home-manager/profiles/git/default.nix index 5b49e89..4689d5c 100644 --- a/home-manager/profiles/git/default.nix +++ b/home-manager/profiles/git/default.nix @@ -1,16 +1,17 @@ -{ lib, ... }: +{ ... }: { programs.git = { enable = true; lfs.enable = true; + signing = { + format = "ssh"; + key = "~/.ssh/id_ed25519"; + }; extraConfig = { commit.gpgSign = true; - signing.format = "ssh"; pull.rebase = true; init.defaultBranch = "master"; fetch.prune = true; }; }; - - programs.git.signing.key = lib.mkDefault "~/.ssh/id_ed25519"; }