reo101/rix101
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(agenix-rekey-default)!: use lib.mkDefault

Browse source
This commit is contained in:
reo101 2024-07-19 01:35:55 +03:00
parent 70d949e7e0
commit b8f75023b2
Signed by: reo101
GPG key ID: 675AA7EF13964ACB
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
machines/nixos/x86_64-linux/jeeves/configuration.nix
View file

@ -17,9 +17,9 @@
age.rekey = { age.rekey = {
hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPopSTZ81UyKp9JSljCLp+Syk51zacjh9fLteqxQ6/aB"; hostPubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPopSTZ81UyKp9JSljCLp+Syk51zacjh9fLteqxQ6/aB";
masterIdentities = [ "${inputs.self}/secrets/privkey.age" ]; # masterIdentities = [ "${inputs.self}/secrets/privkey.age" ];
storageMode = "derivation"; # storageMode = "local";
# forceRekeyOnSystem = "aarch64-linux"; # localStorageDir = "${inputs.self}/secrets/rekeyed/${config.networking.hostName}";
}; };
nixpkgs = { nixpkgs = {

6
modules/nixos/agenix-rekey-default/default.nix
View file

@ -6,9 +6,9 @@ in {
# TODO: cleaner deep check # TODO: cleaner deep check
config = lib.mkIf (lib.all lib.id [(builtins.hasAttr "age" options) (builtins.hasAttr "rekey" options.age)]) { config = lib.mkIf (lib.all lib.id [(builtins.hasAttr "age" options) (builtins.hasAttr "rekey" options.age)]) {
age.rekey = lib.mkIf (config.age.rekey.hostPubkey != dummyPubkey) { age.rekey = lib.mkIf (config.age.rekey.hostPubkey != dummyPubkey) {
masterIdentities = [ "${inputs.self}/secrets/privkey.age" ]; masterIdentities = lib.mkDefault [ "${inputs.self}/secrets/privkey.age" ];
storageMode = "local"; storageMode = lib.mkDefault "local";
localStorageDir = "${inputs.self}/secrets/rekeyed/${config.networking.hostName}"; localStorageDir = lib.mkDefault "${inputs.self}/secrets/rekeyed/${config.networking.hostName}";
}; };
}; };
} }