From 69c36df9acb0ca85c7412bf2ebb815fe827c0ba9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 13 Jun 2016 13:48:43 +0200
Subject: l 1 mors: add umts config

---
 lass/2configs/umts.nix | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 lass/2configs/umts.nix

(limited to 'lass/2configs/umts.nix')

diff --git a/lass/2configs/umts.nix b/lass/2configs/umts.nix
new file mode 100644
index 000000000..ddba1b526
--- /dev/null
+++ b/lass/2configs/umts.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with config.krebs.lib;
+
+let
+  nixpkgs-1509 = import (pkgs.fetchFromGitHub {
+    owner = "NixOS"; repo = "nixpkgs-channels";
+    rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
+    sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
+  }) {};
+
+  wvdial = nixpkgs-1509.wvdial; # https://github.com/NixOS/nixpkgs/issues/16113
+
+  modem-device = "/dev/serial/by-id/usb-Lenovo_F5521gw_38214921FBBBC7B0-if09";
+
+  # TODO: currently it is only netzclub
+  umts-bin = pkgs.writeScriptBin "umts" ''
+    #!/bin/sh
+    set -euf
+    systemctl stop wpa_supplicant
+    systemctl start umts
+    trap "systemctl stop umts;trap - INT TERM EXIT;exit" INT TERM EXIT
+    echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf
+    journalctl -xfu umts
+    systemctl start wpa_supplicant
+  '';
+
+  wvdial-defaults = ''
+    Modem = ${modem-device}
+    Init1 = AT+CFUN=1
+    Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0
+    Stupid mode = 1
+    phone= *99#
+    Username = netzclub
+    Password = netzclub
+  '';
+
+
+  out = {
+    environment.shellAliases = {
+      umts = "sudo ${umts-bin}/bin/umts";
+    };
+
+    security.sudo.extraConfig = ''
+      lass ALL= (root) NOPASSWD: ${umts-bin}/bin/umts
+    '';
+
+    environment.wvdial.dialerDefaults = wvdial-defaults;
+
+    systemd.services.umts = {
+      description = "UMTS wvdial Service";
+      serviceConfig = {
+        Type = "simple";
+        Restart = "always";
+        RestartSec = "10s";
+        ExecStart = "${wvdial}/bin/wvdial -n";
+      };
+    };
+  };
+in out
+
-- 
cgit v1.2.3


From 2f77b404abc6ad36e75d437ce46ca2f6931fe389 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 13 Jun 2016 14:07:59 +0200
Subject: l 2 umts: start wpa_supplicant again in trap

---
 lass/2configs/umts.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lass/2configs/umts.nix')

diff --git a/lass/2configs/umts.nix b/lass/2configs/umts.nix
index ddba1b526..ac5991afa 100644
--- a/lass/2configs/umts.nix
+++ b/lass/2configs/umts.nix
@@ -19,10 +19,9 @@ let
     set -euf
     systemctl stop wpa_supplicant
     systemctl start umts
-    trap "systemctl stop umts;trap - INT TERM EXIT;exit" INT TERM EXIT
+    trap "systemctl stop umts && systemctl start wpa_supplicant;trap - INT TERM EXIT;exit" INT TERM EXIT
     echo nameserver 8.8.8.8 | tee -a /etc/resolv.conf
     journalctl -xfu umts
-    systemctl start wpa_supplicant
   '';
 
   wvdial-defaults = ''
-- 
cgit v1.2.3


From abd7b0bd28ccf7635d5f14c7e38bb130dddf8d99 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 13 Jun 2016 22:58:41 +0200
Subject: l 2 umts: upgrade wvdial-defaults

---
 lass/2configs/umts.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lass/2configs/umts.nix')

diff --git a/lass/2configs/umts.nix b/lass/2configs/umts.nix
index ac5991afa..c1fce9ea2 100644
--- a/lass/2configs/umts.nix
+++ b/lass/2configs/umts.nix
@@ -28,10 +28,12 @@ let
     Modem = ${modem-device}
     Init1 = AT+CFUN=1
     Init2 = AT+CGDCONT=1,"IP","pinternet.interkom.de","",0,0
-    Stupid mode = 1
+    Baud = 460800
     phone= *99#
     Username = netzclub
     Password = netzclub
+    Stupid Mode = 1
+    Idle Seconds = 0
   '';
 
 
-- 
cgit v1.2.3