Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5b76a0b
Packaging: update debian stuff [ci skip]
CarterLi Jul 23, 2024
fb03c95
LM (Linux): improve ssh version detection code
CarterLi Jul 23, 2024
cdee6e2
Display (Linux): don't wake up suspended GPU
CarterLi Jul 23, 2024
57ffe3b
Fastfetch: add icons
CarterLi Jul 23, 2024
dc21636
TerminalFont (Linux): detect system mono font
CarterLi Jul 24, 2024
165b0b0
TerminalFont (Linux): remove Windows Terminal support for WSL
CarterLi Jul 24, 2024
640d066
Logo (Image): don't require logo height when using position right
CarterLi Jul 24, 2024
8fa4d7a
Fastfetch: add option `--key-type <enum>`
CarterLi Jul 24, 2024
bee7c62
Global: add option `--<module>-key-icon`
CarterLi Jul 24, 2024
14b9e88
Editor: fix printing editor type
CarterLi Jul 24, 2024
3b3c1a9
Global: support display predefined icon in custom key format
CarterLi Jul 24, 2024
86e5572
Custom: fix using icon as key
CarterLi Jul 24, 2024
0703b2b
NetIO: don't use the same icon as DiskIO
CarterLi Jul 24, 2024
cba5560
LM: change icon
CarterLi Jul 24, 2024
263c54a
Global: add option `display.key.paddingLeft`
CarterLi Jul 24, 2024
8d08a65
Sound: update icon
CarterLi Jul 24, 2024
597dd32
Presets: simplify `examples/2.jsonc` with builtin icon feature
CarterLi Jul 24, 2024
9b038dc
Global: fix JSON option `modules.keyIcon` doesn't work
CarterLi Jul 24, 2024
5b68772
Global: update icon
CarterLi Jul 24, 2024
6a17ef6
Presets: update examples
CarterLi Jul 24, 2024
e7b7645
Presets: remove meaningless presets
CarterLi Jul 24, 2024
cc78d6b
Presets: update some presets
CarterLi Jul 24, 2024
7c37d71
Doc: update help message
CarterLi Jul 24, 2024
9f9a5ba
Android (Linux): report Snapdragon SOC marketing name
CarterLi Jul 25, 2024
44c8fa0
Logo (Image): fix `padding*` not working correctly
CarterLi Jul 25, 2024
bdce8ea
Logo (Image): fix `paddingTop` doesn't work with `position: right`
CarterLi Jul 25, 2024
f91be64
Android (Linux): detect MTK CPU part name
CarterLi Jul 25, 2024
6862747
GPU (macOS): fix possible segfault when detecting GPU frequency (M1 Air)
CarterLi Jul 26, 2024
952152e
Global (macOS): always check NULL after `IORegistryEntryCreateCFPrope…
CarterLi Jul 26, 2024
dc89336
Release: v2.20.0
CarterLi Jul 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
12 changes: 12 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion debian/files
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fastfetch_2.18.1_source.buildinfo universe/utils optional
fastfetch_2.19.1_source.buildinfo universe/utils optional
251 changes: 186 additions & 65 deletions doc/json_schema.json

Large diffs are not rendered by default.

21 changes: 9 additions & 12 deletions presets/archey.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
42 changes: 0 additions & 42 deletions presets/btw.jsonc

This file was deleted.

2 changes: 1 addition & 1 deletion presets/examples/10.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
{
"type": "os",
"key": " OS",
"key": "{icon} OS",
"keyColor": "yellow"
},
{
Expand Down
40 changes: 22 additions & 18 deletions presets/examples/12.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -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",
{
Expand All @@ -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"
},
Expand Down
11 changes: 5 additions & 6 deletions presets/examples/13.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
}
},
"display": {
"separator": "",
"keyWidth": 15
"separator": " "
},
"modules": [
{
Expand All @@ -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"
},
{
Expand Down Expand Up @@ -67,7 +66,7 @@
{
"key": "│ {#36}󰩟 network {#keys}│",
"type": "localip",
"format": "{1} ({4})"
"format": "{ipv4} ({ifname})"
},
{
"key": "├───────────┤",
Expand Down
12 changes: 7 additions & 5 deletions presets/examples/14.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -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"

},
Expand All @@ -29,7 +31,7 @@
"keyColor": "33"
},
{
"key": "󰟾 distro",
"key": "{icon} distro",
"type": "os",
"keyColor": "34"
},
Expand Down Expand Up @@ -73,7 +75,7 @@
{
"key": "󰩟 network",
"type": "localip",
"format": "{1} ({4})",
"format": "{ipv4} ({ifname})",
"keyColor": "36"
},
{
Expand Down
Loading