Merge pull request #1123 from fastfetch-cli/dev

Release: v2.20.0

Author: CarterLi

CHANGELOG.md

@@ -1,3 +1,32 @@
+# 2.20.0
+
+This release fixes regression of `2.19.0` on M1 MacBook Air. It also introduces a new option `--key-type icon` to display predefined icons in keys (requires newest nerd font). See `fastfetch -h key-type` for detail.
+
+Changes:
+* JSON option `display.keyWidth` has been renamed to `display.key.width`
+    * Previously: `{ "display": { "keyWidth": 3 } }`
+    * Now: `{ "display": { "key": { "width": 3 } } }`
+* Windows Terminal font detection **in WSL** has been removed due to [issue #1113](https://github.com/fastfetch/fastfetch/issues/1113)
+
+Features:
+* Add option `display.key.type: <enum>` to print icons in keys
+    * Supported value `string`, `icon` and `both`. Default to `string` (don't display icons)
+    * Example: `{ "display": { "key": { "type": "icon" } } }`
+* Add option `display.key.paddingLeft: <num>` to print left padding (whitespaces) in keys
+    * Example: `{ "display": { "key": { "paddingLeft": 2 } } }`
+* Add option `modules.keyIcon` to set icon for specified module
+    * Example: `{ "modules": { "type": "command", "keyIcon": "🔑" } }`
+* Report system mono font name for Terminator if used (TerminalFont, Linux)
+* Don't require logo height to be set when using `--logo-position right`
+* Report Snapdragon SOC marketing name for newer Android phones (CPU, Android)
+* Detect MTK SOC part name (CPU, Android)
+
+Bugfixes:
+* Don't wake up suspended GPUs when using `--ds-force-drm` (Display, Linux)
+* Fix printing editor type in JSON result (Editor)
+* Fix `--logo-padding-*` not working correctly (#1121, Logo)
+* Fix possible segfault when detecting GPU frequency (#1121, macOS, GPU)
+
 # 2.19.1
 
 Bugfixes

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.19.1
+    VERSION 2.20.0
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"

debian/changelog

@@ -1,3 +1,15 @@
+fastfetch (2.19.1) jammy; urgency=medium
+
+  * Update to 2.19.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 23 Jul 2024 10:25:14 +0800
+
+fastfetch (2.19.0) jammy; urgency=medium
+
+  * Update to 2.19.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 22 Jul 2024 14:17:55 +0800
+
 fastfetch (2.18.1) jammy; urgency=medium
 
   * Update to 2.18.1

debian/files

@@ -1 +1 @@
-fastfetch_2.18.1_source.buildinfo universe/utils optional
+fastfetch_2.19.1_source.buildinfo universe/utils optional

doc/json_schema.json

@@ -4,20 +4,20 @@
         {
             "type": "title",
             "key": "User",
-            "format": "{1}"
+            "format": "{user-name}"
         },
         {
             "type": "title",
             "key": "Hostname",
-            "format": "{2}"
+            "format": "{host-name}"
         },
         {
             "type": "host",
             "key": "Model"
         },
         {
             "type": "os",
-            "format": "{3} {9} {12}"
+            "format": "{pretty-name} {version-id} {arch}"
         },
         "kernel",
         "uptime",
@@ -34,32 +34,29 @@
             "type": "de",
             "key": "Desktop Environment"
         },
-        {
-            "type": "shell",
-            "format": "{7}"
-        },
+        "shell",
         {
             "type": "terminal",
-            "format": "{5} {6} {#37}█{#97}█ {#36}█{#96}█ {#35}█{#95}█ {#34}█{#94}█ {#33}█{#93}█ {#32}█{#92}█ {#31}█{#91}█ {#30}█{#90}█"
+            "format": "{pretty-name} {version} {#37}█{#97}█ {#36}█{#96}█ {#35}█{#95}█ {#34}█{#94}█ {#33}█{#93}█ {#32}█{#92}█ {#31}█{#91}█ {#30}█{#90}█"
         },
         {
             "type": "packages",
-            "format": "{1}"
+            "format": "{all}"
         },
         {
             "type": "cpu",
             "key": "Temperature",
             "temp": true,
-            "format": "{8}"
+            "format": "{temperature}"
         },
         {
             "type": "cpu",
             "key": "CPU",
-            "format": "{4} x {1}"
+            "format": "{cores-logical} x {name}"
         },
         {
             "type": "gpu",
-            "format": "{2}"
+            "format": "{name}"
         },
         {
             "type": "memory",

presets/archey.jsonc

@@ -40,7 +40,7 @@
         },
         {
             "type": "os",
-            "key": " OS",
+            "key": "{icon} OS",
             "keyColor": "yellow"
         },
         {

presets/btw.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"
         },

presets/examples/10.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": "├───────────┤",