nix: update nixpkgs PRs

[julm/julm-nix.git] / hosts / aubergine / networking / lte.nix

diff --git a/hosts/aubergine/networking/lte.nix b/hosts/aubergine/networking/lte.nix
index 4ac38903ffbabcb01c51fde31eac9212f3831e58..f5c819a687e1cb9e4e45dff7b09d9004ea5230d5 100644 (file)
--- a/hosts/aubergine/networking/lte.nix
+++ b/hosts/aubergine/networking/lte.nix
@@ -2,85 +2,128 @@
 with (import ./names-and-numbers.nix);
 let
   inherit (config.users) users;
+  modemmanager = pkgs.modemmanager-1-18;
+  #modemmanager = pkgs.modemmanager-1-20-4;
 in
 {
-networking.nftables.ruleset = ''
-  table inet filter {
-    chain input {
-      iifname ${lteIface} jump input-net
-      iifname ${lteIface} log level warn prefix "input-net: " counter drop
+  networking.nftables.ruleset = ''
+    table inet filter {
+      chain input {
+        iifname ${lteIface} jump input-net
+        iifname ${lteIface} log level warn prefix "input-net: " counter drop
+      }
+      chain output-net {
+        ip daddr 10.151.0.1 tcp dport 8080 counter accept \
+          comment "mmsd: Prixtel/SFR"
+      }
+      chain output {
+        oifname ${lteIface} jump output-net
+        oifname ${lteIface} log level warn prefix "output-net: " counter drop
+      }
+      chain forward-to-net {
+      }
+      chain forward-from-net {
+      }
+      chain forward-to-net { }
+      chain forward-from-net { }
+      chain forward {
+        iifname { ${wifiIface}, ${eth1Iface}, ${eth2Iface}, ${eth3Iface} } oifname ${lteIface} goto forward-to-net
+        iifname ${lteIface} oifname { ${wifiIface}, ${eth1Iface}, ${eth2Iface}, ${eth3Iface} } goto forward-from-net
+      }
     }
-    chain output-net {
-      ip daddr 10.151.0.1 tcp dport 8080 counter accept \
-        comment "mmsd: Prixtel/SFR"
+    table inet nat {
+      chain postrouting {
+        iifname { ${wifiIface}, ${eth1Iface}, ${eth2Iface}, ${eth3Iface} } oifname ${lteIface} masquerade
+      }
     }
-    chain output {
-      oifname ${lteIface} jump output-net
-      oifname ${lteIface} log level warn prefix "output-net: " counter drop
-    }
-    chain forward-to-net {
-    }
-    chain forward-from-net {
-    }
-    chain forward-to-net { }
-    chain forward-from-net { }
-    chain forward {
-      iifname { ${wifiIface}, ${eth1Iface}, ${eth2Iface}, ${eth3Iface} } oifname ${lteIface} goto forward-to-net
-      iifname ${lteIface} oifname { ${wifiIface}, ${eth1Iface}, ${eth2Iface}, ${eth3Iface} } goto forward-from-net
-    }
-  }
-  table inet nat {
-    chain postrouting {
-      iifname { ${wifiIface}, ${eth1Iface}, ${eth2Iface}, ${eth3Iface} } oifname ${lteIface} masquerade
-    }
-  }
-'';
-services.mmsd.enable = true;
-services.mmsd.extraArgs = ["--debug"];
-systemd.services.NetworkManager.wants = [ "ModemManager.service" ];
-services.dbus.packages = [ pkgs.dconf ];
-programs.dconf.enable = true;
-environment.etc."NetworkManager/system-connections/Prixtel.nmconnection" = {
-  mode = "600";
-  text = ''
-    [connection]
-    id=Prixtel
-    uuid=b223f550-dff1-4ba3-9755-cd4557faaa5a
-    type=gsm
-    autoconnect=true
-    permissions=user:${users.julm.name}:;
+  '';
+  services.mmsd.enable = true;
+  services.mmsd.extraArgs = [ "--debug" ];
+  systemd.services.ModemManager.serviceConfig.ExecStart =
+    lib.mkForce [
+      ""
+      # See https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/780
+      "${modemmanager}/bin/ModemManager --debug"
+    ];
+  systemd.services.NetworkManager.wants = [ "ModemManager.service" ];
+  services.dbus.packages = [ pkgs.dconf ];
+  programs.dconf.enable = true;
+  environment.etc."NetworkManager/system-connections/Prixtel.nmconnection" = {
+    mode = "600";
+    text = ''
+      [connection]
+      id=Prixtel
+      uuid=b223f550-dff1-4ba3-9755-cd4557faaa5a
+      type=gsm
+      autoconnect=true
+      autoconnect-priority=999
+      autoconnect-retries=0
 
-    [gsm]
-    apn=sl2sfr
-    number=*99#
-    #home-only=true
+      [gsm]
+      apn=sl2sfr
+      number=*99#
+      #home-only=true
 
-    [ppp]
+      [ppp]
 
-    [ipv4]
-    method=auto
-    dhcp-send-hostname=false
+      [ipv4]
+      method=auto
+      dhcp-send-hostname=false
 
-    [ipv6]
-    method=auto
-    addr-gen-mode=stable-privacy
-    ip6-privacy=2
-    dhcp-send-hostname=false
+      [ipv6]
+      method=auto
+      addr-gen-mode=stable-privacy
+      ip6-privacy=2
+      dhcp-send-hostname=false
 
-    [proxy]
-  '';
-};
-environment.systemPackages = [
-  pkgs.modem-manager-gui
-  pkgs.libmbim
-  pkgs.chatty
-  pkgs.gnome.gnome-contacts
-  pkgs.mmsd-tng
-  pkgs.picocom
-  pkgs.calls
-  pkgs.dfeet
-  # https://gitlab.com/mobian1/callaudiod/-/issues/26
-  # https://gitlab.com/mobian1/callaudiod/-/issues/27
-  pkgs.callaudiod
-];
+      [proxy]
+    '';
+  };
+  systemd.services.watch-lte = {
+    after = [ "ModemManager.service" "NetworkManager.service" "NetworkManager-wait-online.service" ];
+    requires = [ "ModemManager.service" "NetworkManager.service" "NetworkManager-wait-online.service" ];
+    wantedBy = [ "network-online.target" ];
+    #startAt = "*:0/5"; # every 5 min
+    path = with pkgs; [ inetutils modemmanager networkmanager jq ];
+    unitConfig = { StartLimitIntervalSec = 0; };
+    serviceConfig = {
+      Type = "simple";
+      IPAddressAllow = [ "9.9.9.9" ];
+      RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
+      ExecStart = pkgs.writeShellScript "watch-lte" ''
+        set -eux
+        lastPONG=$(date +%s)
+        while sleep 5; do
+          if ping 9.9.9.9 --count 1 --linger 20 --interval 1 --quiet --numeric
+          then lastPONG=$(date +%s)
+          fi
+          if test $(( $(date +%s) - lastPONG )) -gt 300
+          then
+            modem=$(mmcli -L -J | jq -r '.["modem-list"][0]') || true
+            mmcli -m "$modem" --command "AT+CFUN=1,1" || true
+            sleep 10
+            systemctl restart ModemManager
+            sleep 10
+            nmcli connection up Prixtel
+            sleep 300
+          fi
+        done
+      '';
+      Restart = "on-failure";
+      RestartSec = "10s";
+    };
+  };
+  environment.systemPackages = [
+    pkgs.modem-manager-gui
+    pkgs.libmbim
+    pkgs.chatty
+    pkgs.gnome.gnome-contacts
+    pkgs.picocom
+    pkgs.tio
+    pkgs.calls
+    pkgs.d-spy
+    # https://gitlab.com/mobian1/callaudiod/-/issues/26
+    # https://gitlab.com/mobian1/callaudiod/-/issues/27
+    pkgs.callaudiod
+  ];
 }