From 286b81cb091b86daa6c28a37466e80a1d7ba980a Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sat, 11 Feb 2023 17:59:48 +0000 Subject: [PATCH] flake: update 11 Feb 2023 --- flake.lock | 47 ++++++++++++++++++++++++++++---------- flake.nix | 2 +- modules/common/default.nix | 2 +- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index b4b7f27..e530d09 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,17 @@ "nodes": { "agenix": { "inputs": { + "darwin": "darwin", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1673301561, - "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", + "lastModified": 1676134447, + "narHash": "sha256-PU+6hKp7wbxCCRF5RO5g//Q0G+Rhbj92VrprvXtTOlc=", "owner": "ryantm", "repo": "agenix", - "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", + "rev": "6053c559c59ca0ebd57330cd356964f85befaff8", "type": "github" }, "original": { @@ -20,6 +21,28 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -28,11 +51,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1673343300, - "narHash": "sha256-5Xdj6kpXYMie0MlnGwqK5FaMdsedxvyuakWtyKB3zaQ=", + "lastModified": 1675935446, + "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "176e455371a8371586e8a3ff0d56ee9f3ca2324e", + "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "type": "github" }, "original": { @@ -43,11 +66,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673345971, - "narHash": "sha256-4DfFcKLRfVUTyuGrGNNmw37IeIZSoku9tgTVmu/iD98=", + "lastModified": 1675918889, + "narHash": "sha256-hy7re4F9AEQqwZxubct7jBRos6md26bmxnCjxf5utJA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54644f409ab471e87014bb305eac8c50190bcf48", + "rev": "49efda9011e8cdcd6c1aad30384cb1dc230c82fe", "type": "github" }, "original": { @@ -59,11 +82,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1673315479, - "narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=", + "lastModified": 1675942811, + "narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd", + "rev": "724bfc0892363087709bd3a5a1666296759154b1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 72195a9..54b9b57 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ specialArgs = inputs; modules = [ ./hosts/${fqdn}/default.nix - agenix.nixosModule + agenix.nixosModules.default home-manager.nixosModule { system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; diff --git a/modules/common/default.nix b/modules/common/default.nix index 19ad4b2..8b2c868 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -36,7 +36,7 @@ environment = { systemPackages = with pkgs; [ - agenix.defaultPackage."${system}" + agenix.packages."${system}".default git htop nix