From e7d3aa006082d6b25e40f23cdadde9a177f59da0 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 17 Aug 2023 15:06:58 +0200
Subject: ...

---
 flake.lock                   | 12 ++++++------
 flake.nix                    |  6 ++++--
 hosts/vidhar/network/dsl.nix |  8 +-------
 overlays/ppp.nix             |  6 ------
 4 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 overlays/ppp.nix

diff --git a/flake.lock b/flake.lock
index 51ddf59f..35cbeec9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -503,16 +503,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1692174805,
-        "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=",
-        "owner": "NixOS",
+        "lastModified": 1692274974,
+        "narHash": "sha256-uUQVjrLhtJfo8Xyt2LWhjhCCuymP4By0J7g0gMO6IPk=",
+        "owner": "gkleen",
         "repo": "nixpkgs",
-        "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e",
+        "rev": "fd10cb742a0d7bbd52704f3fb8e0f3d3bc41bff7",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "gkleen",
+        "ref": "gkleen/ppp-systemd",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index faec0504..58541a24 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,9 +13,11 @@
   inputs = {
     nixpkgs = {
       type = "github";
-      owner = "NixOS";
+      # owner = "NixOS";
+      owner = "gkleen";
       repo = "nixpkgs";
-      ref = "nixos-unstable";
+      # ref = "nixos-unstable";
+      ref = "gkleen/ppp-systemd";
     };
     nixpkgs-stable = {
       type = "github";
diff --git a/hosts/vidhar/network/dsl.nix b/hosts/vidhar/network/dsl.nix
index 2655b09a..ae874c25 100644
--- a/hosts/vidhar/network/dsl.nix
+++ b/hosts/vidhar/network/dsl.nix
@@ -31,7 +31,7 @@ in {
         maxfail 0
         mtu 1492
         mru 1492
-        plugin rp-pppoe.so
+        plugin pppoe.so
         name telekom
         user 002576900250551137425220#0001@t-online.de
         telekom
@@ -42,14 +42,8 @@ in {
       stopIfChanged = true;
 
       serviceConfig = lib.mkForce {
-        Type = "notify";
         PIDFile = "/run/pppd/${pppInterface}.pid";
         ExecStart = "${lib.getBin pkgs.ppp}/sbin/pppd call telekom up_sdnotify nolog +ipv6";
-        Restart = "always";
-        RestartSec = 5;
-
-        RuntimeDirectory = "pppd";
-        RuntimeDirectoryPreserve = true;
       };
     };
     sops.secrets."pap-secrets" = {
diff --git a/overlays/ppp.nix b/overlays/ppp.nix
deleted file mode 100644
index 8c6b0798..00000000
--- a/overlays/ppp.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ final, prev, ... }: {
-  ppp = prev.ppp.overrideAttrs (oldAttrs: {
-    buildInputs = (oldAttrs.buildInputs or []) ++ [ final.systemd ];
-    makeFlags = (oldAttrs.makeFlags or []) ++ [ "SYSTEMD=yes" ];
-  });
-}
-- 
cgit v1.2.3