From 624f2e38f63cbe414f1e868b297e4f74ce762bcd Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 13 Nov 2021 03:23:45 +0100
Subject: [PATCH] nixos-module/container/upstream/pppoe: fix user option

---
 nix/nixos-module/container/upstream/pppoe.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nix/nixos-module/container/upstream/pppoe.nix b/nix/nixos-module/container/upstream/pppoe.nix
index 1e3a83b..3b4abd1 100644
--- a/nix/nixos-module/container/upstream/pppoe.nix
+++ b/nix/nixos-module/container/upstream/pppoe.nix
@@ -16,13 +16,13 @@ in lib.mkIf (pppoeInterfaces != {}) {
 
   environment.etc."ppp/pap-secrets".text = lib.concatMapStrings (ifName:
     let
-      inherit (pppoeInterfaces.${ifName}) user password;
+      inherit (pppoeInterfaces.${ifName}.upstream) user password;
     in ''
       "${user}" * "${password}"
     '') (builtins.attrNames pppoeInterfaces);
   services.pppd = {
     enable = true;
-    peers = builtins.mapAttrs (ifName: { upstream, user, ... }: {
+    peers = builtins.mapAttrs (ifName: { upstream, ... }: {
       enable = true;
       autostart = true;
       config = ''
@@ -30,7 +30,7 @@ in lib.mkIf (pppoeInterfaces != {}) {
         nic-${upstream.link}
         ifname ${ifName}
         # Login settings. (PAP)
-        name "${user}"
+        name "${upstream.user}"
         noauth
         hide-password
         # Connection settings.