Skip to content

Commit d62084e

Browse files
committed
chore: rename password age files
1 parent 082dabb commit d62084e

File tree

7 files changed

+28
-19
lines changed

7 files changed

+28
-19
lines changed

hosts/best/default.nix

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,32 @@ in {
99
path = config.secrets.id.path;
1010
}];
1111

12-
secrets.thePassword.file = ./password.the.age;
13-
users.users = {
14-
root.hashedPasswordFile = config.secrets.thePassword.path;
12+
secrets.password.file = ./password.age;
13+
users.users = {
14+
root = {
15+
openssh.authorizedKeys.keys = keys.admins;
16+
hashedPasswordFile = config.secrets.password.path;
17+
};
1518

1619
the = {
1720
description = "The";
1821
openssh.authorizedKeys.keys = keys.admins;
19-
hashedPasswordFile = config.secrets.thePassword.path;
22+
hashedPasswordFile = config.secrets.password.path;
2023
isNormalUser = true;
2124
extraGroups = [ "wheel" ];
2225
};
2326

2427
backup = {
2528
description = "Backup";
2629
openssh.authorizedKeys.keys = keys.all;
27-
hashedPasswordFile = config.secrets.thePassword.path;
30+
hashedPasswordFile = config.secrets.password.path;
2831
isNormalUser = true;
2932
};
3033

3134
build = {
3235
description = "Build";
3336
openssh.authorizedKeys.keys = keys.all;
34-
hashedPasswordFile = config.secrets.thePassword.path;
37+
hashedPasswordFile = config.secrets.password.path;
3538
isNormalUser = true;
3639
extraGroups = [ "build" ];
3740
};
File renamed without changes.

hosts/disk/default.nix

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@ in {
99
path = config.secrets.id.path;
1010
}];
1111

12-
secrets.floppyPassword.file = ./password.floppy.age;
13-
users.users = {
14-
root.hashedPasswordFile = config.secrets.floppyPassword.path;
12+
secrets.password.file = ./password.age;
13+
users.users = {
14+
root = {
15+
openssh.authorizedKeys.keys = keys.admins;
16+
hashedPasswordFile = config.secrets.password.path;
17+
};
1518

1619
floppy = {
1720
description = "Floppy";
1821
openssh.authorizedKeys.keys = keys.admins;
19-
hashedPasswordFile = config.secrets.floppyPassword.path;
22+
hashedPasswordFile = config.secrets.password.path;
2023
isNormalUser = true;
2124
extraGroups = [ "wheel" ];
2225
};
2326

2427
backup = {
2528
description = "Backup";
2629
openssh.authorizedKeys.keys = keys.all;
27-
hashedPasswordFile = config.secrets.floppyPassword.path;
30+
hashedPasswordFile = config.secrets.password.path;
2831
isNormalUser = true;
2932
};
3033
};
File renamed without changes.

hosts/nine/default.nix

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@ in {
99
path = config.secrets.id.path;
1010
}];
1111

12-
secrets.sevenPassword.file = ./password.seven.age;
13-
users.users = {
14-
root.hashedPasswordFile = config.secrets.sevenPassword.path;
12+
secrets.password.file = ./password.age;
13+
users.users = {
14+
root = {
15+
openssh.authorizedKeys.keys = keys.admins;
16+
hashedPasswordFile = config.secrets.password.path;
17+
};
1518

1619
seven = {
1720
description = "Hungry Seven";
1821
openssh.authorizedKeys.keys = keys.admins;
19-
hashedPasswordFile = config.secrets.sevenPassword.path;
22+
hashedPasswordFile = config.secrets.password.path;
2023
isNormalUser = true;
2124
extraGroups = [ "wheel" ];
2225
};
2326

2427
backup = {
2528
description = "Backup";
2629
openssh.authorizedKeys.keys = keys.all;
27-
hashedPasswordFile = config.secrets.sevenPassword.path;
30+
hashedPasswordFile = config.secrets.password.path;
2831
isNormalUser = true;
2932
};
3033
};
File renamed without changes.

secrets.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let
33
in {
44
# best
55
"hosts/best/id.age".publicKeys = [ best ] ++ admins;
6-
"hosts/best/password.the.age".publicKeys = [ best ] ++ admins;
6+
"hosts/best/password.age".publicKeys = [ best ] ++ admins;
77

88
"hosts/best/cache/key.age".publicKeys = [ best ] ++ admins;
99

@@ -22,11 +22,11 @@ in {
2222

2323
# disk
2424
"hosts/disk/id.age".publicKeys = [ disk ] ++ admins;
25-
"hosts/disk/password.floppy.age".publicKeys = [ disk ] ++ admins;
25+
"hosts/disk/password.age".publicKeys = [ disk ] ++ admins;
2626

2727
# nine
2828
"hosts/nine/id.age".publicKeys = [ nine ] ++ admins;
29-
"hosts/nine/password.seven.age".publicKeys = [ nine ] ++ admins;
29+
"hosts/nine/password.age".publicKeys = [ nine ] ++ admins;
3030

3131
"hosts/nine/github2forgejo/environment.age".publicKeys = [ nine ] ++ admins;
3232

0 commit comments

Comments
 (0)