Refactor sops default file path

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/configs/system/sops/default.nix

@@ -17,9 +17,13 @@
     ];
   };
 
-  sops.age = {
+  sops = {
-    generateKey = true;
+    defaultSopsFile = ../../../../. + "/${config.networking.hostName}/secrets/secrets.yaml";
-    sshKeyPaths = [ config.environment.persistence."/persist"."/etc/ssh/ssh_host_ed25519_key".source ];
+
-    keyFile = "/var/lib/sops-nix/key.txt";
+    age = {
+      generateKey = true;
+      sshKeyPaths = [ config.environment.persistence."/persist"."/etc/ssh/ssh_host_ed25519_key".source ];
+      keyFile = "/var/lib/sops-nix/key.txt";
+    };
   };
 }

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";

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;

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;

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