From 1be145193eddf40670ef27ab97222233c9549f13 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Sun, 22 Sep 2024 17:16:20 -0500
Subject: [PATCH] moved users password secret file

---
 enviroments/common/default.nix | 1 -
 enviroments/server/default.nix | 4 ++--
 users/ester/default.nix        | 2 +-
 users/eve/default.nix          | 2 +-
 users/leyla/default.nix        | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/enviroments/common/default.nix b/enviroments/common/default.nix
index 643240a..660b94d 100644
--- a/enviroments/common/default.nix
+++ b/enviroments/common/default.nix
@@ -122,7 +122,6 @@
   };
 
   sops = {
-    defaultSopsFile = ../../secrets/secrets.yaml;
     defaultSopsFormat = "yaml";
     gnupg.sshKeyPaths = [];
 
diff --git a/enviroments/server/default.nix b/enviroments/server/default.nix
index ac834a8..c3be1e7 100644
--- a/enviroments/server/default.nix
+++ b/enviroments/server/default.nix
@@ -49,9 +49,9 @@
 
   config = {
     # virtualisation.oci-containers.containers.pihole = {
-    #   image = "pihole/pihole:latest";
+    #   image = "pihole/pihole:2024.07.0";
     #   environment = {
-    #     TZ = "America/Chicago"; # TODO: set this to the systems timezone
+    #     TZ = time.timeZone;
     #     WEBPASSWORD_FILE = "..."; # TODO: set this from secrets file/config that is set to secrets file (I think this also needs to be mounted in volumns?)
     #   };
     #   volumes = [
diff --git a/users/ester/default.nix b/users/ester/default.nix
index c4a18fb..356a746 100644
--- a/users/ester/default.nix
+++ b/users/ester/default.nix
@@ -16,7 +16,7 @@ in {
     sops.secrets = lib.mkIf cfg.isFullUser {
       "passwords/ester" = {
         neededForUsers = true;
-        # sopsFile = ../secrets.yaml;
+        sopsFile = ../../secrets/user-passwords.yaml;
       };
     };
 
diff --git a/users/eve/default.nix b/users/eve/default.nix
index b674331..3d768f9 100644
--- a/users/eve/default.nix
+++ b/users/eve/default.nix
@@ -16,7 +16,7 @@ in {
     sops.secrets = lib.mkIf cfg.isFullUser {
       "passwords/eve" = {
         neededForUsers = true;
-        # sopsFile = ../secrets.yaml;
+        sopsFile = ../../secrets/user-passwords.yaml;
       };
     };
 
diff --git a/users/leyla/default.nix b/users/leyla/default.nix
index cd4332e..e227fdb 100644
--- a/users/leyla/default.nix
+++ b/users/leyla/default.nix
@@ -21,7 +21,7 @@ in {
     sops.secrets = lib.mkIf (cfg.isFullUser || cfg.isThinUser) {
       "passwords/leyla" = {
         neededForUsers = true;
-        # sopsFile = ../secrets.yaml;
+        sopsFile = ../../secrets/user-passwords.yaml;
       };
     };