added install scripts

1 files changed, 35 insertions, 48 deletions

diff --git a/scripts/install.sh b/scripts/install.sh
index 9173646..8a8c3d7 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -3,25 +3,23 @@ set -euo pipefail
 
 # --- Defaults ---
 HOSTNAME=""
-MAIN_DISK="/dev/nvme0n1"
-STORAGE_DISK=""
+DISKS=()
+KEY_LOCATION="./private.asc"
 REPO_URL="https://codeberg.org/adikro/nixos-config.git"
-TEMP_CONFIG="/tmp/config/etc/nixos-config"
+TEMP_CONFIG="/tmp/config/etc/nixos"
 USE_FACTER=true
 WRITE_EFI=true
 
 # --- Parse Arguments ---
-# Added 'g' (generate-config) and 'n' (no-efi) to options
-PARSED_ARGS=$(getopt -z -o h:m:s:r:c:gn --long hostname:,main:,storage:,repo:,config:,generate-config,no-efi -- "$@")
+PARSED_ARGS=$(getopt -o h:d:r:k:gn --long hostname:,disk:,repo:,key:,generate-config,no-efi -- "$@")
 eval set -- "$PARSED_ARGS"
 
 while true; do
     case "$1" in
         -h|--hostname)        HOSTNAME="$2"; shift 2 ;;
-        -m|--main)            MAIN_DISK="$2"; shift 2 ;;
-        -s|--storage)         STORAGE_DISK="$2"; shift 2 ;;
+        -d|--disk)            DISKS+=("$2"); shift 2 ;;
         -r|--repo)            REPO_URL="$2"; shift 2 ;;
-        -c|--config)          TEMP_CONFIG="$2"; shift 2 ;;
+        -k|--key)             KEY_LOCATION="$2"; shift 2 ;;
         -g|--generate-config) USE_FACTER=false; shift ;;
         -n|--no-efi)          WRITE_EFI=false; shift ;;
         --) shift; break ;;
@@ -30,9 +28,13 @@ while true; do
 done
 
 # --- Validation ---
-if [[ -z "$HOSTNAME" || -z "$MAIN_DISK" ]]; then
-    echo "Usage: sudo ./install.sh --hostname <name> [options]"
-    echo "Options: --main <disk> --storage <disk> --repo <url> --config <path> --generate-config --no-efi"
+if [[ -z "$HOSTNAME" || ${#DISKS[@]} -eq 0 ]]; then
+    echo "Usage: sudo nix run .#install -- -h <name> -d main:/dev/nvme0n1 [-d storage:/dev/sda]"
+    exit 1
+fi
+
+if [[ ! -f "$KEY_LOCATION" ]]; then
+    echo "Error: Private key not found at $KEY_LOCATION. Cannot proceed without GPG."
     exit 1
 fi
 
@@ -40,17 +42,15 @@ fi
 echo "------------------------------------------------------------"
 echo "INSTALLATION PLAN"
 echo "  Hostname:      $HOSTNAME"
-echo "  Main Disk:     $MAIN_DISK"
-echo "  Storage Disk:  ${STORAGE_DISK:-None}"
-echo "  Hardware Mode: $([ "$USE_FACTER" = true ] && echo "Facter" || echo "Legacy Generate-Config")"
-echo "  Write EFI:     $WRITE_EFI"
-echo "  Repo URL:      $REPO_URL"
+echo "  Target Disks:"
+for disk in "${DISKS[@]}"; do echo "    - $disk"; done
 echo "------------------------------------------------------------"
-read -p "Proceed with formatting? (y/N): " confirm
+read -p "Warning: This will format the disks listed above. Proceed? (y/N): " confirm
 [[ "$confirm" != [yY] ]] && exit 1
 
-echo "### 1. Preparing GPG ###"
-gpg --import ./private.asc || echo "GPG key already present."
+echo "### 1. Importing GPG Key ###"
+export GPG_TTY=$(tty)
+gpg --import "$KEY_LOCATION"
 
 echo "### 2. Cloning Configuration ###"
 sudo rm -rf "$TEMP_CONFIG"
@@ -58,44 +58,31 @@ git clone "$REPO_URL" "$TEMP_CONFIG"
 cd "$TEMP_CONFIG"
 
 echo "### 3. Hardware Configuration ###"
-mkdir -p "./hosts/$HOSTNAME"
+HOST_DIR="./hosts/$HOSTNAME"
+mkdir -p "$HOST_DIR"
 
 if [ "$USE_FACTER" = true ]; then
-    echo "Running Facter scan..."
-    # Note: Using your specified format for the command
-    sudo nix run github:nix-community/nixos-facter -- -o "./hosts/$HOSTNAME/facter.json"
-    git add "./hosts/$HOSTNAME/facter.json"
+    nixos-facter -o "$HOST_DIR/facter.json"
+    git add "$HOST_DIR/facter.json"
 else
-    echo "Generating legacy hardware config..."
     sudo nixos-generate-config --no-filesystems --root /tmp/nixos-gen-root
-    sudo mv /tmp/nixos-gen-root/etc/nixos/hardware-configuration.nix "./hosts/$HOSTNAME/hardware-configuration.nix"
-    sudo rm -rf /tmp/nixos-gen-root
-    git add "./hosts/$HOSTNAME/hardware-configuration.nix"
+    mv /tmp/nixos-gen-root/etc/nixos/hardware-configuration.nix "$HOST_DIR/hardware-configuration.nix"
+    git add "$HOST_DIR/hardware-configuration.nix"
 fi
 
 echo "### 4. SOPS Key Extraction ###"
-if [[ -n "$STORAGE_DISK" ]]; then
-    echo "Extracting storage_key..."
-    nix shell nixpkgs#sops -c sops -d --extract '["storage_key"]' secrets.yaml > /tmp/storage.key
+if printf '%s\n' "${DISKS[@]}" | rg -qv "^main:"; then
+    sops -d --extract '["crypt_key"]' secrets/secrets.yaml > /tmp/crypt.key
 fi
 
 echo "### 5. Disko Install ###"
-DISKO_ARGS=(
-    --flake ".#$HOSTNAME"
-    --disk main "$MAIN_DISK"
-)
-
-# Conditionally add the EFI flag
-if [ "$WRITE_EFI" = true ]; then
-    DISKO_ARGS+=(--write-efi-boot-entries)
-fi
-
-# Append storage disk if defined
-if [[ -n "$STORAGE_DISK" ]]; then
-    DISKO_ARGS+=(--disk storage "$STORAGE_DISK")
-fi
+DISKO_ARGS=(--flake ".#$HOSTNAME")
+for pair in "${DISKS[@]}"; do
+    IFS=":" read -r D_NAME D_DEV <<< "$pair"
+    DISKO_ARGS+=(--disk "$D_NAME" "$D_DEV")
+done
+[[ "$WRITE_EFI" == true ]] && DISKO_ARGS+=(--write-efi-boot-entries)
 
-sudo nix run 'github:nix-community/disko/latest#disko-install' -- "${DISKO_ARGS[@]}"
+sudo disko-install "${DISKO_ARGS[@]}"
 
-echo "------------------------------------------------------------"
-echo "INSTALL COMPLETE. Remove pendrive and reboot."
+echo "INSTALL COMPLETE. Reboot and run setup script."