mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-10 23:00:39 +02:00
Code Activity

feat: use flake-parts for agenix-rekey

Browse source
This commit is contained in:
oddlama 2024-05-29 15:19:10 +02:00
parent 78f79917f1
commit 6fd64972fa
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
4 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -51,11 +51,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1713903302, "lastModified": 1716983518,
"narHash": "sha256-qPy0BYFTenmyG4EU+oXej0V/i4jSsVvWbGGrv9Sb0kQ=", "narHash": "sha256-LdiPzaq6IwCfEpjaZfndO1CtW1ah1ONwyXKPs7s6UVk=",
"owner": "oddlama", "owner": "oddlama",
"repo": "agenix-rekey", "repo": "agenix-rekey",
"rev": "8da0392e75373711604a07907de25ec9d5277384", "rev": "8cf73841a6fa127a64392c8603ce51af1c63b33f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -617,11 +617,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1694529238,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -96,8 +96,6 @@
outputs = inputs: outputs = inputs:
inputs.flake-parts.lib.mkFlake {inherit inputs;} { inputs.flake-parts.lib.mkFlake {inherit inputs;} {
imports = [ imports = [
inputs.devshell.flakeModule
inputs.pre-commit-hooks.flakeModule
./nix/devshell.nix ./nix/devshell.nix
./nix/agenix-rekey.nix ./nix/agenix-rekey.nix
./nix/globals.nix ./nix/globals.nix
@ -189,8 +187,6 @@
import ./lib inputs import ./lib inputs
++ import ./pkgs/default.nix ++ import ./pkgs/default.nix
++ [ ++ [
inputs.agenix-rekey.overlays.default
inputs.devshell.overlays.default
inputs.nix-topology.overlays.default inputs.nix-topology.overlays.default
inputs.nixos-extra-modules.overlays.default inputs.nixos-extra-modules.overlays.default
]; ];

42
nix/agenix-rekey.nix
View file

@ -1,23 +1,37 @@
{inputs, ...}: { {
flake = {config, ...}: { inputs,
self,
...
}: {
imports = [
inputs.agenix-rekey.flakeModule
];
flake = {
# The identities that are used to rekey agenix secrets and to # The identities that are used to rekey agenix secrets and to
# decrypt all repository-wide secrets. # decrypt all repository-wide secrets.
secretsConfig = { secretsConfig = {
masterIdentities = [../secrets/yk1-nix-rage.pub]; masterIdentities = [../secrets/yk1-nix-rage.pub];
extraEncryptionPubkeys = [../secrets/backup.pub]; extraEncryptionPubkeys = [../secrets/backup.pub];
}; };
agenix-rekey = inputs.agenix-rekey.configure {
userFlake = inputs.self;
inherit (config) nodes pkgs;
};
}; };
perSystem.devshells.default.env = [ perSystem = {config, ...}: {
{ agenix-rekey.nodes = self.nodes;
# Always add files to git after agenix rekey and agenix generate. devshells.default = {
name = "AGENIX_REKEY_ADD_TO_GIT"; commands = [
value = "true"; {
} inherit (config.agenix-rekey) package;
]; help = "Edit, generate and rekey secrets";
}
];
env = [
{
# Always add files to git after agenix rekey and agenix generate.
name = "AGENIX_REKEY_ADD_TO_GIT";
value = "true";
}
];
};
};
} }

15
nix/devshell.nix
View file

@ -1,4 +1,9 @@
{ {inputs, ...}: {
imports = [
inputs.devshell.flakeModule
inputs.pre-commit-hooks.flakeModule
];
perSystem = { perSystem = {
config, config,
pkgs, pkgs,
@ -27,10 +32,6 @@
package = pkgs.deploy; package = pkgs.deploy;
help = "Build and deploy this nix config to nodes"; help = "Build and deploy this nix config to nodes";
} }
{
package = pkgs.agenix-rekey;
help = "Edit and rekey secrets";
}
{ {
package = pkgs.alejandra; package = pkgs.alejandra;
help = "Format nix code"; help = "Format nix code";
@ -43,10 +44,6 @@
package = pkgs.deadnix; package = pkgs.deadnix;
help = "Find unused expressions in nix code"; help = "Find unused expressions in nix code";
} }
{
package = pkgs.update-nix-fetchgit;
help = "Update fetcher hashes inside nix files";
}
{ {
package = pkgs.nix-tree; package = pkgs.nix-tree;
help = "Interactively browse dependency graphs of Nix derivations"; help = "Interactively browse dependency graphs of Nix derivations";