diff options
| author | lassulus <lassulus@lassul.us> | 2022-12-30 21:52:45 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-12-30 21:52:45 +0100 |
| commit | 96f27d2db0caf10fb1257f16f58e67484c8ca354 (patch) | |
| tree | 961f24ea689a45061087ab27d26f79d487d23111 /tv/2configs | |
| parent | 59a0ed177a437d4cce269183865b0dedd783ad0a (diff) | |
| parent | 2ebbec1f2d9c16fe084abba87718d0f60e61bf88 (diff) | |
Merge remote-tracking branch 'ni/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 000000000..43b5575c8 --- /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 de77de381..1b176e0b9 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"; |