From d07e77a57797334352c5f5eaae12abbec6ddcfa3 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Tue, 13 May 2025 11:03:09 +0100
Subject: [PATCH] Refactor sops default file path

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 hosts/common/configs/system/sops/default.nix | 12 ++++++++----
 hosts/eirene/default.nix                     |  2 --
 hosts/elara/default.nix                      |  6 ++----
 hosts/installer/default.nix                  |  2 --
 lib/scripts/add-host.sh                      |  2 --
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/hosts/common/configs/system/sops/default.nix b/hosts/common/configs/system/sops/default.nix
index 02d3232..2d57fe8 100644
--- a/hosts/common/configs/system/sops/default.nix
+++ b/hosts/common/configs/system/sops/default.nix
@@ -17,9 +17,13 @@
     ];
   };
 
-  sops.age = {
-    generateKey = true;
-    sshKeyPaths = [ config.environment.persistence."/persist"."/etc/ssh/ssh_host_ed25519_key".source ];
-    keyFile = "/var/lib/sops-nix/key.txt";
+  sops = {
+    defaultSopsFile = ../../../../. + "/${config.networking.hostName}/secrets/secrets.yaml";
+
+    age = {
+      generateKey = true;
+      sshKeyPaths = [ config.environment.persistence."/persist"."/etc/ssh/ssh_host_ed25519_key".source ];
+      keyFile = "/var/lib/sops-nix/key.txt";
+    };
   };
 }
diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix
index e70e735..2b79d87 100644
--- a/hosts/eirene/default.nix
+++ b/hosts/eirene/default.nix
@@ -48,8 +48,6 @@
   ];
 
   networking.hostName = "eirene";
-  i18n.defaultLocale = "en_US.UTF-8";
-  sops.defaultSopsFile = ./secrets/secrets.yaml;
 
   fileSystems."/mnt/windows" = {
     device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S69ENF0R841140X-part3";
diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix
index 53c00ca..43f71fb 100644
--- a/hosts/elara/default.nix
+++ b/hosts/elara/default.nix
@@ -54,11 +54,9 @@
     ./users/nikara
   ];
 
-  sas.build.private = true;
-
   networking.hostName = "elara";
-  i18n.defaultLocale = "en_US.UTF-8";
-  sops.defaultSopsFile = ./secrets/secrets.yaml;
+
+  sas.build.private = true;
 
   environment.impermanence.device =
     config.disko.devices.disk.usb.content.partitions.root.content.content.device;
diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix
index 2759638..c918206 100644
--- a/hosts/installer/default.nix
+++ b/hosts/installer/default.nix
@@ -37,8 +37,6 @@
   ];
 
   networking.hostName = "installer";
-  i18n.defaultLocale = "en_US.UTF-8";
-  sops.defaultSopsFile = ./secrets/secrets.yaml;
 
   environment.impermanence.device =
     config.disko.devices.disk.installer.content.partitions.root.content.content.device;
diff --git a/lib/scripts/add-host.sh b/lib/scripts/add-host.sh
index 1cfdf3b..4346a43 100755
--- a/lib/scripts/add-host.sh
+++ b/lib/scripts/add-host.sh
@@ -168,8 +168,6 @@ cat <<EOF > "./hosts/$host/default.nix"
   ];
 
   networking.hostName = "$host";
-  i18n.defaultLocale = "en_US.UTF-8";
-  sops.defaultSopsFile = ./secrets/secrets.yaml;
 }
 EOF