From 19690656a21484c37cb16d1b3d775b18e56a560a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <carter.li@eoitek.com>
Date: Wed, 12 Jun 2024 19:52:56 +0800
Subject: [PATCH] Presets: update `examples/20`

---
 presets/examples/20.jsonc | 36 ++++++++++++------------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/presets/examples/20.jsonc b/presets/examples/20.jsonc
index 0db2168a4..231d50b62 100644
--- a/presets/examples/20.jsonc
+++ b/presets/examples/20.jsonc
@@ -1,6 +1,6 @@
 // Inspired by https://github.com/usgraphics/TR-100
 {
-    "$schema": "file://home/carterl/fastfetch/doc/json_schema.json",
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
     "logo": null,
     "display": {
         "pipe": true,
@@ -29,11 +29,11 @@
         {
             "type": "version",
             "key": " ",
-            "format": "│                    FASTFETCH {version}                   │"
+            "format": "│                   FASTFETCH v{version}                   │"
         },
         {
             "type": "custom",
-            "format": "│                     MACHINE REPORT                    │"
+            "format": "│                 TR-100 MACHINE REPORT                 │"
         },
         {
             "type": "custom",
@@ -64,13 +64,14 @@
         {
             "type": "localip",
             "key": "│ MAC ADDR   │\u001b[42C",
-            "format": "{mac}",
+            "format": "{mac} ({ifname})",
             "showIPv4": false,
             "showMac": true
         },
         {
             "type": "dns",
-            "key": "│ DNS        │\u001b[42C"
+            "key": "│ DNS        │\u001b[42C",
+            "showType": "ipv4"
         },
         {
             "type": "title",
@@ -100,22 +101,13 @@
         {
             "type": "cpu",
             "key": "│ CPU FREQ   │\u001b[42C",
-            "format": "{freq-max} GHz"
+            "format": "{freq-max}{/freq-max}{freq-base}{/} GHz"
         },
         {
             "type": "loadavg",
-            "key": "│ LOAD 1m    │\u001b[42C",
-            "format": "{loadavg1}"
-        },
-        {
-            "type": "loadavg",
-            "key": "│ LOAD 5m    │\u001b[42C",
-            "format": "{loadavg2}"
-        },
-        {
-            "type": "loadavg",
-            "key": "│ LOAD 15m   │\u001b[42C",
-            "format": "{loadavg3}"
+            "compact": false,
+            // {duration} is not fixed length, hack it
+            "key": "│ LOAD \u001b[s{duration}m\u001b[u\u001b[6C│\u001b[42C"
         },
         {
             "type": "custom",
@@ -153,12 +145,8 @@
         {
             "type": "users",
             "key": "│ LAST LOGIN │\u001b[42C",
-            "format": "{login-time}"
-        },
-        {
-            "type": "users",
-            "key": "│            │\u001b[42C",
-            "format": "{client-ip}{/client-ip}No IP info"
+            "format": "{login-time}{?client-ip} ({client-ip})",
+            "myselfOnly": true
         },
         {
             "type": "uptime",