From c5fec3c9a36d69e85f5a04bdeb17775f746d49de Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 30 Nov 2025 17:44:48 +0100
Subject: ...

---
 hosts/vidhar/network/no-double-timeout.patch | 13 +++++++++++++
 hosts/vidhar/network/pppoe.nix               |  5 +++++
 overlays/pppd/default.nix                    |  8 --------
 overlays/pppd/no-double-timeout.patch        | 13 -------------
 4 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 hosts/vidhar/network/no-double-timeout.patch
 delete mode 100644 overlays/pppd/default.nix
 delete mode 100644 overlays/pppd/no-double-timeout.patch

diff --git a/hosts/vidhar/network/no-double-timeout.patch b/hosts/vidhar/network/no-double-timeout.patch
new file mode 100644
index 00000000..53f41ae1
--- /dev/null
+++ b/hosts/vidhar/network/no-double-timeout.patch
@@ -0,0 +1,13 @@
+diff --git i/pppd/plugins/pppoe/discovery.c w/pppd/plugins/pppoe/discovery.c
+index 86bda61..8060558 100644
+--- i/pppd/plugins/pppoe/discovery.c
++++ w/pppd/plugins/pppoe/discovery.c
+@@ -686,7 +686,7 @@ discovery1(PPPoEConnection *conn, int waitWholeTimeoutForPADO)
+ 	conn->discoveryState = STATE_SENT_PADI;
+ 	waitForPADO(conn, timeout, waitWholeTimeoutForPADO);
+ 
+-	timeout *= 2;
++	// timeout *= 2;
+     } while (conn->discoveryState == STATE_SENT_PADI);
+ }
+ 
diff --git a/hosts/vidhar/network/pppoe.nix b/hosts/vidhar/network/pppoe.nix
index d95922aa..6b4942a6 100644
--- a/hosts/vidhar/network/pppoe.nix
+++ b/hosts/vidhar/network/pppoe.nix
@@ -22,6 +22,11 @@ in {
 
     services.pppd = {
       enable = true;
+      package = pkgs.ppp.overrideAttrs (oldAttrs: {
+        patches = (oldAttrs.patches or []) ++ [
+          ./no-double-timeout.patch
+        ];
+      });
       peers.telekom.config = ''
         nodefaultroute
         ifname ${pppInterface}
diff --git a/overlays/pppd/default.nix b/overlays/pppd/default.nix
deleted file mode 100644
index 4f9467e9..00000000
--- a/overlays/pppd/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ final, prev, ... }:
-{
-  ppp = prev.ppp.overrideAttrs (oldAttrs: {
-    patches = (oldAttrs.patches or []) ++ [
-      ./no-double-timeout.patch
-    ];
-  });
-}
diff --git a/overlays/pppd/no-double-timeout.patch b/overlays/pppd/no-double-timeout.patch
deleted file mode 100644
index 53f41ae1..00000000
--- a/overlays/pppd/no-double-timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/pppd/plugins/pppoe/discovery.c w/pppd/plugins/pppoe/discovery.c
-index 86bda61..8060558 100644
---- i/pppd/plugins/pppoe/discovery.c
-+++ w/pppd/plugins/pppoe/discovery.c
-@@ -686,7 +686,7 @@ discovery1(PPPoEConnection *conn, int waitWholeTimeoutForPADO)
- 	conn->discoveryState = STATE_SENT_PADI;
- 	waitForPADO(conn, timeout, waitWholeTimeoutForPADO);
- 
--	timeout *= 2;
-+	// timeout *= 2;
-     } while (conn->discoveryState == STATE_SENT_PADI);
- }
- 
-- 
cgit v1.2.3