refactor: consolidate app configurations and utility scripts
- Move 32+ app-specific scripts from features/apps/scripts/ to features/scripts/utils/ for centralized packaging. - Create individual Nix modules for orphaned app configurations (btop, kitty, tmux, etc.) in features/apps/ using xdg.configFile. - Fix broken paths in core/system/makima.nix and features/apps/vscode.nix. - Update VSCode configuration to use the modern 'profiles.default.userSettings' API, resolving deprecation warnings. - Merge duplicate 'nomarchy-launch-walker' scripts into a single robust utility. - Remove stale root 'config/' directory. - Update README.md and docs/creating-themes.md to reflect the new architecture and keybindings. - Ensure all modules are correctly imported and verified via nix flake check.
This commit is contained in:
@@ -21,6 +21,7 @@ BOLD='\033[1m'
|
||||
NOMARCHY_REPO=""
|
||||
TARGET_DRIVE=""
|
||||
USERNAME=""
|
||||
LUKS_PASSWORD=""
|
||||
USER_PASSWORD=""
|
||||
TIMEZONE="UTC"
|
||||
HARDWARE_MODULES=""
|
||||
@@ -151,7 +152,7 @@ get_luks_passphrase() {
|
||||
pass2=$(gum input --password --placeholder "Confirm passphrase")
|
||||
|
||||
if [[ "$pass1" == "$pass2" ]]; then
|
||||
USER_PASSWORD="$pass1"
|
||||
LUKS_PASSWORD="$pass1"
|
||||
break
|
||||
else
|
||||
error "Passphrases do not match. Try again."
|
||||
@@ -331,15 +332,14 @@ execute_installation() {
|
||||
|
||||
# 9.1 Partition with disko
|
||||
info "Partitioning disk..."
|
||||
local escaped_drive disko_file tmp_disko
|
||||
escaped_drive=$(printf '%s\n' "$TARGET_DRIVE" | sed 's/[[\.*^$()+?{|]/\\&/g')
|
||||
local disko_file tmp_disko
|
||||
disko_file="$NOMARCHY_REPO/installer/disko-golden.nix"
|
||||
tmp_disko=$(mktemp --suffix=.nix)
|
||||
|
||||
sed "s|@TARGET_DRIVE@|$escaped_drive|g" "$disko_file" > "$tmp_disko"
|
||||
sed "s|@TARGET_DRIVE@|${TARGET_DRIVE}|g" "$disko_file" > "$tmp_disko"
|
||||
|
||||
# For LUKS, we need to provide the passphrase
|
||||
echo -n "$USER_PASSWORD" | disko --mode disko "$tmp_disko"
|
||||
# Provide the LUKS passphrase via stdin for disk encryption
|
||||
echo -n "$LUKS_PASSWORD" | disko --mode disko "$tmp_disko"
|
||||
success "Disk partitioned"
|
||||
|
||||
# 9.2 Generate hardware config
|
||||
|
||||
Reference in New Issue
Block a user