mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pi5 fix

Browse Source
This commit is contained in:
mjallen18
2025-08-25 19:54:04 -05:00
parent 81e78a6809
commit d19191bb14
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/nixos/hardware/default.nix
View File

@@ -22,7 +22,7 @@ in
sane = { sane = {
enable = true; enable = true;
brscan5.enable = false; brscan5.enable = false;
extraBackends = [ pkgs.brscan5 ]; extraBackends = if (!isArm) then [ pkgs.brscan5 ] else [ ];
}; };
flipperzero.enable = true; flipperzero.enable = true;

2
systems/aarch64-linux/pi5/default.nix
View File

@@ -27,7 +27,7 @@
desktop.hyprland.enable = false; desktop.hyprland.enable = false;
user = { user = {
name = "matt"; name = "matt";
passwordFile = config.sops.secrets."pi5/matt-password".path; # passwordFile = config.sops.secrets."pi5/matt-password".path;
mutableUsers = false; mutableUsers = false;
extraGroups = [ "docker" ]; extraGroups = [ "docker" ];
sshKeys = [ sshKeys = [

21
systems/aarch64-linux/pi5/sops.nix
View File

@@ -2,41 +2,24 @@
let let
user = "matt"; user = "matt";
defaultSops = (lib.snowfall.fs.get-file "secrets/pi5-secrets.yaml"); defaultSops = (lib.snowfall.fs.get-file "secrets/pi5-secrets.yaml");
sharedSops = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
in in
{ {
sops = { sops = {
defaultSopsFile = lib.mkForce defaultSops;
# age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
age.keyFile = "/home/matt/.config/sops/age/keys.txt";
# ------------------------------ # ------------------------------
# Secrets # Secrets
# ------------------------------ # ------------------------------
secrets = { secrets = {
"wifi" = {
sopsFile = sharedSops;
};
"pi5/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/pi5" = { "ssh-keys-public/pi5" = {
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/pi5" = { "ssh-keys-private/pi5" = {
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;
@@ -44,14 +27,14 @@ in
}; };
"pi5/sys-public-key" = { "pi5/sys-public-key" = {
neededForUsers = true; sopsFile = defaultSops;
mode = "0600"; mode = "0600";
owner = config.users.users.root.name; owner = config.users.users.root.name;
group = config.users.users.root.group; group = config.users.users.root.group;
restartUnits = [ "sshd.service" ]; restartUnits = [ "sshd.service" ];
}; };
"pi5/sys-priv-key" = { "pi5/sys-priv-key" = {
neededForUsers = true; sopsFile = defaultSops;
mode = "0600"; mode = "0600";
owner = config.users.users.root.name; owner = config.users.users.root.name;
group = config.users.users.root.group; group = config.users.users.root.group;