From 17f3860f9bbeff53da7f5318edc182f561e0c718 Mon Sep 17 00:00:00 2001
From: kurogeek <kurogeek@lmvhaus.com>
Date: Thu, 6 Aug 2026 14:01:25 +0700
Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci]

lastFile:modules/clan/gw-router/default.nix
---
 modules/clan/gw-router/default.nix      | 8 --------
 modules/clan/gw-router/flake-module.nix | 2 +-
 modules/clan/gw-router/pppoe.nix        | 4 +++-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/clan/gw-router/default.nix b/modules/clan/gw-router/default.nix
index 07c88b6..6f092dc 100644
--- a/modules/clan/gw-router/default.nix
+++ b/modules/clan/gw-router/default.nix
@@ -112,14 +112,6 @@
                 pinned (cloned from the old router). null keeps the hardware MAC.
               '';
             };
-
-            pppInterface = lib.mkOption {
-              type = lib.types.str;
-              internal = true;
-              readOnly = true;
-              default = if config.wan.vlanId == null then config.wan.interface else "wan-vlan";
-              description = "Interface pppd dials on (the WAN port or its ISP VLAN).";
-            };
           };
 
           vlans = lib.mkOption {
diff --git a/modules/clan/gw-router/flake-module.nix b/modules/clan/gw-router/flake-module.nix
index 2d59ed3..1f95cdc 100644
--- a/modules/clan/gw-router/flake-module.nix
+++ b/modules/clan/gw-router/flake-module.nix
@@ -3,7 +3,7 @@ let
   module = ./default.nix;
 in
 {
-  flake.clan.modules = {
+  clan.modules = {
     gw-router = module;
   };
   # perSystem =
diff --git a/modules/clan/gw-router/pppoe.nix b/modules/clan/gw-router/pppoe.nix
index 2abd082..25ea515 100644
--- a/modules/clan/gw-router/pppoe.nix
+++ b/modules/clan/gw-router/pppoe.nix
@@ -4,6 +4,8 @@
       { config, ... }:
       let
         creds = config.clan.core.vars.generators.gw-router;
+
+        pppInterface = if settings.wan.vlanId == null then settings.wan.interface else "wan-vlan";
       in
       {
         clan.core.vars.generators.gw-router = {
@@ -30,7 +32,7 @@
           peers.wan = {
             autostart = true;
             config = ''
-              plugin pppoe.so ${settings.wan.pppInterface}
+              plugin pppoe.so ${pppInterface}
               ifname ppp0
               file ${creds.files."pppoe-username".path}
               noipdefault