From 5eb9766572d20ba964f2d8ffb12191a02a15370a Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sun, 16 Feb 2025 11:14:10 +0000
Subject: [PATCH] Remove disko format argument

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 hosts/common/configs/system/nix-install/install.sh | 6 ++----
 hosts/eirene/default.nix                           | 3 ++-
 hosts/eirene/format.nix                            | 6 +-----
 hosts/elara/default.nix                            | 5 ++---
 hosts/elara/format.nix                             | 6 +-----
 hosts/installer/default.nix                        | 5 ++---
 hosts/installer/format.nix                         | 6 +-----
 7 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/hosts/common/configs/system/nix-install/install.sh b/hosts/common/configs/system/nix-install/install.sh
index 3417d4f..bfe39d6 100644
--- a/hosts/common/configs/system/nix-install/install.sh
+++ b/hosts/common/configs/system/nix-install/install.sh
@@ -70,7 +70,7 @@ prepare_disk() {
   local disko_mode="$1"
   mkdir -p /mnt
   root=$(mktemp -d /mnt/install.XXXXXX)
-  disko -m "$disko_mode" --yes-wipe-all-disks --root-mountpoint "$root" "$flake/hosts/$host/format.nix" --arg device "\"$device\""
+  disko -m "$disko_mode" --yes-wipe-all-disks --root-mountpoint "$root" "$flake/hosts/$host/format.nix"
 }
 
 copy_keys() {
@@ -109,7 +109,7 @@ finish() {
 
 cleanup() {
   rm -f /tmp/installer.key
-  if [[ -n "$host" && -n "$device" ]]; then disko -m "unmount" "$flake/hosts/$host/format.nix" --arg device "\"$device\""; fi
+  if [[ -n "$host" ]]; then disko -m "unmount" "$flake/hosts/$host/format.nix"; fi
   if [[ -d "$root" ]]; then rmdir "$root"; fi
 }
 
@@ -151,8 +151,6 @@ check_host
 check_key
 until set_password_file; do echo "Passwords did not match, please try again."; done
 
-device=$(grep -oP '(?<=device = ")[^"]+' "$flake/hosts/$host/default.nix")
-
 case "$mode" in
   install)
     prepare_disk "destroy,format,mount"
diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix
index 58b9ab1..8cc5438 100644
--- a/hosts/eirene/default.nix
+++ b/hosts/eirene/default.nix
@@ -4,7 +4,8 @@
     ../../lib
 
     inputs.disko.nixosModules.disko
-    (import ./format.nix { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762"; })
+    ./format.nix
+
     ./hardware
 
     ../common/configs/system/backup
diff --git a/hosts/eirene/format.nix b/hosts/eirene/format.nix
index cf1818f..37608ac 100644
--- a/hosts/eirene/format.nix
+++ b/hosts/eirene/format.nix
@@ -1,11 +1,7 @@
-{
-  device ? throw "device argument is required",
-  ...
-}:
 {
   disko.devices = {
     disk.main = {
-      inherit device;
+      device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762";
       type = "disk";
       content = {
         type = "gpt";
diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix
index a2e4d6d..05fc75a 100644
--- a/hosts/elara/default.nix
+++ b/hosts/elara/default.nix
@@ -4,9 +4,8 @@
     ../../lib
 
     inputs.disko.nixosModules.disko
-    (import ./format.nix {
-      device = "/dev/disk/by-id/ata-Samsung_SSD_990_EVO_1TB_S7GCNL0XA04998F";
-    })
+    ./format.nix
+
     ./hardware
 
     ../common/configs/system/backup
diff --git a/hosts/elara/format.nix b/hosts/elara/format.nix
index d1bba3d..2e9e0a4 100644
--- a/hosts/elara/format.nix
+++ b/hosts/elara/format.nix
@@ -1,11 +1,7 @@
-{
-  device ? throw "device argument is required",
-  ...
-}:
 {
   disko.devices = {
     disk.usb = {
-      inherit device;
+      device = "/dev/disk/by-id/ata-Samsung_SSD_990_EVO_1TB_S7GCNL0XA04998F";
       type = "disk";
       content = {
         type = "gpt";
diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix
index e68c266..dfe0530 100644
--- a/hosts/installer/default.nix
+++ b/hosts/installer/default.nix
@@ -4,9 +4,8 @@
     ../../lib
 
     inputs.disko.nixosModules.disko
-    (import ./format.nix {
-      device = "/dev/disk/by-id/usb-SanDisk_Ultra_Trek_050133f0afb69de86a475ee8d2ad97e4916cce11764cffba9ab262d42a7d0d2f66460000000000000000000039b7a3b8ff990a109f5581078ea6e86a-0:0";
-    })
+    ./format.nix
+
     ./hardware
 
     ../common/configs/system/boot
diff --git a/hosts/installer/format.nix b/hosts/installer/format.nix
index aa531e7..dadf129 100644
--- a/hosts/installer/format.nix
+++ b/hosts/installer/format.nix
@@ -1,11 +1,7 @@
-{
-  device ? throw "device argument is required",
-  ...
-}:
 {
   disko.devices = {
     disk.installer = {
-      inherit device;
+      device = "/dev/disk/by-id/usb-SanDisk_Ultra_Trek_050133f0afb69de86a475ee8d2ad97e4916cce11764cffba9ab262d42a7d0d2f66460000000000000000000039b7a3b8ff990a109f5581078ea6e86a-0:0";
       type = "disk";
       content = {
         type = "gpt";