From 44803e51bb1badcbaf1edc9b22fcff2dd0ee1628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Sat, 13 Jan 2024 15:55:00 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20swap=20`ragenix`=20for?= =?UTF-8?q?=20`agenix`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- flake.lock | 178 ++++++++--------------------------------------------- flake.nix | 7 ++- 3 files changed, 32 insertions(+), 155 deletions(-) diff --git a/README.md b/README.md index cbe0d9d..da79f00 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Laureηt's Infrastructure
- + diff --git a/flake.lock b/flake.lock index 2160727..e4b31aa 100644 --- a/flake.lock +++ b/flake.lock @@ -54,42 +54,23 @@ }, "agenix": { "inputs": { - "agenix": "agenix_2", - "crane": "crane", - "flake-utils": "flake-utils", + "darwin": "darwin", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1682237245, - "narHash": "sha256-xbBR7LNK+d5Yi/D6FXQGc1R6u2VV2nwr/Df5iaEbOEQ=", - "owner": "yaxitech", - "repo": "ragenix", - "rev": "281f68c3d477904f79ff1cd5807a8c226cd80a50", - "type": "github" - }, - "original": { - "owner": "yaxitech", - "repo": "ragenix", - "type": "github" - } - }, - "agenix_2": { - "inputs": { - "darwin": "darwin", - "nixpkgs": [ - "agenix", - "nixpkgs" + "systems": [ + "systems" ] }, "locked": { - "lastModified": 1682101079, - "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "2994d002dcff5353ca1ac48ec584c7f6589fe447", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -163,36 +144,6 @@ } }, "crane": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "agenix", - "flake-utils" - ], - "nixpkgs": [ - "agenix", - "nixpkgs" - ], - "rust-overlay": [ - "agenix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1681680516, - "narHash": "sha256-EB8Adaeg4zgcYDJn9sR6UMjN/OHdIiMMK19+3LmmXQY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "54b63c8eae4c50172cb50b612946ff1d2bc1c75c", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -216,17 +167,16 @@ "darwin": { "inputs": { "nixpkgs": [ - "agenix", "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -243,11 +193,11 @@ ] }, "locked": { - "lastModified": 1705017253, - "narHash": "sha256-/ysUOnF/dYJXDTxi/fi4MNN7uYKRji5CKp3EIamXB+0=", + "lastModified": 1705075138, + "narHash": "sha256-0slYsXoR1Sd5FwTfFZLYxAsI015+J4lvgvo55u4Gw1A=", "owner": "nix-community", "repo": "disko", - "rev": "fa5db12d76f9e8ee11e572cdbe021230e48b6afa", + "rev": "f78b6498f69e04514cb84393e5daba669198c1c1", "type": "github" }, "original": { @@ -279,22 +229,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -353,25 +287,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -432,11 +348,11 @@ ] }, "locked": { - "lastModified": 1704980804, - "narHash": "sha256-lPNNKdPqIYcjhhYIVwlajNt/HqVWbMOoSdNnwCvOP04=", + "lastModified": 1705104164, + "narHash": "sha256-pllCu3Hcm1wP/B0SUxgUXvHeEd4w8s2aVrEQRdIL1yo=", "owner": "nix-community", "repo": "home-manager", - "rev": "93e804e7f8a1eb88bde6117cd5046501e66aa4bd", + "rev": "0912d26b30332ae6a90e1b321ff88e80492127dd", "type": "github" }, "original": { @@ -449,7 +365,7 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs", - "systems": "systems_2", + "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, @@ -527,13 +443,13 @@ }, "lanzaboote": { "inputs": { - "crane": "crane_2", - "flake-compat": "flake-compat_2", + "crane": "crane", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_3", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1704813398, @@ -951,37 +867,12 @@ "projet-oral-japonais": "projet-oral-japonais", "projet-systemes-algorithmes-repartis": "projet-systemes-algorithmes-repartis", "resume": "resume", - "systems": "systems_4", + "systems": "systems_3", "treefmt-nix": "treefmt-nix_2", "wallpaper": "wallpaper" } }, "rust-overlay": { - "inputs": { - "flake-utils": [ - "agenix", - "flake-utils" - ], - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682129965, - "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "2c417c0460b788328220120c698630947547ee83", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "flake-utils": [ "lanzaboote", @@ -1007,21 +898,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1036,7 +912,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1051,7 +927,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", diff --git a/flake.nix b/flake.nix index 81aaef0..1e3ae6b 100644 --- a/flake.nix +++ b/flake.nix @@ -25,9 +25,10 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; agenix = { - # TODO: replace by classic agenix - url = "github:yaxitech/ragenix"; + url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; + inputs.systems.follows = "systems"; }; disko = { url = "github:nix-community/disko"; @@ -180,7 +181,7 @@ packages = [ formatter # defined above pkgs.git # version control - agenix.packages.${system}.ragenix # secrets + agenix.packages.${system}.agenix # secrets pkgs.sbctl # secure boot utils ]; };