From 5477f97f5d7e10965c6db6c69a42dd48a98a3a79 Mon Sep 17 00:00:00 2001 From: Michael Czechowski Date: Wed, 17 Sep 2025 17:05:17 +0200 Subject: [PATCH] feat: add APSFreeWiFi profile for public cafe networks --- README.md | 2 +- common.nix | 62 +++++++++++++++++++++++------------ docs/USB_BOOT_INSTRUCTIONS.md | 5 +-- 3 files changed, 45 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 10c8d6b..4fce3c5 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ browser wordpress # Open directly in Firefox ## 💾 USB Environment Pre-configured with: -- **Automatic WiFi connection** to workshop network +- **Automatic WiFi connection** to workshop network (CODE_CRISPIES) or public cafe WiFi (APSFreeWiFi) - Docker Swarm + abra installation - SSH client for cloud access - Wildcard DNS resolution (dnsmasq) diff --git a/common.nix b/common.nix index 2b4c278..60ab6a8 100644 --- a/common.nix +++ b/common.nix @@ -246,27 +246,47 @@ isoConfig dns = "none"; # We use dnsmasq ensureProfiles = { profiles = { - "CODE_CRISPIES" = { - connection = { - id = "CODE_CRISPIES"; - type = "wifi"; - autoconnect = true; - }; - wifi = { - mode = "infrastructure"; - ssid = "CODE_CRISPIES"; - }; - wifi-security = { - key-mgmt = "wpa-psk"; - psk = "scienceinthecity2025"; - }; - ipv4 = { - method = "auto"; - }; - ipv6 = { - method = "auto"; - }; - }; + "CODE_CRISPIES" = { + connection = { + id = "CODE_CRISPIES"; + type = "wifi"; + autoconnect = true; + }; + wifi = { + mode = "infrastructure"; + ssid = "CODE_CRISPIES"; + }; + wifi-security = { + key-mgmt = "wpa-psk"; + psk = "scienceinthecity2025"; + }; + ipv4 = { + method = "auto"; + }; + ipv6 = { + method = "auto"; + }; + }; + "APSFreeWiFi" = { + connection = { + id = "APSFreeWiFi"; + type = "wifi"; + autoconnect = true; + }; + wifi = { + mode = "infrastructure"; + ssid = "APSFreeWiFi"; + }; + wifi-security = { + key-mgmt = "none"; + }; + ipv4 = { + method = "auto"; + }; + ipv6 = { + method = "auto"; + }; + }; }; }; }; diff --git a/docs/USB_BOOT_INSTRUCTIONS.md b/docs/USB_BOOT_INSTRUCTIONS.md index d3b1570..192d698 100644 --- a/docs/USB_BOOT_INSTRUCTIONS.md +++ b/docs/USB_BOOT_INSTRUCTIONS.md @@ -71,7 +71,7 @@ ## Getting Started Commands ```bash -# WiFi connects automatically - no manual setup needed! +# WiFi connects automatically to CODE_CRISPIES or APSFreeWiFi - no manual setup needed! # Set up your local environment setup @@ -120,7 +120,8 @@ Name: Android, Password: (ask facilitator) → Note: Terminal no longer auto-starts to prevent boot hangs **Can't connect to internet** -→ WiFi should connect automatically to "CODE_CRISPIES" +→ WiFi should connect automatically to "CODE_CRISPIES" or "APSFreeWiFi" +→ If connecting to APSFreeWiFi, complete browser login when prompted → If not, use mobile hotspot as backup → Check: nmcli connection show --active