This commit is contained in:
mjallen18
2025-08-25 19:56:41 -05:00
parent c759baed06
commit 46ea1e681a
2 changed files with 2 additions and 20 deletions

View File

@@ -26,7 +26,6 @@
}; };
user = { user = {
name = "matt"; name = "matt";
passwordFile = config.sops.secrets."pi4/matt-password".path;
mutableUsers = false; mutableUsers = false;
extraGroups = [ extraGroups = [
"docker" "docker"

View File

@@ -2,51 +2,32 @@
let let
user = "matt"; user = "matt";
defaultSops = (lib.snowfall.fs.get-file "secrets/pi4-secrets.yaml"); defaultSops = (lib.snowfall.fs.get-file "secrets/pi4-secrets.yaml");
sharedSops = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
in in
{ {
sops = { sops = {
defaultSopsFile = lib.mkForce defaultSops;
# age = {
# generateKey = true;
# sshKeyPaths = [ "/etc/ssd/ssh_host_ed25519_key" ];
# };
age.keyFile = "/home/matt/.config/sops/age/keys.txt"; age.keyFile = "/home/matt/.config/sops/age/keys.txt";
validateSopsFiles = false; validateSopsFiles = false;
# ------------------------------ # ------------------------------
# Secrets # Secrets
# ------------------------------ # ------------------------------
secrets = { secrets = {
"wifi" = {
sopsFile = sharedSops;
};
"pi4/matt-password" = {
neededForUsers = true;
mode = "0600";
owner = config.users.users."${user}".name;
group = config.users.users."${user}".group;
};
# ------------------------------ # ------------------------------
# SSH keys # SSH keys
# ------------------------------ # ------------------------------
"ssh-keys-public/pi4" = { "ssh-keys-public/pi4" = {
sopsFile = sharedSops;
mode = "0644"; mode = "0644";
owner = config.users.users."${user}".name; owner = config.users.users."${user}".name;
group = config.users.users."${user}".group; group = config.users.users."${user}".group;
restartUnits = [ "sshd.service" ]; restartUnits = [ "sshd.service" ];
}; };
"ssh-keys-private/pi4" = { "ssh-keys-private/pi4" = {
sopsFile = sharedSops;
mode = "0600"; mode = "0600";
owner = config.users.users."${user}".name; owner = config.users.users."${user}".name;
group = config.users.users."${user}".group; group = config.users.users."${user}".group;
restartUnits = [ "sshd.service" ]; restartUnits = [ "sshd.service" ];
}; };
"ssh-keys-public/pi5" = { "ssh-keys-public/pi5" = {
sopsFile = sharedSops;
neededForUsers = true; neededForUsers = true;
mode = "0600"; mode = "0600";
owner = config.users.users.root.name; owner = config.users.users.root.name;
@@ -54,6 +35,7 @@ in
restartUnits = [ "sshd.service" ]; restartUnits = [ "sshd.service" ];
}; };
"pi4/sys-public-key" = { "pi4/sys-public-key" = {
sopsFile = defaultSops;
neededForUsers = true; neededForUsers = true;
mode = "0600"; mode = "0600";
owner = config.users.users.root.name; owner = config.users.users.root.name;
@@ -61,6 +43,7 @@ in
restartUnits = [ "sshd.service" ]; restartUnits = [ "sshd.service" ];
}; };
"pi4/sys-priv-key" = { "pi4/sys-priv-key" = {
sopsFile = defaultSops;
neededForUsers = true; neededForUsers = true;
mode = "0600"; mode = "0600";
owner = config.users.users.root.name; owner = config.users.users.root.name;