cleanup

hosts/pi4/configuration.nix

@@ -8,7 +8,7 @@ let
   user = "matt";
   password = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06";
   SSID = "Joey's Jungle 5G";
-  SSIDpassword = ""; # config.sops.templates."wifi-password".content;
+  wifiSecrets = config.sops.secrets."wifi-password".path;
   interface = "wlan0";
   timezone = "America/Chicago";
   hostname = "pi4";
@@ -82,7 +82,8 @@ in
     hostName = hostname;
     wireless = {
       enable = false;
-      networks."${SSID}".psk = SSIDpassword;
+      secretsFile = wifiSecrets;
+      networks."${SSID}".psk = "ext:PSK";
       interfaces = [ interface ];
     };
 
@@ -124,6 +125,12 @@ in
 
   services.openssh.enable = true;
 
+  programs.nix-index = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+
   users = {
     mutableUsers = false;
     users."${user}" = {

hosts/pi4/home.nix

@@ -25,12 +25,47 @@ in
   home.username = "matt";
   home.homeDirectory = "/home/matt";
   home.stateVersion = "23.11";
-  programs.home-manager.enable = true;
+
+  sops = {
+    age.keyFile = "/home/admin/.config/sops/age/keys.txt";
+    defaultSopsFile = "/etc/nixos/secrets/secrets.yaml";
+    validateSopsFiles = false;
+    secrets = {
+      "ssh-keys-public/pi4" = {
+        path = "/home/admin/.ssh/id_ed25519.pub";
+        mode = "0644";
+      };
+      "ssh-keys-private/pi4" = {
+        path = "/home/admin/.ssh/id_ed25519";
+        mode = "0600";
+      };
+      "ssh-keys-public/desktop-nixos" = {
+        path = "/home/admin/.ssh/authorized_keys";
+        mode = "0600";
+      };
+
+      "ssh-keys-public/desktop-nixos-root" = {
+        path = "/home/admin/.ssh/authorized_keys2";
+        mode = "0600";
+      };
+
+      "ssh-keys-public/desktop-windows" = {
+        path = "/home/admin/.ssh/authorized_keys3";
+        mode = "0600";
+      };
+
+      "ssh-keys-public/macbook-macos" = {
+        path = "/home/admin/.ssh/authorized_keys4";
+        mode = "0600";
+      };
+    };
+  };
 
   programs = {
     fish.enable = false;
     mangohud.enable = true;
     java.enable = true;
+    home-manager.enable = true;
 
     zsh = {
       enable = true;
@@ -45,15 +80,13 @@ in
         plugins = [ "git" ];
         theme = "fishy";
       };
+    
+      git = {
+        enable = true;
+        userName = "mjallen18";
+        userEmail = "matt.l.jallen@gmail.com";
+        aliases = gitAliases;
+      };
     };
   };
-
-  programs.git = {
-    enable = true;
-    userName = "mjallen18";
-    userEmail = "matt.l.jallen@gmail.com";
-    aliases = gitAliases;
-  };
-
-  programs.command-not-found.enable = true;
 }

hosts/pi4/sops.nix

@@ -1,10 +1,11 @@
-{ config, ... }:
+{ ... }:
 {
-  sops.defaultSopsFile = ../../secrets/secrets.yaml;
-  sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+  sops = {
+    defaultSopsFile = ../../secrets/secrets.yaml;
+    age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
 
-  sops.secrets."wifi" = { };
-  sops.templates."wifi-password".content = ''
-    ${config.sops.secrets."wifi".path}
-  '';
+    secrets = {
+      "wifi" = { };
+    };
+  };
 }