Andromeda/conf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename secrets

Browse Source
This commit is contained in:
andromeda
2026-01-05 14:35:42 +01:00
parent 0fee255cbf
commit 2114c6c347
9 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
machines/109-199-104-83/configuration.nix
View File

@@ -25,7 +25,7 @@
x509.useACMEHost = config.mailserver.fqdn; x509.useACMEHost = config.mailserver.fqdn;
loginAccounts = { loginAccounts = {
"test@${config.networking.domain}" = { "test@${config.networking.domain}" = {
hashedPasswordFile = builtins.toString config.age.secrets.secret3.path; hashedPasswordFile = builtins.toString config.age.secrets.mailserver-acc-test-pw.path;
}; };
}; };
}; };

4
machines/lenovo/configuration.nix
View File

@@ -9,10 +9,6 @@
./impermanence.nix ./impermanence.nix
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
age.secrets = {
secret0.file = ../../secrets/secret0.age;
secret1.file = ../../secrets/secret1.age;
};
boot.loader = { boot.loader = {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
systemd-boot.enable = true; systemd-boot.enable = true;

7
pub-keys.nix
View File

@@ -1,9 +1,8 @@
{ {
age.secrets = { age.secrets = {
secret0.file = ./secrets/secret0.age; andromeda-pw.file = ./secrets/andromeda-pw.age;
secret1.file = ./secrets/secret1.age; mtgmonkey-pw.file = ./secrets/mtgmonkey-pw.age;
secret2.file = ./secrets/secret2.age; mailserver-acc-test-pw.file = ./secrets/mailserver-acc-test-pw.age;
secret3.file = ./secrets/secret3.age;
}; };
pub-keys = { pub-keys = {
ssh = { ssh = {

0
secrets/secret0.age → secrets/andromeda-pw.age
View File

0
secrets/secret3.age → secrets/mailserver-acc-test-pw.age
View File

0
secrets/secret1.age → secrets/mtgmonkey-pw.age
View File

BIN
secrets/secret2.age
View File

Binary file not shown.

7
secrets/secrets.nix
View File

@@ -4,8 +4,7 @@ let
lenovo = pub-keys.ssh.lenovo; lenovo = pub-keys.ssh.lenovo;
_109-199-104-83 = pub-keys.ssh._109-199-104-83; _109-199-104-83 = pub-keys.ssh._109-199-104-83;
in { in {
"secret0.age".publicKeys = [andromeda lenovo]; "andromeda-pw.age".publicKeys = [andromeda lenovo];
"secret1.age".publicKeys = [andromeda lenovo]; "mtgmonkey-pw.age".publicKeys = [andromeda lenovo];
"secret2.age".publicKeys = [andromeda lenovo _109-199-104-83]; "mailserver-acc-test-pw.age".publicKeys = [andromeda lenovo _109-199-104-83];
"secret3.age".publicKeys = [andromeda lenovo _109-199-104-83];
} }

4
users.nix
View File

@@ -13,7 +13,7 @@ in {
"andromeda" = { "andromeda" = {
isNormalUser = true; isNormalUser = true;
description = "andromeda"; description = "andromeda";
hashedPasswordFile = builtins.toString config.age.secrets.secret0.path; hashedPasswordFile = builtins.toString config.age.secrets.andromeda-pw.path;
extraGroups = [ extraGroups = [
"networkmanager" "networkmanager"
"wheel" "wheel"
@@ -22,7 +22,7 @@ in {
"mtgmonkey" = { "mtgmonkey" = {
isNormalUser = true; isNormalUser = true;
description = "mtgmonkey"; description = "mtgmonkey";
hashedPasswordFile = builtins.toString config.age.secrets.secret1.path; hashedPasswordFile = builtins.toString config.age.secrets.mtgmonkey-pw.path;
extraGroups = [ extraGroups = [
(lib.mkIf (lib.mkIf
(machine == machines.lenovo) (machine == machines.lenovo)