From 29714e1875dd622e5ea445fe4b4fe9c86ca5c766 Mon Sep 17 00:00:00 2001
From: Jeffrey Armstrong <jeff@approximatrix.com>
Date: Wed, 12 Feb 2020 12:23:15 -0500
Subject: [PATCH 1/2] Minor fixes for machine model, wm, and memory on FreeMiNT

---
 neofetch | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/neofetch b/neofetch
index 59cfa1b3..bd8264df 100755
--- a/neofetch
+++ b/neofetch
@@ -1261,6 +1261,7 @@ get_model() {
 
         FreeMiNT)
             model=$(sysctl -n hw.model)
+            model=${model/ (_MCH *)}
         ;;
     esac
 
@@ -1799,11 +1800,11 @@ get_wm() {
                 freemint_wm=(/proc/*)
 
                 case ${freemint_wm[*]} in
-                    *xaaes*) wm=XaAES ;;
-                    *myaes*) wm=MyAES ;;
-                    *naes*)  wm=N.AES ;;
-                    geneva)  wm=Geneva ;;
-                    *)       wm="Atari AES" ;;
+                    *xaaes* | *xaloader*) wm=XaAES ;;
+                    *myaes*)              wm=MyAES ;;
+                    *naes*)               wm=N.AES ;;
+                    geneva)               wm=Geneva ;;
+                    *)                    wm="Atari AES" ;;
                 esac
             ;;
         esac
@@ -2560,7 +2561,7 @@ get_memory() {
         "FreeMiNT")
             mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)"
             mem_free="${mem/*  }"
-            mem_total="${mem/  *}"
+            mem_total="${mem/$mem_free}"
             mem_used="$((mem_total - mem_free))"
             mem_total="$((mem_total / 1024))"
             mem_used="$((mem_used / 1024))"

From bb8831831e885c5d581e29a5b07bb9a089a8960e Mon Sep 17 00:00:00 2001
From: Jeffrey Armstrong <jeff@approximatrix.com>
Date: Thu, 13 Feb 2020 07:15:43 -0500
Subject: [PATCH 2/2] Removal of special cases for FreeMiNT color settings. 
 Added blocking of X11 queries on FreeMiNT.

---
 neofetch | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/neofetch b/neofetch
index bd8264df..dfa53ff8 100755
--- a/neofetch
+++ b/neofetch
@@ -2828,6 +2828,10 @@ get_resolution() {
             [[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}"
         ;;
 
+        "FreeMiNT")
+            # Need to block X11 queries
+        ;;
+
         *)
             if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then
                 case $refresh_rate in
@@ -3712,10 +3716,6 @@ get_cols() {
 
     unset -v blocks blocks2 cols
 
-    # TosWin2 on FreeMiNT is terrible at this,
-    # so we'll reset colors arbitrarily.
-    [[ "$term" == "TosWin2" ]] && printf '\e[30;47m'
-
     # Tell info() that we printed manually.
     prin=1
 }
@@ -6766,8 +6766,7 @@ EOF
         ;;
 
         "FreeMiNT"*)
-            # Don't explicitly set colors since
-            # TosWin2 doesn't reset well.
+            set_colors 7
             read -rd '' ascii_data <<'EOF'
 ${c1}          ##
           ##         #########