From 6b777604153d3d05e612b49ff90260a4f29a3e0a Mon Sep 17 00:00:00 2001 From: Craige McWhirter Date: Fri, 23 Aug 2024 20:07:08 +1000 Subject: [PATCH] chore(nix): add ragenix --- flake.lock | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 4 ++ outputs.nix | 2 + shell.nix | 2 + 4 files changed, 197 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 540ca6b..d709128 100644 --- a/flake.lock +++ b/flake.lock @@ -130,6 +130,30 @@ "type": "github" } }, + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": [ + "ragenix", + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "owner": "ryantm", + "repo": "agenix", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "blank": { "locked": { "lastModified": 1625557891, @@ -822,6 +846,27 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708794349, + "narHash": "sha256-jX+B1VGHT0ruHHL5RwS8L21R6miBn4B6s9iVyUJsJJY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "2c94ff9a6fbeb9f3ea0107f28688edbe9c81deaa", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "customConfig": { "locked": { "lastModified": 1630400035, @@ -921,6 +966,29 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "devshell": { "inputs": { "flake-utils": [ @@ -1930,6 +1998,24 @@ "type": "github" } }, + "flake-utils_27": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_3": { "locked": { "lastModified": 1659877975, @@ -2648,6 +2734,28 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "ragenix", + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "hpc-coveralls": { "flake": false, "locked": { @@ -5801,6 +5909,30 @@ "type": "github" } }, + "ragenix": { + "inputs": { + "agenix": "agenix", + "crane": "crane", + "flake-utils": "flake-utils_27", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1718869541, + "narHash": "sha256-smhpGh1x/8mNl+sFL8SbeWnx0bK4HWjmdRA3mIwGjPU=", + "owner": "yaxitech", + "repo": "ragenix", + "rev": "8a254bbaa93fbd38e16f70fa81af6782794e046e", + "type": "github" + }, + "original": { + "owner": "yaxitech", + "repo": "ragenix", + "type": "github" + } + }, "root": { "inputs": { "cardano-node": "cardano-node", @@ -5810,9 +5942,35 @@ "nix": "nix_4", "nixpkgs": "nixpkgs_36", "nixpkgsUnstable": "nixpkgsUnstable", + "ragenix": "ragenix", "utils": "utils_13" } }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "ragenix", + "flake-utils" + ], + "nixpkgs": [ + "ragenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708740535, + "narHash": "sha256-NCTw235XwSDbeTAtAwg/hOeNOgwYhVq7JjDdbkOgBeA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "9b24383d77f598716fa0cbb8b48c97249f5ee1af", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "stable": { "locked": { "lastModified": 1669735802, @@ -6256,6 +6414,36 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tullia": { "inputs": { "nix-nomad": "nix-nomad", @@ -6485,7 +6673,7 @@ }, "utils_13": { "inputs": { - "systems": "systems" + "systems": "systems_3" }, "locked": { "lastModified": 1689068808, diff --git a/flake.nix b/flake.nix index 17faaf1..71b0b25 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ nix.url = "github:NixOS/nix/?ref=2.24.3"; nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-24.05; nixpkgsUnstable.url = github:NixOS/nixpkgs/?ref=nixos-unstable; + ragenix = { + url = github:yaxitech/ragenix; + inputs.nixpkgs.follows = "nixpkgs"; + }; utils.url = "github:numtide/flake-utils"; }; diff --git a/outputs.nix b/outputs.nix index a5c0cb4..f24bfaf 100644 --- a/outputs.nix +++ b/outputs.nix @@ -5,6 +5,7 @@ nix, nixpkgs, nixpkgsUnstable, + ragenix, utils, ... } @ inputs: @@ -18,6 +19,7 @@ in { ./shell.nix { inherit (colmena.packages."${pkgs.system}") colmena; inherit (nix.packages."${pkgs.system}") nix; + inherit (ragenix.packages."${pkgs.system}") ragenix; inherit deploymentName; inherit nix_path; }; diff --git a/shell.nix b/shell.nix index 79d6f31..08db02d 100644 --- a/shell.nix +++ b/shell.nix @@ -5,6 +5,7 @@ mkShell, nix, nix_path, + ragenix, }: with pkgs; mkShell { @@ -13,6 +14,7 @@ with pkgs; colmena # Simple, stateless NixOS deployment tool nix # Powerful package manager, makes packaging reliable & reproducible nixops_unstable_minimal # work around for issue #127423 + ragenix # CLI management of secrets encrypted via existing SSH keys tea # Gitea official CLI client treefmt # one CLI to format the code tree ];