From 61f2e9dff70403cb8da90f3c93c14aed67cf564a Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Tue, 25 Nov 2025 10:36:27 -0500 Subject: [PATCH] update agenix and setup follows --- flake.lock | 119 +++++++++++++++-------------------------------------- flake.nix | 5 +++ 2 files changed, 38 insertions(+), 86 deletions(-) diff --git a/flake.lock b/flake.lock index 9977877..35ebc13 100644 --- a/flake.lock +++ b/flake.lock @@ -14,17 +14,23 @@ }, "agenix": { "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "darwin": [ + "nix-darwin" + ], + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -60,7 +66,7 @@ "devshell": "devshell", "flake-parts": "flake-parts_3", "haskell-flake": "haskell-flake_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "treefmt-nix": "treefmt-nix" }, @@ -160,28 +166,6 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1751313918, - "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "devour-flake": { "flake": false, "locked": { @@ -309,7 +293,7 @@ "heist-extra": "heist-extra", "lvar": "lvar", "nixos-unified": "nixos-unified", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "unionmount": "unionmount" }, "locked": { @@ -795,27 +779,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752402455, - "narHash": "sha256-mCHfZhQKdTj2JhCFcqfOfa3uKZbwUkPQbd0/zPnhOE8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "bf893ad4cbf46610dd1b620c974f824e266cd1df", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -914,7 +877,7 @@ "htmx-extensions": "htmx-extensions", "lvar": "lvar_2", "nixos-unified": "nixos-unified_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "servant-event-stream": "servant-event-stream", "tabler-icons": "tabler-icons", "unionmount": "unionmount_2", @@ -1216,7 +1179,7 @@ "nixos-vscode-server": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1684517665, @@ -1234,16 +1197,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", - "owner": "NixOS", + "lastModified": 1752900028, + "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1276,22 +1239,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1752900028, - "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6b4955211758ba47fac850c040a27f23b9b4008f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1738264807, "narHash": "sha256-6x6WLFwoLdR3w3FYtCnLye2Xe32SqsL7Zf0jpa5wJMM=", @@ -1307,7 +1254,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1758029226, "narHash": "sha256-TjqVmbpoCqWywY9xIZLTf6ANFvDCXdctCjoYuYPYdMI=", @@ -1323,7 +1270,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1682526928, "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", @@ -1336,7 +1283,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1757014016, "narHash": "sha256-i+/3jrkW5j4BHWMuZ7+GP36bW6KltMdZipzWiYZO8HY=", @@ -1352,7 +1299,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1701436327, "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", @@ -1366,7 +1313,7 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1755577059, "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=", @@ -1382,7 +1329,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1760349414, "narHash": "sha256-W4Ri1ZwYuNcBzqQQa7NnWfrv0wHMo7rduTWjIeU9dZk=", @@ -1423,7 +1370,7 @@ }, "nuenv": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { @@ -1528,7 +1475,7 @@ "flake-parts": "flake-parts_2", "git-hooks": "git-hooks_2", "github-nix-ci": "github-nix-ci", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "imako": "imako", "jumphost-nix": "jumphost-nix", "landrun-nix": "landrun-nix", @@ -1539,7 +1486,7 @@ "nixos-hardware": "nixos-hardware", "nixos-unified": "nixos-unified_3", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nuenv": "nuenv", "try": "try", @@ -1783,7 +1730,7 @@ "try": { "inputs": { "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1756813707, @@ -1846,7 +1793,7 @@ "nix-serve-ng": "nix-serve-ng", "nix-systems": "nix-systems", "nixos-unified": "nixos-unified_4", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "process-compose-flake": "process-compose-flake", "record-hasfield": "record-hasfield", "servant-event-stream": "servant-event-stream_2", diff --git a/flake.nix b/flake.nix index eeca151..4afbe9a 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,11 @@ disko.url = "github:nix-community/disko"; disko.inputs.nixpkgs.follows = "nixpkgs"; agenix.url = "github:ryantm/agenix"; + agenix.inputs = { + darwin.follows = "nix-darwin"; + home-manager.follows = "home-manager"; + nixpkgs.follows = "nixpkgs"; + }; nuenv.url = "github:hallettj/nuenv/writeShellApplication"; # Software inputs