From 6a17ef6a544fa274384d976ae1b872a551aff5a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Wed, 24 Jul 2024 16:25:16 +0800
Subject: [PATCH] Presets: update examples

---
 presets/examples/10.jsonc |  2 +-
 presets/examples/12.jsonc | 40 +++++++++++++++++++++------------------
 presets/examples/13.jsonc | 11 +++++------
 presets/examples/14.jsonc | 12 +++++++-----
 presets/examples/15.jsonc | 11 +++++------
 presets/examples/16.jsonc |  8 ++++----
 presets/examples/17.jsonc |  6 +++---
 presets/examples/18.jsonc |  6 +++---
 presets/examples/20.jsonc |  4 +++-
 presets/examples/22.jsonc |  1 +
 presets/examples/6.jsonc  |  7 +++----
 presets/examples/7.jsonc  | 13 ++++++-------
 presets/examples/8.jsonc  | 37 +++++++++++++-----------------------
 presets/examples/9.jsonc  |  4 +++-
 14 files changed, 79 insertions(+), 83 deletions(-)

diff --git a/presets/examples/10.jsonc b/presets/examples/10.jsonc
index 14f92079d..5d43fe326 100644
--- a/presets/examples/10.jsonc
+++ b/presets/examples/10.jsonc
@@ -40,7 +40,7 @@
         },
         {
             "type": "os",
-            "key": " OS",
+            "key": "{icon} OS",
             "keyColor": "yellow"
         },
         {
diff --git a/presets/examples/12.jsonc b/presets/examples/12.jsonc
index 5cc705b9d..f4c44cf46 100644
--- a/presets/examples/12.jsonc
+++ b/presets/examples/12.jsonc
@@ -6,16 +6,20 @@
     "display": {
         "separator": "->   ",
         "color": {
-            "separator": "1"
+            "separator": "1" // Bold
         },
         "constants": [
-            "─────────────────────────────"
-        ]
+            "───────────────────────────"
+        ],
+        "key": {
+            "type": "both",
+            "paddingLeft": 4
+        }
     },
     "modules": [
         {
             "type": "title",
-            "format": "                                {6}{7}{8}"
+            "format": "                             {user-name-colored}{at-symbol-colored}{host-name-colored}"
         },
         "break",
         {
@@ -24,74 +28,74 @@
         },
         "break",
         {
-            "key": "     OS           ",
+            "key": "OS           ",
             "keyColor": "red",
             "type": "os"
         },
         {
-            "key": "    󰌢 Machine      ",
+            "key": "Machine      ",
             "keyColor": "green",
             "type": "host"
         },
         {
-            "key": "     Kernel       ",
+            "key": "Kernel       ",
             "keyColor": "magenta",
             "type": "kernel"
         },
         {
-            "key": "    󰅐 Uptime       ",
+            "key": "Uptime       ",
             "keyColor": "red",
             "type": "uptime"
         },
         {
-            "key": "    󰍹 Resolution   ",
+            "key": "Resolution   ",
             "keyColor": "yellow",
             "type": "display",
             "compactType": "original-with-refresh-rate"
         },
         {
-            "key": "     WM           ",
+            "key": "WM           ",
             "keyColor": "blue",
             "type": "wm"
         },
         {
-            "key": "     DE           ",
+            "key": "DE           ",
             "keyColor": "green",
             "type": "de"
         },
         {
-            "key": "     Shell        ",
+            "key": "Shell        ",
             "keyColor": "cyan",
             "type": "shell"
         },
         {
-            "key": "     Terminal     ",
+            "key": "Terminal     ",
             "keyColor": "red",
             "type": "terminal"
         },
         {
-            "key": "    󰻠 CPU          ",
+            "key": "CPU          ",
             "keyColor": "yellow",
             "type": "cpu"
         },
         {
-            "key": "    󰍛 GPU          ",
+            "key": "GPU          ",
             "keyColor": "blue",
             "type": "gpu"
         },
         {
-            "key": "    󰑭 Memory       ",
+            "key": "Memory       ",
             "keyColor": "magenta",
             "type": "memory"
         },
         {
-            "key": "    󰩟 Local IP     ",
+            "key": "Local IP     ",
             "keyColor": "red",
             "type": "localip",
             "compact": true
         },
         {
-            "key": "    󰩠 Public IP    ",
+            "key": "Public IP    ",
             "keyColor": "cyan",
             "type": "publicip"
         },
diff --git a/presets/examples/13.jsonc b/presets/examples/13.jsonc
index e4f7c534f..b9e616400 100644
--- a/presets/examples/13.jsonc
+++ b/presets/examples/13.jsonc
@@ -8,8 +8,7 @@
         }
     },
     "display": {
-        "separator": "",
-        "keyWidth": 15
+        "separator": " "
     },
     "modules": [
         {
@@ -19,19 +18,19 @@
         {
             "key": "│ {#31} user    {#keys}│",
             "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
         },
         {
             "key": "│ {#32}󰇅 hname   {#keys}│",
             "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
         },
         {
             "key": "│ {#33}󰅐 uptime  {#keys}│",
             "type": "uptime"
         },
         {
-            "key": "│ {#34}󰟾 distro  {#keys}│",
+            "key": "│ {#34}{icon} distro  {#keys}│",
             "type": "os"
         },
         {
@@ -67,7 +66,7 @@
         {
             "key": "│ {#36}󰩟 network {#keys}│",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
             "key": "├───────────┤",
diff --git a/presets/examples/14.jsonc b/presets/examples/14.jsonc
index 3e7a9f192..f7df5ce33 100644
--- a/presets/examples/14.jsonc
+++ b/presets/examples/14.jsonc
@@ -6,20 +6,22 @@
     },
     "display": {
         "separator": "",
-        "keyWidth": 12
+        "key": {
+            "width": 15
+        }
     },
     "modules": [
         {
             // draw borders first to make colors of left and right border consistant
             "key": " user",
             "type": "title",
-            "format": "{1}",
+            "format": "{user-name}",
             "keyColor": "31"
         },
         {
             "key": "󰇅 hname",
             "type": "title",
-            "format": "{2}",
+            "format": "{host-name}",
             "keyColor": "32"
 
         },
@@ -29,7 +31,7 @@
             "keyColor": "33"
         },
         {
-            "key": "󰟾 distro",
+            "key": "{icon} distro",
             "type": "os",
             "keyColor": "34"
         },
@@ -73,7 +75,7 @@
         {
             "key": "󰩟 network",
             "type": "localip",
-            "format": "{1} ({4})",
+            "format": "{ipv4} ({ifname})",
             "keyColor": "36"
         },
         {
diff --git a/presets/examples/15.jsonc b/presets/examples/15.jsonc
index 665f048a3..c53b083cc 100644
--- a/presets/examples/15.jsonc
+++ b/presets/examples/15.jsonc
@@ -8,8 +8,7 @@
         }
     },
     "display": {
-        "separator": "",
-        "keyWidth": 15
+        "separator": " "
     },
     "modules": [
         {
@@ -19,19 +18,19 @@
         {
             "key": "• {#31} user    {#keys}•",
             "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
         },
         {
             "key": "• {#32}󰇅 hname   {#keys}•",
             "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
         },
         {
             "key": "• {#33}󰅐 uptime  {#keys}•",
             "type": "uptime"
         },
         {
-            "key": "• {#34}󰟾 distro  {#keys}•",
+            "key": "• {#34}{icon} distro  {#keys}•",
             "type": "os"
         },
         {
@@ -67,7 +66,7 @@
         {
             "key": "• {#36}󰩟 network {#keys}•",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
             "key": "•••••••••••••",
diff --git a/presets/examples/16.jsonc b/presets/examples/16.jsonc
index b48635ef2..0d12c152a 100644
--- a/presets/examples/16.jsonc
+++ b/presets/examples/16.jsonc
@@ -18,19 +18,19 @@
         {
             "key": "║ {#31} user    {#keys}║",
             "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
         },
         {
             "key": "║ {#32}󰇅 hname   {#keys}║",
             "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
         },
         {
             "key": "║ {#33}󰅐 uptime  {#keys}║",
             "type": "uptime"
         },
         {
-            "key": "║ {#34}󰟾 distro  {#keys}║",
+            "key": "║ {#34}{icon} distro  {#keys}║",
             "type": "os"
         },
         {
@@ -66,7 +66,7 @@
         {
             "key": "║ {#36}󰩟 network {#keys}║",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
             "key": "╠═══════════╣",
diff --git a/presets/examples/17.jsonc b/presets/examples/17.jsonc
index b72d87280..53808b6d8 100644
--- a/presets/examples/17.jsonc
+++ b/presets/examples/17.jsonc
@@ -19,7 +19,7 @@
     },
     "modules": [
         {
-            "format": "{#1}{#keys}╭{$1}╮\u001b[76D {6}{7}{8} 🖥  ",
+            "format": "{#1}{#keys}╭{$1}╮\u001b[76D {user-name-colored}{at-symbol-colored}{host-name-colored} 🖥  ",
             "type": "title"
         },
         {
@@ -31,7 +31,7 @@
             "type": "uptime"
         },
         {
-            "key": "{$2}{#33}󰟾 distro   ",
+            "key": "{$2}{#33}{icon} distro   ",
             "type": "os"
         },
         {
@@ -68,7 +68,7 @@
         {
             "key": "{$2}{#31}󰩟 network  ",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
             "format": "{#1}{#keys}├{$1}┤",
diff --git a/presets/examples/18.jsonc b/presets/examples/18.jsonc
index 9ee4c3854..1a9024743 100644
--- a/presets/examples/18.jsonc
+++ b/presets/examples/18.jsonc
@@ -19,7 +19,7 @@
     },
     "modules": [
         {
-            "format": "{#1}{#keys}╔{$1}╗\u001b[76D {6}{7}{8} 💻 ",
+            "format": "{#1}{#keys}╔{$1}╗\u001b[76D {user-name-colored}{at-symbol-colored}{host-name-colored} 💻 ",
             "type": "title"
         },
         {
@@ -31,7 +31,7 @@
             "type": "uptime"
         },
         {
-            "key": "{$2}{#33}󰟾 distro   ",
+            "key": "{$2}{#33}{icon} distro   ",
             "type": "os"
         },
         {
@@ -68,7 +68,7 @@
         {
             "key": "{$2}{#31}󰩟 network  ",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
             "format": "{#1}{#keys}╠{$1}╣",
diff --git a/presets/examples/20.jsonc b/presets/examples/20.jsonc
index feab27136..e64c0b086 100644
--- a/presets/examples/20.jsonc
+++ b/presets/examples/20.jsonc
@@ -4,7 +4,9 @@
     "logo": null,
     "display": {
         "pipe": true,
-        "keyWidth": 16,
+        "key": {
+            "width": 16
+        },
         "separator": "│ ",
         "percent": {
             "type": 6
diff --git a/presets/examples/22.jsonc b/presets/examples/22.jsonc
index 43c495e59..f804506ad 100644
--- a/presets/examples/22.jsonc
+++ b/presets/examples/22.jsonc
@@ -1,3 +1,4 @@
+// Designed for Arch Linux
 // Modified from: https://github.com/fastfetch-cli/fastfetch/pull/1025#issuecomment-2177566138
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
diff --git a/presets/examples/6.jsonc b/presets/examples/6.jsonc
index 96c5365d7..21aae35ef 100644
--- a/presets/examples/6.jsonc
+++ b/presets/examples/6.jsonc
@@ -124,18 +124,17 @@
         {
             "type": "title",
             "key": "╭─",
-            "format": "{1}@{2}",
+            "format": "{user-name}@{host-name}",
             "keyColor": "blue"
         },
         {
             "type": "os",
-            "key": "├─", // Just get your distro's logo off nerdfonts.com
+            "key": "├─{icon}", // Just get your distro's logo off nerdfonts.com
             "keyColor": "blue"
         },
         {
             "type": "kernel",
             "key": "├─",
-            "format": "{1} {2}",
             "keyColor": "blue"
         },
         {
@@ -167,7 +166,7 @@
         {
             "type": "wifi",
             "key": "├─",
-            "format": "{4}", // ssid
+            "format": "{ssid}",
             "keyColor": "blue"
         },
         {
diff --git a/presets/examples/7.jsonc b/presets/examples/7.jsonc
index d1cff7870..7a3056e8b 100644
--- a/presets/examples/7.jsonc
+++ b/presets/examples/7.jsonc
@@ -22,9 +22,8 @@
         },
         {
             "type": "os",
-            "key": "├", // Just get your distro's logo off nerdfonts.com
-            "keyColor": "yellow",
-            "format": "{6}{?6} {?}{10}{?10} {?}{8}{?8} {?}{11}"
+            "key": "├{icon}", // Just get your distro's logo off nerdfonts.com
+            "keyColor": "yellow"
         },
         {
             "type": "kernel",
@@ -106,13 +105,13 @@
             "keyColor": "green"
         },
         {
-            "type": "uptime",
-            "key": "├󰅐",
+            "type": "display",
+            "key": "├󰍹",
             "keyColor": "green"
         },
         {
-            "type": "display",
-            "key": "└󰍹",
+            "type": "uptime",
+            "key": "└󰅐",
             "keyColor": "green"
         },
 
diff --git a/presets/examples/8.jsonc b/presets/examples/8.jsonc
index 4993257c7..7cea371fa 100644
--- a/presets/examples/8.jsonc
+++ b/presets/examples/8.jsonc
@@ -11,6 +11,9 @@
         "size": {
             "ndigits": 0,
             "maxPrefix": "MB"
+        },
+        "key": {
+            "type": "icon"
         }
     },
     "modules": [
@@ -22,31 +25,17 @@
                 "host": "blue"
             }
         },
+        "os",
+        "kernel",
+        "memory",
+        "packages",
+        "uptime",
         {
-            "type": "os",
-            "key": "",
-            "format": "{2} {8}"
-        },
-        {
-            "type": "kernel",
-            "key": ""
-        },
-        {
-            "type": "memory",
-            "key": ""
-        },
-        {
-            "type": "packages",
-            "key": "󰏖"
-        },
-        {
-            "type": "uptime",
-            "key": "󰅐"
-        },
-        {
-            "type": "custom",
-            "key": "",
-            "format": "{#31}███{#32}███{#33}███{#34}███{#35}███{#36}███"
+            "type": "colors",
+            "key": "Colors", // For printing icon
+            "block": {
+                "range": [1, 6]
+            }
         }
     ]
 }
diff --git a/presets/examples/9.jsonc b/presets/examples/9.jsonc
index e59577bcc..a67954de6 100644
--- a/presets/examples/9.jsonc
+++ b/presets/examples/9.jsonc
@@ -4,7 +4,9 @@
         "type": "small"
     },
     "display": {
-        "keyWidth": 11,
+        "key": {
+            "width": 11
+        },
         "bar": {
             "charElapsed": "=",
             "charTotal": "-",