From 46ea1e681a4b1b748bca6e9dd69bbb185ccf5a3b Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Mon, 25 Aug 2025 19:56:41 -0500
Subject: [PATCH] fix pi4

---
 systems/aarch64-linux/pi4/default.nix |  1 -
 systems/aarch64-linux/pi4/sops.nix    | 21 ++-------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/systems/aarch64-linux/pi4/default.nix b/systems/aarch64-linux/pi4/default.nix
index 8ab463e..9f0cfe2 100755
--- a/systems/aarch64-linux/pi4/default.nix
+++ b/systems/aarch64-linux/pi4/default.nix
@@ -26,7 +26,6 @@
     };
     user = {
       name = "matt";
-      passwordFile = config.sops.secrets."pi4/matt-password".path;
       mutableUsers = false;
       extraGroups = [
         "docker"
diff --git a/systems/aarch64-linux/pi4/sops.nix b/systems/aarch64-linux/pi4/sops.nix
index 3933af8..e79165e 100755
--- a/systems/aarch64-linux/pi4/sops.nix
+++ b/systems/aarch64-linux/pi4/sops.nix
@@ -2,51 +2,32 @@
 let
   user = "matt";
   defaultSops = (lib.snowfall.fs.get-file "secrets/pi4-secrets.yaml");
-  sharedSops = (lib.snowfall.fs.get-file "secrets/secrets.yaml");
 in
 {
   sops = {
-    defaultSopsFile = lib.mkForce defaultSops;
-    #    age = {
-    #      generateKey = true;
-    #      sshKeyPaths = [ "/etc/ssd/ssh_host_ed25519_key" ];
-    #    };
     age.keyFile = "/home/matt/.config/sops/age/keys.txt";
     validateSopsFiles = false;
     # ------------------------------
     # 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-public/pi4" = {
-        sopsFile = sharedSops;
         mode = "0644";
         owner = config.users.users."${user}".name;
         group = config.users.users."${user}".group;
         restartUnits = [ "sshd.service" ];
       };
       "ssh-keys-private/pi4" = {
-        sopsFile = sharedSops;
         mode = "0600";
         owner = config.users.users."${user}".name;
         group = config.users.users."${user}".group;
         restartUnits = [ "sshd.service" ];
       };
       "ssh-keys-public/pi5" = {
-        sopsFile = sharedSops;
         neededForUsers = true;
         mode = "0600";
         owner = config.users.users.root.name;
@@ -54,6 +35,7 @@ in
         restartUnits = [ "sshd.service" ];
       };
       "pi4/sys-public-key" = {
+        sopsFile = defaultSops;
         neededForUsers = true;
         mode = "0600";
         owner = config.users.users.root.name;
@@ -61,6 +43,7 @@ in
         restartUnits = [ "sshd.service" ];
       };
       "pi4/sys-priv-key" = {
+        sopsFile = defaultSops;
         neededForUsers = true;
         mode = "0600";
         owner = config.users.users.root.name;