diff --git a/Droidnix/install_Droidnix.sh b/Droidnix/install_Droidnix.sh index a94b9cf08..6dbb3e21e 100755 --- a/Droidnix/install_Droidnix.sh +++ b/Droidnix/install_Droidnix.sh @@ -5,7 +5,6 @@ set -euo pipefail ### Configuration ### ───────────────────────────── ZIP_URL="https://gitea.data-pro.nu/henrov/nixos/archive/main.zip" - TARGET_DIR="$HOME/Droidnix" ### ───────────────────────────── @@ -20,6 +19,7 @@ echo "Hostname: $HOSTNAME" ### ───────────────────────────── ### Step 2 — Create target directory ### ───────────────────────────── +echo "Creating $TARGET_DIR..." cd ~ rm -rf "$TARGET_DIR" mkdir -p "$TARGET_DIR" @@ -47,7 +47,7 @@ else exit 1 fi -echo "Extracting..." +echo "Extracting to $TMP_DIR/unzipped..." unzip -q "$TMP_DIR/main.zip" -d "$TMP_DIR/unzipped" # Gitea zip contains folder like: repo-main/ @@ -79,17 +79,20 @@ done echo "Replacing content..." -# 5.1 generated/ henrov → user +# 5.1 henrov → user +echo "henrov → $USER_NAME..." if [ -d "$TARGET_DIR/generated" ]; then find "$TARGET_DIR/generated" -type f -exec sed -i "s/henrov/$USER_NAME/g" {} + fi # 5.3 path replacement +echo "Path replacement..." find "$TARGET_DIR" -type f -exec grep -Iq . {} \; -print | while read -r file; do sed -i "s#~/Repos/nixos/Droidnix#~/Droidnix#g" "$file" || true done # 5.4 traveldroid → hostname +echo "Traveldroid → $HOSTNAME..." find "$TARGET_DIR" -type f -exec grep -Iq . {} \; -print | while read -r file; do sed -i "s/traveldroid/$HOSTNAME/g" "$file" || true done @@ -119,6 +122,7 @@ fi ### Step 6 — Hardware config ### ───────────────────────────── HOST_DIR="$TARGET_DIR/generated/hosts/$HOSTNAME" +echo "Hardware config --> $HOST_DIR" mkdir -p "$HOST_DIR" echo "Generating hardware configuration..." @@ -128,7 +132,7 @@ sudo nixos-generate-config --show-hardware-config > \ ### ───────────────────────────── ### Step 7 — Inject hardware into README.org ### ───────────────────────────── - +echo "Inject $HOST_DIR/hardware-configuration.nix" if [ -f "$README" ]; then awk -v file="$HOST_DIR/hardware-configuration.nix" ' BEGIN {inblock=0} @@ -156,9 +160,8 @@ fi ### ───────────────────────────── ### Step 8 — Build system ### ───────────────────────────── -echo "Building NixOS configuration..." +echo "Building NixOS configuration... sudo nixos-rebuild switch --flake ".#$HOSTNAME"" cd "$TARGET_DIR" - sudo nixos-rebuild switch --flake ".#$HOSTNAME" ### ─────────────────────────────