devShell: add agenix to the devShell

Progresses #11
This commit is contained in:
Fiscal Velvet Poet 2023-04-05 10:42:22 +10:00
parent 66fb43735c
commit cdb41cb22a
Signed by: fiscalvelvetpoet
GPG key ID: D8EBFD58B023BD47
4 changed files with 36 additions and 4 deletions

View file

@ -1,5 +1,26 @@
{ {
"nodes": { "nodes": {
"agenix": {
"inputs": {
"darwin": [],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1680281360,
"narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
"owner": "ryantm",
"repo": "agenix",
"rev": "e64961977f60388dd0b49572bb0fc453b871f896",
"type": "github"
},
"original": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
"colmena": { "colmena": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -208,6 +229,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix",
"colmena": "colmena", "colmena": "colmena",
"hakyll-skeleton": "hakyll-skeleton", "hakyll-skeleton": "hakyll-skeleton",
"jfdic-web": "jfdic-web", "jfdic-web": "jfdic-web",

View file

@ -2,6 +2,11 @@
description = "jfdic-ops deployment"; description = "jfdic-ops deployment";
inputs = { inputs = {
agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.darwin.follows = ""; # skip Darwin dependencies
};
hakyll-skeleton = { hakyll-skeleton = {
flake = false; flake = false;
url = git+https://source.jfdic.org/jfdic/hakyll-skeleton/?ref=consensus; url = git+https://source.jfdic.org/jfdic/hakyll-skeleton/?ref=consensus;

View file

@ -2,6 +2,7 @@
self, self,
hakyll-skeleton, hakyll-skeleton,
jfdic-web, jfdic-web,
agenix,
colmena, colmena,
nix, nix,
nixpkgs, nixpkgs,
@ -17,6 +18,7 @@ in {
devShell = devShell =
pkgs.callPackage pkgs.callPackage
./shell.nix { ./shell.nix {
inherit (agenix.packages."${pkgs.system}") agenix;
inherit (colmena.packages."${pkgs.system}") colmena; inherit (colmena.packages."${pkgs.system}") colmena;
inherit (nix.packages."${pkgs.system}") nix; inherit (nix.packages."${pkgs.system}") nix;
inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra; inherit (nixpkgsUnstable.legacyPackages."${pkgs.system}") alejandra;
@ -33,9 +35,10 @@ in {
}; };
}; };
toscano = import ./nixos/hosts/toscano/configuration.nix; toscano = import ./nixos/hosts/toscano/configuration.nix;
nixosConfigurations = import ./nixos/configurations.nix (inputs # The below lines are in the wrong place
// { #nixosConfigurations = import ./nixos/configurations.nix (inputs
inherit inputs; # // {
}); # inherit inputs;
# });
}; };
} }

View file

@ -1,5 +1,6 @@
{ {
pkgs ? import <nixpkgs> {}, pkgs ? import <nixpkgs> {},
agenix,
alejandra, alejandra,
mkShell, mkShell,
colmena, colmena,
@ -8,6 +9,7 @@
with pkgs; with pkgs;
mkShell { mkShell {
buildInputs = [ buildInputs = [
agenix # CLI management of secrets encrypted via existing SSH keys
alejandra # The Uncompromising Nix Code Formatter alejandra # The Uncompromising Nix Code Formatter
colmena # simple, stateless NixOS deployment tool colmena # simple, stateless NixOS deployment tool
nix # Powerful package manager, makes packaging reliable & reproducible nix # Powerful package manager, makes packaging reliable & reproducible