diff options
| author | makefu <github@syntax-fehler.de> | 2023-01-10 13:20:04 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2023-01-10 13:20:04 +0100 |
| commit | ed48ea7ef4ad6874588962f351389c2af36d8199 (patch) | |
| tree | 982b449bc39748236d6e563f2bd388079256acab /tv/2configs | |
| parent | aa1e058ba6e8c3e701a2503d65ddb3c83d5c4f47 (diff) | |
| parent | 206a5d145418c3484100b0598a9593a950fbfc98 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/autotether.nix | 19 | ||||
| -rw-r--r-- | tv/2configs/retiolum.nix | 10 |
2 files changed, 29 insertions, 0 deletions
diff --git a/tv/2configs/autotether.nix b/tv/2configs/autotether.nix new file mode 100644 index 0000000..43b5575 --- /dev/null +++ b/tv/2configs/autotether.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: let + cfg.serial = "17e064850405"; +in { + systemd.services.usb_tether.serviceConfig = { + SyslogIdentifier = "usb_tether"; + ExecStartPre = "${pkgs.android-tools}/bin/adb -s ${cfg.serial} wait-for-device"; + ExecStart = "${pkgs.android-tools}/bin/adb -s ${cfg.serial} shell svc usb setFunctions rndis"; + }; + services.udev.extraRules = /* sh */ '' + ACTION=="add", SUBSYSTEM=="net", KERNEL=="usb*", NAME="android" + + ACTION=="add", SUBSYSTEM=="usb", ATTR{serial}=="${cfg.serial}", \ + TAG+="systemd", ENV{SYSTEMD_WANTS}="usb_tether.service" + ''; + systemd.network.networks.android = { + matchConfig.Name = "android"; + DHCP = "yes"; + }; +} diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix index de77de3..1b176e0 100644 --- a/tv/2configs/retiolum.nix +++ b/tv/2configs/retiolum.nix @@ -11,6 +11,16 @@ with import ./lib; LocalDiscovery = yes ''; tincPackage = pkgs.tinc_pre; + tincUp = lib.mkIf config.systemd.network.enable ""; + }; + systemd.network.networks.retiolum = { + matchConfig.Name = "retiolum"; + address = let + inherit (config.krebs.build.host.nets.retiolum) ip4 ip6; + in [ + "${ip4.addr}/${toString ip4.prefixLength}" + "${ip6.addr}/${toString ip6.prefixLength}" + ]; }; tv.iptables.input-internet-accept-tcp = singleton "tinc"; tv.iptables.input-internet-accept-udp = singleton "tinc"; |