From e0602dd1a04019500dec588e5c466721f5ffbef4 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sat, 22 Feb 2025 18:35:25 +0000
Subject: [PATCH] Rename installer.key to keyfile

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

diff --git a/hosts/common/configs/system/nix-install/install.sh b/hosts/common/configs/system/nix-install/install.sh
index 884dd40..15f6147 100644
--- a/hosts/common/configs/system/nix-install/install.sh
+++ b/hosts/common/configs/system/nix-install/install.sh
@@ -51,7 +51,7 @@ check_key() {
 set_password_file() {
   SOPS_AGE_KEY_FILE="$flake/secrets/$key/key.txt"
   export SOPS_AGE_KEY_FILE
-  sops --decrypt --extract "['luks']" "$flake/hosts/$host/secrets/secrets.yaml" > /tmp/installer.key
+  sops --decrypt --extract "['luks']" "$flake/hosts/$host/secrets/secrets.yaml" > /tmp/keyfile
   unset SOPS_AGE_KEY_FILE
 }
 
@@ -104,7 +104,7 @@ finish() {
 }
 
 cleanup() {
-  rm -f /tmp/installer.key
+  rm -f /tmp/keyfile
   if [[ -n "$host" ]]; then disko -m "unmount" "$flake/hosts/$host/format.nix"; fi
   if [[ -d "$root" ]]; then rmdir "$root"; fi
 }
diff --git a/hosts/eirene/format.nix b/hosts/eirene/format.nix
index 436d097..2ec6e0c 100644
--- a/hosts/eirene/format.nix
+++ b/hosts/eirene/format.nix
@@ -36,7 +36,7 @@
             content = {
               name = "main";
               type = "luks";
-              passwordFile = "/tmp/installer.key";
+              passwordFile = "/tmp/keyfile";
               settings = {
                 allowDiscards = true;
               };
diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix
index 05fc75a..e03b97a 100644
--- a/hosts/elara/default.nix
+++ b/hosts/elara/default.nix
@@ -53,7 +53,6 @@
 
   networking.hostName = "elara";
   i18n.defaultLocale = "en_US.UTF-8";
-
   sops.defaultSopsFile = ./secrets/secrets.yaml;
 
   environment.impermanence.device =
diff --git a/hosts/elara/format.nix b/hosts/elara/format.nix
index b988813..fc9d5fa 100644
--- a/hosts/elara/format.nix
+++ b/hosts/elara/format.nix
@@ -36,7 +36,7 @@
             content = {
               name = "usb";
               type = "luks";
-              passwordFile = "/tmp/installer.key";
+              passwordFile = "/tmp/keyfile";
               settings = {
                 allowDiscards = true;
               };
diff --git a/hosts/installer/format.nix b/hosts/installer/format.nix
index f712429..f369b5a 100644
--- a/hosts/installer/format.nix
+++ b/hosts/installer/format.nix
@@ -28,7 +28,7 @@
             content = {
               name = "installer";
               type = "luks";
-              passwordFile = "/tmp/installer.key";
+              passwordFile = "/tmp/keyfile";
               settings = {
                 allowDiscards = true;
               };
diff --git a/lib/scripts/add-host.sh b/lib/scripts/add-host.sh
index 89e32c2..2692b4a 100755
--- a/lib/scripts/add-host.sh
+++ b/lib/scripts/add-host.sh
@@ -102,7 +102,7 @@ cat <<'EOF' > "./hosts/$host/format.nix"
             content = {
               name = "main";
               type = "luks";
-              passwordFile = "/tmp/installer.key";
+              passwordFile = "/tmp/keyfile";
               settings = {
                 allowDiscards = true;
               };