From 2173b4e9c07758df4e1651bbee5e73f00b347a47 Mon Sep 17 00:00:00 2001
From: kurogeek <kurogeek@lmvhaus.com>
Date: Thu, 21 May 2026 11:03:52 +0700
Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci]

lastFile:flake.nix
---
 flake.nix | 101 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 46 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3da15c6..5a0ab9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -103,55 +103,64 @@
               # include files in the images.
               # to set UCI configuration, create a uci-defauts scripts as per
               # official OpenWRT ImageBuilder recommendation.
-              files = pkgs.runCommand "image-files" { } ''
+              files =
+                let
+                  router-config = {
+                    upstream-wifi = {
+                      ssid = "Glom";
+                      password = "";
+                    };
+                  };
+                in
+                pkgs.runCommand "image-files" { } ''
 
-                mkdir -p $out/etc/uci-defaults
-                cat > $out/etc/uci-defaults/99-custom <<EOF
-                uci -q batch << EOI
-                set system.@system[0].hostname='flint'
-                commit
-                EOI
+                  mkdir -p $out/etc/uci-defaults
+                  cat > $out/etc/uci-defaults/99-custom <<EOF
+                  uci -q batch << EOI
+                  set system.@system[0].hostname='flint'
+                  commit
+                  EOI
 
-                # # Add a new wifi-iface for the upstream network (station mode)
-                # uci set wireless.wwan=wifi-iface
-                # uci set wireless.wwan.device='radio0'        # or radio1 for 5GHz
-                # uci set wireless.wwan.mode='sta'
-                # uci set wireless.wwan.network='wwan'
-                # uci set wireless.wwan.ssid='Glom'
-                # uci set wireless.wwan.encryption='psk2'      # use 'psk' for WPA, 'none' for open
-                # uci set wireless.wwan.key='a'
-                # uci commit wireless
-                #
-                # uci set network.wwan=interface
-                # uci set network.wwan.proto='dhcp'
-                # uci commit network
-                #
-                # uci set network.relay=interface
-                # uci set network.relay.proto='relay'
-                # uci set network.relay.network='lan wwan'     # bridges LAN and upstream
-                # uci commit network
-                #
-                # # Edit the existing AP or add a new one:
-                # uci set wireless.default_radio0.ssid='YourRepeaterSSID'
-                # uci set wireless.default_radio0.encryption='psk2'
-                # uci set wireless.default_radio0.key='YourRepeaterPassword'
-                # uci commit wireless
-                #
-                # uci set dhcp.lan.ignore='1'
-                # uci commit dhcp
-                #
-                # uci set firewall.@zone[1].network='wan wan6 wwan'
-                # uci commit firewall
-                #
-                # /etc/init.d/relayd enable
-                # /etc/init.d/relayd start
-                # /etc/init.d/network restart
-                #
-                # /etc/init.d/firewall restart
-                # wifi
+                  # Add a new wifi-iface for the upstream network (station mode)
+                  uci set wireless.wwan=wifi-iface
+                  uci set wireless.wwan.device='radio0'        # or radio1 for 5GHz
+                  uci set wireless.wwan.mode='sta'
+                  uci set wireless.wwan.network='wwan'
+                  uci set wireless.wwan.ssid='${router-config.upstream-wifi.ssid}'
+                  uci set wireless.wwan.encryption='psk2'      # use 'psk' for WPA, 'none' for open
+                  uci set wireless.wwan.key='${router-config.upstream-wifi.password}'
+                  uci commit wireless
 
-                EOF
-              '';
+                  uci set network.wwan=interface
+                  uci set network.wwan.proto='dhcp'
+                  uci commit network
+
+                  uci set network.relay=interface
+                  uci set network.relay.proto='relay'
+                  uci set network.relay.network='lan wwan'     # bridges LAN and upstream
+                  uci commit network
+
+                  # Edit the existing AP or add a new one:
+                  uci set wireless.default_radio0.ssid='YourRepeaterSSID'
+                  uci set wireless.default_radio0.encryption='psk2'
+                  uci set wireless.default_radio0.key='YourRepeaterPassword'
+                  uci commit wireless
+
+                  uci set dhcp.lan.ignore='1'
+                  uci commit dhcp
+
+                  uci set firewall.@zone[1].network='wan wan6 wwan'
+                  uci commit firewall
+
+                  /etc/init.d/relayd enable
+                  /etc/init.d/relayd start
+                  /etc/init.d/network restart
+
+                  /etc/init.d/firewall restart
+                  wifi
+
+                  EOF
+                '';
             };
           in
           inputs.openwrt-imagebuilder.lib.build config;