summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-08-17 15:06:58 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2023-08-17 15:06:58 +0200
commite7d3aa006082d6b25e40f23cdadde9a177f59da0 (patch)
treed33006ac4216d6c114e847cf77adaa91df4798ba
parent01b1724bae7b20ff4b29645a1f2d2425d7860471 (diff)
downloadnixos-e7d3aa006082d6b25e40f23cdadde9a177f59da0.tar
nixos-e7d3aa006082d6b25e40f23cdadde9a177f59da0.tar.gz
nixos-e7d3aa006082d6b25e40f23cdadde9a177f59da0.tar.bz2
nixos-e7d3aa006082d6b25e40f23cdadde9a177f59da0.tar.xz
nixos-e7d3aa006082d6b25e40f23cdadde9a177f59da0.zip
...
-rw-r--r--flake.lock12
-rw-r--r--flake.nix6
-rw-r--r--hosts/vidhar/network/dsl.nix8
-rw-r--r--overlays/ppp.nix6
4 files changed, 11 insertions, 21 deletions
diff --git a/flake.lock b/flake.lock
index 51ddf59f..35cbeec9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -503,16 +503,16 @@
503 }, 503 },
504 "nixpkgs_2": { 504 "nixpkgs_2": {
505 "locked": { 505 "locked": {
506 "lastModified": 1692174805, 506 "lastModified": 1692274974,
507 "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", 507 "narHash": "sha256-uUQVjrLhtJfo8Xyt2LWhjhCCuymP4By0J7g0gMO6IPk=",
508 "owner": "NixOS", 508 "owner": "gkleen",
509 "repo": "nixpkgs", 509 "repo": "nixpkgs",
510 "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", 510 "rev": "fd10cb742a0d7bbd52704f3fb8e0f3d3bc41bff7",
511 "type": "github" 511 "type": "github"
512 }, 512 },
513 "original": { 513 "original": {
514 "owner": "NixOS", 514 "owner": "gkleen",
515 "ref": "nixos-unstable", 515 "ref": "gkleen/ppp-systemd",
516 "repo": "nixpkgs", 516 "repo": "nixpkgs",
517 "type": "github" 517 "type": "github"
518 } 518 }
diff --git a/flake.nix b/flake.nix
index faec0504..58541a24 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,9 +13,11 @@
13 inputs = { 13 inputs = {
14 nixpkgs = { 14 nixpkgs = {
15 type = "github"; 15 type = "github";
16 owner = "NixOS"; 16 # owner = "NixOS";
17 owner = "gkleen";
17 repo = "nixpkgs"; 18 repo = "nixpkgs";
18 ref = "nixos-unstable"; 19 # ref = "nixos-unstable";
20 ref = "gkleen/ppp-systemd";
19 }; 21 };
20 nixpkgs-stable = { 22 nixpkgs-stable = {
21 type = "github"; 23 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 {
31 maxfail 0 31 maxfail 0
32 mtu 1492 32 mtu 1492
33 mru 1492 33 mru 1492
34 plugin rp-pppoe.so 34 plugin pppoe.so
35 name telekom 35 name telekom
36 user 002576900250551137425220#0001@t-online.de 36 user 002576900250551137425220#0001@t-online.de
37 telekom 37 telekom
@@ -42,14 +42,8 @@ in {
42 stopIfChanged = true; 42 stopIfChanged = true;
43 43
44 serviceConfig = lib.mkForce { 44 serviceConfig = lib.mkForce {
45 Type = "notify";
46 PIDFile = "/run/pppd/${pppInterface}.pid"; 45 PIDFile = "/run/pppd/${pppInterface}.pid";
47 ExecStart = "${lib.getBin pkgs.ppp}/sbin/pppd call telekom up_sdnotify nolog +ipv6"; 46 ExecStart = "${lib.getBin pkgs.ppp}/sbin/pppd call telekom up_sdnotify nolog +ipv6";
48 Restart = "always";
49 RestartSec = 5;
50
51 RuntimeDirectory = "pppd";
52 RuntimeDirectoryPreserve = true;
53 }; 47 };
54 }; 48 };
55 sops.secrets."pap-secrets" = { 49 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 @@
1{ final, prev, ... }: {
2 ppp = prev.ppp.overrideAttrs (oldAttrs: {
3 buildInputs = (oldAttrs.buildInputs or []) ++ [ final.systemd ];
4 makeFlags = (oldAttrs.makeFlags or []) ++ [ "SYSTEMD=yes" ];
5 });
6}