From 77d1a2fd8a11ea9790e17f24fb29dc4f99f8dc61 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Wed, 25 May 2022 16:46:29 -0700
Subject: [PATCH] NetworkManager connections for each prime type (#63)

* NetworkManager configs for each prime type

* remove that too

* set auto connect priorities

* ugh should work now

* true
---
 Dockerfile.agnos                           |  6 ++---
 userspace/files/blue-prime.nmconnection    | 29 ++++++++++++++++++++++
 userspace/files/lte.nmconnection           |  7 +++---
 userspace/files/magenta-prime.nmconnection | 28 +++++++++++++++++++++
 userspace/usr/comma/comma.sh               |  3 ---
 5 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 userspace/files/blue-prime.nmconnection
 create mode 100644 userspace/files/magenta-prime.nmconnection

diff --git a/Dockerfile.agnos b/Dockerfile.agnos
index ea40f76..223de42 100644
--- a/Dockerfile.agnos
+++ b/Dockerfile.agnos
@@ -155,9 +155,9 @@ COPY --chown=root:root ./userspace/motd/* /etc/update-motd.d/
 COPY ./userspace/files/10-globally-managed-devices.conf /etc/NetworkManager/conf.d/10-globally-managed-devices.conf
 COPY ./userspace/files/NetworkManager.conf /etc/NetworkManager/NetworkManager.conf
 
-# Add LTE connection
-COPY ./userspace/files/lte.nmconnection /usr/lib/NetworkManager/system-connections/
-RUN chmod 600 /usr/lib/NetworkManager/system-connections/lte.nmconnection
+# Add cellular connections
+COPY ./userspace/files/*.nmconnection /usr/lib/NetworkManager/system-connections/
+RUN chmod 600 /usr/lib/NetworkManager/system-connections/*.nmconnection
 
 # Prefer ipv4 over ipv6
 RUN echo "precedence ::ffff:0:0/96 100" >> /etc/gai.conf
diff --git a/userspace/files/blue-prime.nmconnection b/userspace/files/blue-prime.nmconnection
new file mode 100644
index 0000000..5185f1b
--- /dev/null
+++ b/userspace/files/blue-prime.nmconnection
@@ -0,0 +1,29 @@
+[connection]
+id=blue-prime
+uuid=d3e5a78d-7286-4656-b53a-53b5fd372ea3
+type=gsm
+interface-name=cdc-wdm0
+permissions=
+autoconnect=true
+autoconnect-retries=100
+autoconnect-priority=1
+
+[gsm]
+apn=Broadband
+home-only=true
+sim-operator-id=310410
+
+[ipv4]
+route-metric=1000
+dns-priority=1000
+dns-search=
+method=auto
+
+[ipv6]
+ddr-gen-mode=stable-privacy
+dns-search=
+route-metric=1000
+dns-priority=1000
+method=auto
+
+[proxy]
diff --git a/userspace/files/lte.nmconnection b/userspace/files/lte.nmconnection
index 6ba80e5..1beb6f9 100644
--- a/userspace/files/lte.nmconnection
+++ b/userspace/files/lte.nmconnection
@@ -4,12 +4,11 @@ uuid=6586fb1f-4a66-46d4-9164-0100b73750ee
 type=gsm
 interface-name=cdc-wdm0
 permissions=
-autoconnect=yes
-autoconnect-retries=0
+autoconnect=true
+autoconnect-retries=100
 
 [gsm]
-auto-config=yes
-home-only=yes
+auto-config=true
 
 [ipv4]
 route-metric=1000
diff --git a/userspace/files/magenta-prime.nmconnection b/userspace/files/magenta-prime.nmconnection
new file mode 100644
index 0000000..90ac58b
--- /dev/null
+++ b/userspace/files/magenta-prime.nmconnection
@@ -0,0 +1,28 @@
+[connection]
+id=magenta-prime
+uuid=5bf787ca-ba77-4eda-9018-8cbde60ad2c7
+type=gsm
+interface-name=cdc-wdm0
+permissions=
+autoconnect=true
+autoconnect-retries=20
+autoconnect-priority=1
+
+[gsm]
+apn=fast.t-mobile.com
+sim-operator-id=310240
+
+[ipv4]
+route-metric=1000
+dns-priority=1000
+dns-search=
+method=auto
+
+[ipv6]
+ddr-gen-mode=stable-privacy
+dns-search=
+route-metric=1000
+dns-priority=1000
+method=auto
+
+[proxy]
diff --git a/userspace/usr/comma/comma.sh b/userspace/usr/comma/comma.sh
index 71a2141..c45ae34 100755
--- a/userspace/usr/comma/comma.sh
+++ b/userspace/usr/comma/comma.sh
@@ -65,9 +65,6 @@ fi
 # sudo because udev isn't ready yet
 sudo $(which python3) /usr/comma/set_time.py
 
-# TODO: why is this necessary when this is in the connection settings?
-nmcli connection modify --temporary lte gsm.auto-config yes
-nmcli connection modify --temporary lte gsm.home-only yes
 
 while true; do
   pkill -f "$SETUP"