summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-08-26 12:35:50 +0200
committerlassulus <lassulus@lassul.us>2017-08-26 12:35:50 +0200
commitd970e20a5a706a0aef494f887f2a771571350b5a (patch)
tree0dd367d992aa964de590b314a430eb65b42bcfcb
parent7f08382fbe599a5907ebcdaba59aab1ecf6c71d9 (diff)
lass umts: no longer use environment.wvdial
-rw-r--r--lass/3modules/umts.nix21
1 files changed, 20 insertions, 1 deletions
diff --git a/lass/3modules/umts.nix b/lass/3modules/umts.nix
index 83de4d403..c93c65ad2 100644
--- a/lass/3modules/umts.nix
+++ b/lass/3modules/umts.nix
@@ -31,6 +31,16 @@ let
type = types.str;
default = "default";
};
+ pppDefaults = mkOption {
+ type = types.str;
+ default = ''
+ noipdefault
+ usepeerdns
+ defaultroute
+ persist
+ noauth
+ '';
+ };
};
nixpkgs-1509 = import (pkgs.fetchFromGitHub {
@@ -71,7 +81,16 @@ let
lass ALL= (root) NOPASSWD: ${umts-bin}/bin/umts
'';
- environment.wvdial.dialerDefaults = wvdial-defaults;
+ environment.etc = [
+ {
+ source = pkgs.writeText "wvdial.conf" wvdial-defaults;
+ target = "wvdial.conf";
+ }
+ {
+ source = pkgs.writeText "wvdial" cfg.pppDefaults;
+ target = "ppp/peers/wvdial";
+ }
+ ];
systemd.services.umts = {
description = "UMTS wvdial Service";