mirror of
https://github.com/cole-maxwell1/dotfiles.git
synced 2026-10-27 16:32:49 -05:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a05a40cfd | ||
|
|
6c7604b218 | ||
|
|
2c4e6dbf95 |
Executable
+135
@@ -0,0 +1,135 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# iso2usb-macos.sh - Write an ISO image to a USB drive on macOS.
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
# ./iso2usb-macos.sh [--prompt|-p] /path/to/input.iso
|
||||||
|
#
|
||||||
|
# Options:
|
||||||
|
# -p, --prompt Skip El Torito auto-detection and go straight to the
|
||||||
|
# direct-write Y/N prompt with no pre-selected default.
|
||||||
|
#
|
||||||
|
# Requires: hdiutil, diskutil, dd (all built into macOS). Must be run with
|
||||||
|
# sudo privileges for the dd step (the script will prompt when needed).
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SKIP_DETECT=0
|
||||||
|
ISO_PATH=""
|
||||||
|
|
||||||
|
while [[ $# -gt 0 ]]; do
|
||||||
|
case "$1" in
|
||||||
|
-p|--prompt)
|
||||||
|
SKIP_DETECT=1
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
-*)
|
||||||
|
echo "Unknown option: $1"
|
||||||
|
echo "Usage: $0 [--prompt|-p] /path/to/input.iso"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
ISO_PATH="$1"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ -z "$ISO_PATH" ]]; then
|
||||||
|
echo "Usage: $0 [--prompt|-p] /path/to/input.iso"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -f "$ISO_PATH" ]]; then
|
||||||
|
echo "Error: file not found: $ISO_PATH"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# List external/removable disks only, to reduce risk of selecting an internal drive.
|
||||||
|
echo "Available external disks:"
|
||||||
|
echo "--------------------------"
|
||||||
|
diskutil list external
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
read -rp "Enter the disk identifier to write to (e.g. disk4): " DISK_ID
|
||||||
|
|
||||||
|
# Normalize input in case user includes /dev/ prefix.
|
||||||
|
DISK_ID="${DISK_ID#/dev/}"
|
||||||
|
DISK_PATH="/dev/${DISK_ID}"
|
||||||
|
RDISK_PATH="/dev/r${DISK_ID}"
|
||||||
|
|
||||||
|
if [[ ! -e "$DISK_PATH" ]]; then
|
||||||
|
echo "Error: $DISK_PATH does not exist."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
DISK_INFO="$(diskutil info "$DISK_PATH")"
|
||||||
|
DISK_SIZE="$(echo "$DISK_INFO" | grep "Disk Size" | sed -E 's/.*Disk Size:[[:space:]]*//; s/[[:space:]]*\(.*//')"
|
||||||
|
# Not all diskutil info output includes a "Disk Size" field (varies by
|
||||||
|
# identifier type, e.g. whole-disk vs partition). Fall back to "Total Size"
|
||||||
|
# if the first lookup came back empty.
|
||||||
|
[[ -z "$DISK_SIZE" ]] && DISK_SIZE="$(echo "$DISK_INFO" | grep "Total Size" | sed -E 's/.*Total Size:[[:space:]]*//; s/[[:space:]]*\(.*//')"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Selected device: $DISK_PATH (${DISK_SIZE:-unknown size})"
|
||||||
|
echo "$DISK_INFO" | grep -E "Device / Media Name|Protocol|Total Size|Removable Media"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "WARNING: all data on $DISK_PATH will be destroyed."
|
||||||
|
read -rp "Type the disk identifier again to confirm (e.g. disk4): " CONFIRM_ID
|
||||||
|
if [[ "$CONFIRM_ID" != "$DISK_ID" ]]; then
|
||||||
|
echo "Confirmation did not match. Aborting."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
WORKDIR="$(mktemp -d)"
|
||||||
|
trap 'rm -rf "$WORKDIR"' EXIT
|
||||||
|
|
||||||
|
IMG_PATH=""
|
||||||
|
|
||||||
|
# Check for an El Torito boot record to determine if the ISO is hybrid.
|
||||||
|
# The boot record volume descriptor lives at sector 17 (byte offset 0x8800).
|
||||||
|
# Byte 0 of that sector is 0x00 (boot record type), followed by the string
|
||||||
|
# "CD001", followed by the boot system identifier. Hybrid/El Torito ISOs
|
||||||
|
# carry "EL TORITO SPECIFICATION" in that identifier field.
|
||||||
|
is_hybrid_iso() {
|
||||||
|
local iso="$1"
|
||||||
|
dd if="$iso" bs=1 skip=34823 count=23 2>/dev/null | grep -aq "EL TORITO SPECIFICATION"
|
||||||
|
}
|
||||||
|
|
||||||
|
DEFAULT_DIRECT=""
|
||||||
|
if [[ "$SKIP_DETECT" -eq 1 ]]; then
|
||||||
|
echo "Skipping El Torito auto-detection (--prompt set)."
|
||||||
|
else
|
||||||
|
echo "Inspecting ISO for El Torito hybrid boot support..."
|
||||||
|
if is_hybrid_iso "$ISO_PATH"; then
|
||||||
|
echo "Detected: hybrid El Torito/ISO9660 image. Direct dd write should work."
|
||||||
|
DEFAULT_DIRECT="Y"
|
||||||
|
else
|
||||||
|
echo "No El Torito boot record found. This ISO is likely not hybrid;"
|
||||||
|
echo "converting via hdiutil is recommended."
|
||||||
|
DEFAULT_DIRECT="N"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
read -rp "Attempt direct write of the raw ISO without conversion? [${DEFAULT_DIRECT:-y/N}]: " DIRECT
|
||||||
|
DIRECT="${DIRECT:-$DEFAULT_DIRECT}"
|
||||||
|
if [[ "$DIRECT" =~ ^[Yy]$ ]]; then
|
||||||
|
IMG_PATH="$ISO_PATH"
|
||||||
|
else
|
||||||
|
echo "Converting ISO to UDRW image..."
|
||||||
|
hdiutil convert -format UDRW -o "${WORKDIR}/output.img" "$ISO_PATH"
|
||||||
|
# hdiutil appends .dmg to the output filename even though it is raw content.
|
||||||
|
IMG_PATH="${WORKDIR}/output.img.dmg"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Unmounting $DISK_PATH..."
|
||||||
|
diskutil unmountDisk "$DISK_PATH"
|
||||||
|
|
||||||
|
echo "Writing image to $RDISK_PATH. This may take several minutes..."
|
||||||
|
sudo dd if="$IMG_PATH" of="$RDISK_PATH" bs=1m status=progress
|
||||||
|
|
||||||
|
echo "Ejecting $DISK_PATH..."
|
||||||
|
diskutil eject "$DISK_PATH"
|
||||||
|
|
||||||
|
echo "Done."
|
||||||
@@ -25,7 +25,7 @@ if [[ ":$PATH:" != *":$HOME/.local/bin:"* ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Add script binaries to $PATH if they exist
|
# Add script binaries to $PATH if they exist
|
||||||
if [[ -d $HOME/.scripts && ":$PATH:" != *":$PATH:"* ]]; then
|
if [[ -d $HOME/.scripts && ":$PATH:" != *":$HOME/.scripts:"* ]]; then
|
||||||
export PATH=$PATH:$HOME/.scripts
|
export PATH=$PATH:$HOME/.scripts
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ The zsh theme and plugins are installed manually rather than through a plugin ma
|
|||||||
├── .zshrc # zsh config: PATH, history, completions, prompt, aliases
|
├── .zshrc # zsh config: PATH, history, completions, prompt, aliases
|
||||||
├── .config/
|
├── .config/
|
||||||
│ ├── nvim/ # Neovim config (init.lua, lua/, after/, queries/)
|
│ ├── nvim/ # Neovim config (init.lua, lua/, after/, queries/)
|
||||||
│ └── opencode/ # opencode config (commands, plugins, MCP tools, rules)
|
│ └── opencode/ # opencode config (commands, plugins, skills, MCP tools, rules)
|
||||||
└── .scripts/ # Standalone shell scripts (on $PATH)
|
└── .scripts/ # Standalone shell scripts (on $PATH)
|
||||||
└── hello.sh
|
└── hello.sh
|
||||||
```
|
```
|
||||||
@@ -68,6 +68,29 @@ cd ~/dotfiles && stow -D .
|
|||||||
|
|
||||||
Running `stow .` again re-creates them.
|
Running `stow .` again re-creates them.
|
||||||
|
|
||||||
|
## Add new files or directories
|
||||||
|
|
||||||
|
Add each item to the repository at the same path it should have under the home directory. For example, opencode skills belong under `~/dotfiles/.config/opencode/skills/`. Then refresh the links:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cd ~/dotfiles
|
||||||
|
stow .
|
||||||
|
```
|
||||||
|
|
||||||
|
If the corresponding target does not exist, Stow creates the symlink. This applies to an entire new directory such as `skills` and to files added inside an already-stowed directory.
|
||||||
|
|
||||||
|
If Stow reports that an existing target is neither a link nor a directory, the target is a real file that Stow will not overwrite. When the repository copy is authoritative, back up the target and rerun Stow:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
mv ~/.config/opencode/opencode.jsonc ~/.config/opencode/opencode.jsonc.pre-stow-backup
|
||||||
|
cd ~/dotfiles
|
||||||
|
stow .
|
||||||
|
```
|
||||||
|
|
||||||
|
Repeat the backup step for every conflicting target listed by Stow. Review and remove backups only after confirming the linked configuration works.
|
||||||
|
|
||||||
|
Do not use `stow --adopt` for this workflow. `--adopt` copies the existing target into the repository, replacing the repository version, which is the opposite of making the repository authoritative.
|
||||||
|
|
||||||
## Secrets
|
## Secrets
|
||||||
|
|
||||||
If `~/.secrets` exists, `.zshrc` sources it near the top of the file so environment variables (API keys, tokens, etc.) are exported into the shell. This file is intentionally **not** part of the repo — create it locally and keep it out of version control.
|
If `~/.secrets` exists, `.zshrc` sources it near the top of the file so environment variables (API keys, tokens, etc.) are exported into the shell. This file is intentionally **not** part of the repo — create it locally and keep it out of version control.
|
||||||
|
|||||||
Reference in New Issue
Block a user