diff options
author | nin <nineinchnade@gmail.com> | 2017-11-07 20:49:48 +0100 |
---|---|---|
committer | nin <nineinchnade@gmail.com> | 2017-11-07 20:49:48 +0100 |
commit | d2551a2268e54fede53d982e0173424735f94680 (patch) | |
tree | d65ad5523a650de810f6733e02e5471eed83f57e /tv | |
parent | fa78b6615444e6db21045f93c2b3ae763e23aff9 (diff) | |
parent | 111c94fe61e5c47f3af04e38b6d804ee43ca8e98 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'tv')
-rw-r--r-- | tv/1systems/xu/config.nix | 2 | ||||
-rw-r--r-- | tv/2configs/ppp.nix | 32 | ||||
-rw-r--r-- | tv/5pkgs/default.nix | 8 |
3 files changed, 33 insertions, 9 deletions
diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 0363c983..14926fe3 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -13,6 +13,7 @@ with import <stockholm/lib>; <stockholm/tv/2configs/man.nix> <stockholm/tv/2configs/nginx/krebs-pages.nix> <stockholm/tv/2configs/nginx/public_html.nix> + <stockholm/tv/2configs/ppp.nix> <stockholm/tv/2configs/pulse.nix> <stockholm/tv/2configs/retiolum.nix> <stockholm/tv/2configs/binary-cache> @@ -99,7 +100,6 @@ with import <stockholm/lib>; #tlsdate #unetbootin #utillinuxCurses - #wvdial #xdotool #xkill #xl2tpd diff --git a/tv/2configs/ppp.nix b/tv/2configs/ppp.nix new file mode 100644 index 00000000..9cc7568a --- /dev/null +++ b/tv/2configs/ppp.nix @@ -0,0 +1,32 @@ +{ pkgs, ... }: { + + # usage: pppd call default + + environment.etc."ppp/peers/default".text = '' + /dev/ttyACM2 + 921600 + crtscts + defaultroute + holdoff 10 + lock + maxfail 0 + noauth + nodetach + noipdefault + passive + persist + usepeerdns + connect "${pkgs.ppp}/bin/chat -f ${pkgs.writeText "default.chat" '' + ABORT "BUSY" + ABORT "NO CARRIER" + REPORT CONNECT + "" "ATDT*99#" + CONNECT + ''}" + ''; + + environment.systemPackages = [ + pkgs.ppp + ]; + +} diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 9dc7ae7b..261871e6 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -13,14 +13,6 @@ foldl' mergeAttrs {} // { - brscan4 = overrideDerivation super.brscan4 (original: rec { - name = "brscan4-0.4.4-4"; - src = super.fetchurl { - url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd"; - }; - }); - # TODO use XDG_RUNTIME_DIR? cr = self.writeDashBin "cr" '' set -efu |