From 0182d400872f52f2ef2755283dd4bf27290e69e5 Mon Sep 17 00:00:00 2001
From: Storm Dragon <stormdragon2976@gmail.com>
Date: Thu, 31 Mar 2022 23:41:41 -0400
Subject: [PATCH] Hopefully make time sync at boot faster. Update the
 configure-stormux starter script.

---
 files/usr/lib/systemd/system/ntpd.service |  3 +--
 files/usr/local/bin/configure-stormux     | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/files/usr/lib/systemd/system/ntpd.service b/files/usr/lib/systemd/system/ntpd.service
index 1804c04..3eb607f 100644
--- a/files/usr/lib/systemd/system/ntpd.service
+++ b/files/usr/lib/systemd/system/ntpd.service
@@ -6,8 +6,7 @@ Conflicts=systemd-timesyncd.service
 [Service]
 Type=forking
 PrivateTmp=true
-ExecStartPre=/usr/bin/ntpd -gq
-ExecStart=/usr/bin/ntpd -g -u ntp:ntp
+ExecStart=/usr/bin/ntpd -g -G -u ntp:ntp
 Restart=always
 
 [Install]
diff --git a/files/usr/local/bin/configure-stormux b/files/usr/local/bin/configure-stormux
index 12173cf..9b0045d 100755
--- a/files/usr/local/bin/configure-stormux
+++ b/files/usr/local/bin/configure-stormux
@@ -2,6 +2,26 @@
 
 trap 'popd &> /dev/null' EXIT
 if [[ ! -d /opt/configure-stormux ]]; then
+    # Offer to switch fenrir layout.
+    echo "Would you like to switch Fenrir to laptop layout? (y/n)"
+    read -r continue
+    continue="${continue::1}"
+    if [[ "${continue,}" == "y" ]];then
+        sudo sed -i 's/=desktop/=laptop/' /etc/fenrirscreenreader/settings/settings.conf
+        sudo systemctl restart fenrirscreenreader.service
+    fi
+    if ! ping -c1 stormux.org &> /dev/null ; then
+        echo "No internet connection detected. Press enter to open NetworkManager."
+        echo "Note, it is best to put Fenrir into highlight mode while using NetworkManager."
+        echo "In desktop layout this is done by pressing Fenrir+numpad asterisk."
+        echo "That is the key just above numpad 9."
+        echo "In laptop mode, press Fenrir+y."
+        echo "In desktop mode the Fenrir key is numpad insert."
+        echo "In laptop mode the Fenrir key is the Super key, sometimes called the Windows key."
+        echo "Press enter to continue."
+        read -r continue
+        nmtui-connect
+    fi
     echo "Installing configure-stormux..."
     sudo git -C /opt clone https://gitlab.com/stormux/configure-stormux.git || exit 1
 fi