feat(environment): implement Phase 6 with keyboard layout and WiFi credentials migration from ISO

commit: be87177a437a1221fc9d1eb3f6b853e509bb037a
author: bnema · 12mo ago · 2025-10-19 07:53 UTC
parent: b2d4a25
signature: unsigned

5 files · +110 -4

M README.md +10 -4


@@ -10,6 +10,7 @@
10	10		✅ Phase 3: Limine Bootloader - COMPLETE
11	11		✅ Phase 4: Kernel Selection + Microcode - COMPLETE
12	12		✅ Phase 5: Repository Setup (AUR + Chaotic) - COMPLETE
	13	+	✅ Phase 6: Barebone Preset Complete - COMPLETE
13	14
14	15		### Completed
15	16		- ✅ Project structure created

@@ -32,6 +33,8 @@
32	33		- ✅ AMD P-State driver selection (active/guided/passive)
33	34		- ✅ Optional AUR support (yay helper installation)
34	35		- ✅ Optional Chaotic-AUR repository
	36	+	- ✅ Keyboard layout migration from ISO
	37	+	- ✅ WiFi credentials migration from ISO (iwd)
35	38
36	39		### Project Structure
37	40		```

@@ -157,10 +160,13 @@ sudo ./install.sh
157	160
158	161		## Next Steps
159	162
160		-	Phase 6: Barebone Preset Complete + Testing (Week 4)
161		-	- [ ] Add keyboard layout + WiFi migration from ISO
162		-	- [ ] Test matrix for all combinations
163		-	- [ ] Production-ready barebone installer
	163	+	🎉 Milestone 1 Reached! - Barebone preset is production-ready and VM-testable
	164	+
	165	+	Phase 7: Default Preset - Minimal GUI (Week 5)
	166	+	- [ ] Add niri desktop environment
	167	+	- [ ] Setup SDDM display manager
	168	+	- [ ] Add minimal Wayland apps (waybar, mako, fuzzel)
	169	+	- [ ] Add kitty terminal and Firefox browser
164	170
165	171		## Reference
166	172


@@ -10,6 +10,7 @@
10		✅ Phase 3: Limine Bootloader - COMPLETE	10		✅ Phase 3: Limine Bootloader - COMPLETE
11		✅ Phase 4: Kernel Selection + Microcode - COMPLETE	11		✅ Phase 4: Kernel Selection + Microcode - COMPLETE
12		✅ Phase 5: Repository Setup (AUR + Chaotic) - COMPLETE	12		✅ Phase 5: Repository Setup (AUR + Chaotic) - COMPLETE
			13	+	✅ Phase 6: Barebone Preset Complete - COMPLETE
13			14
14		### Completed	15		### Completed
15		- ✅ Project structure created	16		- ✅ Project structure created

@@ -32,6 +33,8 @@
32		- ✅ AMD P-State driver selection (active/guided/passive)	33		- ✅ AMD P-State driver selection (active/guided/passive)
33		- ✅ Optional AUR support (yay helper installation)	34		- ✅ Optional AUR support (yay helper installation)
34		- ✅ Optional Chaotic-AUR repository	35		- ✅ Optional Chaotic-AUR repository
			36	+	- ✅ Keyboard layout migration from ISO
			37	+	- ✅ WiFi credentials migration from ISO (iwd)
35			38
36		### Project Structure	39		### Project Structure
37		```	40		```

@@ -157,10 +160,13 @@ sudo ./install.sh
157			160
158		## Next Steps	161		## Next Steps
159			162
160	-	Phase 6: Barebone Preset Complete + Testing (Week 4)	163	+	🎉 Milestone 1 Reached! - Barebone preset is production-ready and VM-testable
161	-	- [ ] Add keyboard layout + WiFi migration from ISO	164	+
162	-	- [ ] Test matrix for all combinations	165	+	Phase 7: Default Preset - Minimal GUI (Week 5)
163	-	- [ ] Production-ready barebone installer	166	+	- [ ] Add niri desktop environment
			167	+	- [ ] Setup SDDM display manager
			168	+	- [ ] Add minimal Wayland apps (waybar, mako, fuzzel)
			169	+	- [ ] Add kitty terminal and Firefox browser
164			170
165		## Reference	171		## Reference
166			172

M install/config/network.sh +20 -0


@@ -29,6 +29,26 @@ arch-chroot /mnt systemctl enable systemd-resolved
29	29		# Enable iwd for WiFi
30	30		arch-chroot /mnt systemctl enable iwd
31	31
	32	+	# Migrate WiFi credentials from ISO if detected
	33	+	if [ -n "$ARCHUP_WIFI_SSID" ] && [ -n "$ARCHUP_WIFI_PASSPHRASE" ]; then
	34	+	gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Migrating WiFi credentials..."
	35	+
	36	+	# Create iwd config directory in target system
	37	+	mkdir -p /mnt/var/lib/iwd
	38	+
	39	+	# Create PSK file for the WiFi network
	40	+	cat > "/mnt/var/lib/iwd/${ARCHUP_WIFI_SSID}.psk" <<EOF
	41	+	[Security]
	42	+	PreSharedKey=$ARCHUP_WIFI_PASSPHRASE
	43	+
	44	+	[Settings]
	45	+	AutoConnect=true
	46	+	EOF
	47	+
	48	+	gum style --foreground 2 --padding "0 0 0 $PADDING_LEFT" "✓ WiFi credentials migrated: $ARCHUP_WIFI_SSID"
	49	+	echo "WiFi credentials migrated: $ARCHUP_WIFI_SSID (auto-connect enabled)" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	50	+	fi
	51	+
32	52		gum style --foreground 2 --padding "0 0 1 $PADDING_LEFT" "✓ Network configured (DHCP)"
33	53
34	54		echo "Enabled systemd-networkd and iwd" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"


@@ -29,6 +29,26 @@ arch-chroot /mnt systemctl enable systemd-resolved
29	# Enable iwd for WiFi	29		# Enable iwd for WiFi
30	arch-chroot /mnt systemctl enable iwd	30		arch-chroot /mnt systemctl enable iwd
31		31
		32	+	# Migrate WiFi credentials from ISO if detected
		33	+	if [ -n "$ARCHUP_WIFI_SSID" ] && [ -n "$ARCHUP_WIFI_PASSPHRASE" ]; then
		34	+	gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Migrating WiFi credentials..."
		35	+
		36	+	# Create iwd config directory in target system
		37	+	mkdir -p /mnt/var/lib/iwd
		38	+
		39	+	# Create PSK file for the WiFi network
		40	+	cat > "/mnt/var/lib/iwd/${ARCHUP_WIFI_SSID}.psk" <<EOF
		41	+	[Security]
		42	+	PreSharedKey=$ARCHUP_WIFI_PASSPHRASE
		43	+
		44	+	[Settings]
		45	+	AutoConnect=true
		46	+	EOF
		47	+
		48	+	gum style --foreground 2 --padding "0 0 0 $PADDING_LEFT" "✓ WiFi credentials migrated: $ARCHUP_WIFI_SSID"
		49	+	echo "WiFi credentials migrated: $ARCHUP_WIFI_SSID (auto-connect enabled)" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
		50	+	fi
		51	+
32	gum style --foreground 2 --padding "0 0 1 $PADDING_LEFT" "✓ Network configured (DHCP)"	52		gum style --foreground 2 --padding "0 0 1 $PADDING_LEFT" "✓ Network configured (DHCP)"
33		53
34	echo "Enabled systemd-networkd and iwd" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"	54		echo "Enabled systemd-networkd and iwd" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"

M install/config/system.sh +7 -0


@@ -26,6 +26,13 @@ echo "LANG=en_US.UTF-8" > /mnt/etc/locale.conf
26	26
27	27		gum style --foreground 2 --padding "0 0 1 $PADDING_LEFT" "✓ Locale set to: en_US.UTF-8"
28	28
	29	+	# Set console keyboard layout (detected from ISO)
	30	+	if [ -n "$ARCHUP_KEYMAP" ]; then
	31	+	echo "KEYMAP=$ARCHUP_KEYMAP" > /mnt/etc/vconsole.conf
	32	+	gum style --foreground 2 --padding "0 0 1 $PADDING_LEFT" "✓ Console keymap set to: $ARCHUP_KEYMAP"
	33	+	echo "Console keymap: $ARCHUP_KEYMAP" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	34	+	fi
	35	+
29	36		# Ask for hostname
30	37		ARCHUP_HOSTNAME=$(gum input --placeholder "Enter hostname" \
31	38		--prompt "Hostname: " \


@@ -26,6 +26,13 @@ echo "LANG=en_US.UTF-8" > /mnt/etc/locale.conf
26		26
27	gum style --foreground 2 --padding "0 0 1 $PADDING_LEFT" "✓ Locale set to: en_US.UTF-8"	27		gum style --foreground 2 --padding "0 0 1 $PADDING_LEFT" "✓ Locale set to: en_US.UTF-8"
28		28
		29	+	# Set console keyboard layout (detected from ISO)
		30	+	if [ -n "$ARCHUP_KEYMAP" ]; then
		31	+	echo "KEYMAP=$ARCHUP_KEYMAP" > /mnt/etc/vconsole.conf
		32	+	gum style --foreground 2 --padding "0 0 1 $PADDING_LEFT" "✓ Console keymap set to: $ARCHUP_KEYMAP"
		33	+	echo "Console keymap: $ARCHUP_KEYMAP" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
		34	+	fi
		35	+
29	# Ask for hostname	36		# Ask for hostname
30	ARCHUP_HOSTNAME=$(gum input --placeholder "Enter hostname" \	37		ARCHUP_HOSTNAME=$(gum input --placeholder "Enter hostname" \
31	--prompt "Hostname: " \	38		--prompt "Hostname: " \

M install/preflight/all.sh +3 -0


@@ -5,5 +5,8 @@
5	5		# Run guards (system validation)
6	6		source "$ARCHUP_INSTALL/preflight/guards.sh"
7	7
	8	+	# Detect environment (keyboard layout, WiFi)
	9	+	run_logged "$ARCHUP_INSTALL/preflight/detect-environment.sh"
	10	+
8	11		# Run begin (welcome and initial config)
9	12		run_logged "$ARCHUP_INSTALL/preflight/begin.sh"


@@ -5,5 +5,8 @@
5	# Run guards (system validation)	5		# Run guards (system validation)
6	source "$ARCHUP_INSTALL/preflight/guards.sh"	6		source "$ARCHUP_INSTALL/preflight/guards.sh"
7		7
		8	+	# Detect environment (keyboard layout, WiFi)
		9	+	run_logged "$ARCHUP_INSTALL/preflight/detect-environment.sh"
		10	+
8	# Run begin (welcome and initial config)	11		# Run begin (welcome and initial config)
9	run_logged "$ARCHUP_INSTALL/preflight/begin.sh"	12		run_logged "$ARCHUP_INSTALL/preflight/begin.sh"

A install/preflight/detect-environment.sh +70 -0

@@ -0,0 +1,70 @@
	1	+	#!/bin/bash
	2	+	# Detect keyboard layout and WiFi settings from the live ISO
	3	+
	4	+	gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Detecting ISO environment..."
	5	+
	6	+	# Detect keyboard layout from current console
	7	+	# Try to get the layout from loadkeys or localectl
	8	+	DETECTED_KEYMAP=""
	9	+
	10	+	if command -v localectl >/dev/null 2>&1; then
	11	+	DETECTED_KEYMAP=$(localectl status \| grep "VC Keymap" \| awk '{print $3}')
	12	+	fi
	13	+
	14	+	# Fallback: check /etc/vconsole.conf if it exists
	15	+	if [ -z "$DETECTED_KEYMAP" ] && [ -f /etc/vconsole.conf ]; then
	16	+	DETECTED_KEYMAP=$(grep "^KEYMAP=" /etc/vconsole.conf \| cut -d'=' -f2)
	17	+	fi
	18	+
	19	+	# Default to us if nothing detected
	20	+	if [ -z "$DETECTED_KEYMAP" ]; then
	21	+	DETECTED_KEYMAP="us"
	22	+	fi
	23	+
	24	+	export ARCHUP_KEYMAP="$DETECTED_KEYMAP"
	25	+	gum style --foreground 2 --padding "0 0 0 $PADDING_LEFT" "✓ Keyboard layout: $ARCHUP_KEYMAP"
	26	+	echo "Keyboard layout detected: $ARCHUP_KEYMAP" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	27	+
	28	+	# Detect WiFi connection from iwd
	29	+	# Check if iwd is running and if we're connected to a network
	30	+	WIFI_SSID=""
	31	+	WIFI_PASSPHRASE=""
	32	+
	33	+	if command -v iwctl >/dev/null 2>&1; then
	34	+	# Get the first wireless device
	35	+	WIFI_DEVICE=$(iwctl device list \| grep -oP 'wlan\d+' \| head -1)
	36	+
	37	+	if [ -n "$WIFI_DEVICE" ]; then
	38	+	# Check if connected to a network
	39	+	WIFI_SSID=$(iwctl station "$WIFI_DEVICE" show \| grep "Connected network" \| awk '{print $3}')
	40	+
	41	+	if [ -n "$WIFI_SSID" ]; then
	42	+	# iwd stores credentials in /var/lib/iwd/
	43	+	# The PSK is stored in a file named SSID.psk
	44	+	IWD_CONFIG="/var/lib/iwd/${WIFI_SSID}.psk"
	45	+
	46	+	if [ -f "$IWD_CONFIG" ]; then
	47	+	# Extract passphrase from iwd config (stored in [Security] section as PreSharedKey)
	48	+	WIFI_PASSPHRASE=$(grep "^PreSharedKey=" "$IWD_CONFIG" \| cut -d'=' -f2)
	49	+	fi
	50	+
	51	+	export ARCHUP_WIFI_SSID="$WIFI_SSID"
	52	+	export ARCHUP_WIFI_DEVICE="$WIFI_DEVICE"
	53	+	export ARCHUP_WIFI_PASSPHRASE="$WIFI_PASSPHRASE"
	54	+
	55	+	gum style --foreground 2 --padding "0 0 0 $PADDING_LEFT" "✓ WiFi network: $WIFI_SSID (device: $WIFI_DEVICE)"
	56	+	echo "WiFi detected: SSID=$WIFI_SSID, device=$WIFI_DEVICE" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	57	+	else
	58	+	gum style --foreground 3 --padding "0 0 0 $PADDING_LEFT" "⊘ No active WiFi connection detected"
	59	+	echo "WiFi: not connected" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	60	+	fi
	61	+	else
	62	+	gum style --foreground 3 --padding "0 0 0 $PADDING_LEFT" "⊘ No WiFi device found"
	63	+	echo "WiFi: no device" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	64	+	fi
	65	+	else
	66	+	gum style --foreground 3 --padding "0 0 0 $PADDING_LEFT" "⊘ iwd not available"
	67	+	echo "WiFi: iwd not available" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	68	+	fi
	69	+
	70	+	echo

@@ -0,0 +1,70 @@
	1	+	#!/bin/bash
	2	+	# Detect keyboard layout and WiFi settings from the live ISO
	3	+
	4	+	gum style --foreground 6 --padding "1 0 0 $PADDING_LEFT" "Detecting ISO environment..."
	5	+
	6	+	# Detect keyboard layout from current console
	7	+	# Try to get the layout from loadkeys or localectl
	8	+	DETECTED_KEYMAP=""
	9	+
	10	+	if command -v localectl >/dev/null 2>&1; then
	11	+	DETECTED_KEYMAP=$(localectl status \| grep "VC Keymap" \| awk '{print $3}')
	12	+	fi
	13	+
	14	+	# Fallback: check /etc/vconsole.conf if it exists
	15	+	if [ -z "$DETECTED_KEYMAP" ] && [ -f /etc/vconsole.conf ]; then
	16	+	DETECTED_KEYMAP=$(grep "^KEYMAP=" /etc/vconsole.conf \| cut -d'=' -f2)
	17	+	fi
	18	+
	19	+	# Default to us if nothing detected
	20	+	if [ -z "$DETECTED_KEYMAP" ]; then
	21	+	DETECTED_KEYMAP="us"
	22	+	fi
	23	+
	24	+	export ARCHUP_KEYMAP="$DETECTED_KEYMAP"
	25	+	gum style --foreground 2 --padding "0 0 0 $PADDING_LEFT" "✓ Keyboard layout: $ARCHUP_KEYMAP"
	26	+	echo "Keyboard layout detected: $ARCHUP_KEYMAP" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	27	+
	28	+	# Detect WiFi connection from iwd
	29	+	# Check if iwd is running and if we're connected to a network
	30	+	WIFI_SSID=""
	31	+	WIFI_PASSPHRASE=""
	32	+
	33	+	if command -v iwctl >/dev/null 2>&1; then
	34	+	# Get the first wireless device
	35	+	WIFI_DEVICE=$(iwctl device list \| grep -oP 'wlan\d+' \| head -1)
	36	+
	37	+	if [ -n "$WIFI_DEVICE" ]; then
	38	+	# Check if connected to a network
	39	+	WIFI_SSID=$(iwctl station "$WIFI_DEVICE" show \| grep "Connected network" \| awk '{print $3}')
	40	+
	41	+	if [ -n "$WIFI_SSID" ]; then
	42	+	# iwd stores credentials in /var/lib/iwd/
	43	+	# The PSK is stored in a file named SSID.psk
	44	+	IWD_CONFIG="/var/lib/iwd/${WIFI_SSID}.psk"
	45	+
	46	+	if [ -f "$IWD_CONFIG" ]; then
	47	+	# Extract passphrase from iwd config (stored in [Security] section as PreSharedKey)
	48	+	WIFI_PASSPHRASE=$(grep "^PreSharedKey=" "$IWD_CONFIG" \| cut -d'=' -f2)
	49	+	fi
	50	+
	51	+	export ARCHUP_WIFI_SSID="$WIFI_SSID"
	52	+	export ARCHUP_WIFI_DEVICE="$WIFI_DEVICE"
	53	+	export ARCHUP_WIFI_PASSPHRASE="$WIFI_PASSPHRASE"
	54	+
	55	+	gum style --foreground 2 --padding "0 0 0 $PADDING_LEFT" "✓ WiFi network: $WIFI_SSID (device: $WIFI_DEVICE)"
	56	+	echo "WiFi detected: SSID=$WIFI_SSID, device=$WIFI_DEVICE" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	57	+	else
	58	+	gum style --foreground 3 --padding "0 0 0 $PADDING_LEFT" "⊘ No active WiFi connection detected"
	59	+	echo "WiFi: not connected" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	60	+	fi
	61	+	else
	62	+	gum style --foreground 3 --padding "0 0 0 $PADDING_LEFT" "⊘ No WiFi device found"
	63	+	echo "WiFi: no device" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	64	+	fi
	65	+	else
	66	+	gum style --foreground 3 --padding "0 0 0 $PADDING_LEFT" "⊘ iwd not available"
	67	+	echo "WiFi: iwd not available" \| tee -a "$ARCHUP_INSTALL_LOG_FILE"
	68	+	fi
	69	+
	70	+	echo