vleeuwenmenno/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor hostname preparation to check for NixOS only when hardware configuration is absent
All checks were successful
Nix Format Check / check-format (push) Successful in 39s
Details

Browse Source
This commit is contained in:
Menno van Leeuwen 2025-01-15 11:45:14 +01:00
parent c11c4e7482
commit d48a3d3925
Signed by: vleeuwenmenno
SSH Key Fingerprint: SHA256:OJFmjANpakwD3F2Rsws4GLtbdz1TJ5tkQF0RZmF0TRE
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
setup.sh
View File

@ -353,16 +353,19 @@ prepare_hostname() {
local hostname_file="$HOME/.hostname" local hostname_file="$HOME/.hostname"
local hostname local hostname
if [ -f "$hostname_file" ]; then # Only check for NixOS if hardware configuration is not found
hostname=$(cat "$hostname_file") if command -v nixos-version >/dev/null 2>&1; then
log_success "Hostname already found in $hostname_file. Using $hostname." if [ -f "$hostname_file" ]; then
hostname=$(cat "$hostname_file")
log_success "Hostname already found in $hostname_file. Using $hostname."
if [ ! -f "$DOTFILES_DIR/config/nixos/hardware/$hostname.nix" ]; then if [ ! -f "$DOTFILES_DIR/config/nixos/hardware/$hostname.nix" ]; then
die "No hardware configuration found for $hostname. Please create a hardware configuration for this machine." die "No hardware configuration found for $hostname. Please create a hardware configuration for this machine."
fi
log_success "Hardware configuration found for $hostname. Continuing setup..."
return
fi fi
log_success "Hardware configuration found for $hostname. Continuing setup..."
return
fi fi
# Ensure interactive input before hostname prompt # Ensure interactive input before hostname prompt