Merge pull request #1105 from fastfetch-cli/dev

Release: v2.19.0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,9 +7,9 @@ assignees: ''
 
 ---
 
-Be sure to read [FAQ](https://github.com/fastfetch-cli/fastfetch?tab=readme-ov-file#faq) before submitting a new issue.
+Be sure to read the [FAQ](https://github.com/fastfetch-cli/fastfetch?tab=readme-ov-file#faq) before submitting a new issue.
 
-<!-- We will try hard to solve the issue. However since platforms and hardwares vary greatly, it can be hard to find the root cause is. Providing following information may help us greatly. Thanks in advance -->
+<!-- We will try hard to solve the issue. However since platforms and hardwares vary greatly, it can be hard to find the root cause of an issue. Providing the following information may help us greatly. Thanks in advance! -->
 
 # General description of bug:
 
@@ -17,8 +17,8 @@ Be sure to read [FAQ](https://github.com/fastfetch-cli/fastfetch?tab=readme-ov-f
 * What should happen:
 * Fastfetch version used: <!-- please use the latest version, if possible -->
 * Did it work in an older version: <!-- if yes, which version -->
-* Where did you get the binary: <!-- Github Release / Github Actions / Installed with a package manager (What package manager) / Built from source yourself -->
-* Does this issue still occurs in [the latest dev build](https://github.com/fastfetch-cli/fastfetch/actions/)?
+* Where did you get the binary: <!-- GitHub release / GitHub Actions / installed with a package manager (please tell us which package manager you used!) / built from source yourself -->
+* Does this issue still occur in [the latest dev build](https://github.com/fastfetch-cli/fastfetch/actions/)?
 
 # Often helpful information:
 
@@ -27,7 +27,7 @@ Screenshot:
 
 The content of the configuration file you use (if any):
 ```
-//paste here
+// Paste here
 ```
 
 Output of `fastfetch -c ci.jsonc --format json`:
@@ -36,15 +36,15 @@ Note that this output will contain you public IP. If it is not relevant for the
 -->
 
 ```
-//paste here
+// Paste here
 ```
 
 Output of `fastfetch --list-features`:
 ```
-//paste here
+// Paste here
 ```
 
-## If fastfatch crashed or freezed
+## If fastfatch crashed or froze
 
 Paste the stacktrace here. You may get it with:
 
@@ -65,16 +65,16 @@ If you cannot do the instructions above, please upload the core dump file:
 
 Use `time fastfetch --stat` to show time usage for each module.
 
-## If my image logo didn't show / work
+## If an image or logo didn't show 
 
-<!-- Please make sure the terminal does support the image protocol you used. Note Gnome terminal doesn't support any image protocols -->
+<!-- Please make sure your terminal supports the image protocol you used. Note that GNOME Terminal doesn't support any image protocols. -->
 
 * The image protocol you used: 
 * The terminal you used: 
 * Upload the image file here, or paste the image URL: 
 * Does it work with `--logo-width {WIDTH} --logo-height {HEIGHT}`? 
 
-## If fastfetch behaves incorrectly on shell starting
+## If fastfetch behaves incorrectly on shell startup
 
-* The bug is reproduceable with fresh / clean shell configuration (i.e. `fastfetch` is the single line of `.zshrc` or `~/.config/fish/config.fish`): 
+* The bug is reproducible with a clean shell configuration (i.e. `fastfetch` is the only line in `.zshrc` or `~/.config/fish/config.fish`): 
 * Does `sleep 1` before running `fastfetch` work? 

.github/stale.yml

@@ -0,0 +1,21 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - keepalive
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -99,7 +99,7 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -146,7 +146,7 @@ jobs:
             cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
             cmake --build . --target package --verbose -j4
             ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -185,7 +185,7 @@ jobs:
             cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
             cmake --build . --target package --verbose -j4
             ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -197,6 +197,41 @@ jobs:
           name: fastfetch-linux-armv7
           path: ./fastfetch-*.*
 
+  linux-riscv64:
+    name: Linux-riscv64
+    runs-on: ubuntu-22.04
+    permissions:
+      security-events: write
+      contents: read
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+
+      - name: run VM
+        uses: uraimo/run-on-arch-action@v2
+        id: runcmd
+        with:
+          arch: riscv64
+          distro: ubuntu22.04
+          githubToken: ${{ github.token }}
+          run: |
+            uname -a
+            apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev directx-headers-dev rpm
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: fastfetch-linux-riscv64
+          path: ./fastfetch-*.*
+
   musl-amd64:
     name: Musl-amd64
     runs-on: ubuntu-latest
@@ -224,7 +259,7 @@ jobs:
       - name: run
         run: |
             ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -265,7 +300,7 @@ jobs:
       - name: run
         run: |
             ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -313,7 +348,7 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -333,6 +368,39 @@ jobs:
           name: fastfetch-macos-universal
           path: ./fastfetch-*.*
 
+  sunos-amd64:
+    runs-on: ubuntu-latest
+    name: SunOS-amd64
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+
+      - name: run VM
+        uses: vmactions/omnios-vm@v1
+        with:
+          usesh: true
+          prepare: |
+            uname -a
+            pkg update --accept
+            pkg install gcc13 cmake git pkg-config glib2 dbus sqlite-3 imagemagick
+
+          run: |
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch
+            time ./fastfetch --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest
+            cpack
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: fastfetch-sunos-amd64
+          path: ./fastfetch-*.*
+
   freebsd-amd64:
     name: FreeBSD-amd64
     runs-on: ubuntu-latest
@@ -348,9 +416,9 @@ jobs:
         with:
           operating_system: freebsd
           architecture: x86-64
-          cpu_count: 3
+          cpu_count: 4
           shell: bash
-          version: '13.2'
+          version: '14.1'
           run: |
             uname -a
             sudo pkg update
@@ -370,43 +438,6 @@ jobs:
           name: fastfetch-freebsd-amd64
           path: ./fastfetch-*.*
 
-  freebsd-aarch64:
-    name: FreeBSD-aarch64
-    runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v4
-
-      - name: run VM
-        uses: cross-platform-actions/action@master
-        with:
-          operating_system: freebsd
-          architecture: arm64
-          cpu_count: 3
-          shell: bash
-          version: '13.2'
-          run: |
-            uname -a
-            sudo pkg update
-            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd v4l_compat
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch
-            time ./fastfetch --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-freebsd-aarch64
-          path: ./fastfetch-*.*
-
   windows-amd64:
     name: Windows-amd64
     runs-on: windows-latest
@@ -425,7 +456,7 @@ jobs:
         with:
           msystem: CLANG64
           update: true
-          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-vulkan-headers mingw-w64-clang-x86_64-opencl-icd
+          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-vulkan-headers mingw-w64-clang-x86_64-opencl-icd mingw-w64-clang-x86_64-opencl-headers mingw-w64-clang-x86_64-cppwinrt
 
       - name: print msys version
         run: uname -a
@@ -439,11 +470,14 @@ jobs:
       - name: copy necessary dlls
         run: cp /clang64/bin/{OpenCL,vulkan-1}.dll .
 
+      - name: download amd_ags
+        run: curl -LO https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/raw/master/ags_lib/lib/amd_ags_x64.dll
+
       - name: list features
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -458,10 +492,10 @@ jobs:
         run: ctest
 
       - name: create zip archive
-        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-amd64.zip *.dll fastfetch.exe flashfetch.exe presets
+        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-amd64.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
 
       - name: create 7z archive
-        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-amd64.7z *.dll fastfetch.exe flashfetch.exe presets
+        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-amd64.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
 
       - name: upload artifacts
         uses: actions/upload-artifact@v4
@@ -487,7 +521,7 @@ jobs:
         with:
           msystem: CLANG32
           update: true
-          install: git p7zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-vulkan-headers mingw-w64-clang-i686-opencl-icd
+          install: git p7zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-vulkan-headers mingw-w64-clang-i686-opencl-icd mingw-w64-clang-i686-opencl-headers
 
       - name: print msys version
         run: uname -a
@@ -509,8 +543,11 @@ jobs:
       - name: copy necessary dlls
         run: cp /clang32/bin/{OpenCL,vulkan-1}.dll .
 
+      - name: download amd_ags
+        run: curl -LO https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/raw/master/ags_lib/lib/amd_ags_x86.dll
+
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -525,10 +562,10 @@ jobs:
         run: ctest
 
       - name: create zip archive
-        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-i686.zip *.dll fastfetch.exe flashfetch.exe presets
+        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-i686.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
 
       - name: create 7z archive
-        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-i686.7z *.dll fastfetch.exe flashfetch.exe presets
+        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-i686.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
 
       - name: upload artifacts
         uses: actions/upload-artifact@v4
@@ -544,11 +581,12 @@ jobs:
       - linux-amd64
       - linux-aarch64
       - linux-armv7
+      - linux-riscv64
       - musl-amd64
       - musl-aarch64
       - macos-universal
       - freebsd-amd64
-      - freebsd-aarch64
+      - sunos-amd64
       - windows-amd64
       - windows-i686
     permissions:

CHANGELOG.md

@@ -1,3 +1,240 @@
+# 2.19.0
+
+Changes:
+* JSON option `modules.cpu.freqNdigits` has been renamed and moved to `display.freq.ndigits`
+    * Previously: `{ "modules": { "type": "cpu", "freqNdigits": 2 } }`
+    * Now: `{ "display": { "freq": { "ndigits": 2 } } }`
+    * This option now affects GPU frequency too
+    * By default, frequencies are displayed in *GHz*. Set `display.freq.ndigits` to `-1` to display them in *MHz*
+* JSON option `display.binaryPrefix` has been moved to `display.size.binaryPrefix`
+    * Previously: `{ "display": { "binaryPrefix": "IEC" } }`
+    * Now: `{ "display": { "size": { "binaryPrefix": "IEC" } } }`
+
+Features:
+* Print physical diagonal length if supported (Display)
+* Detect display type in X11 mode (Display)
+* Assume displays connected via DisplayPort are external monitors (Display, Linux)
+* Support GPU frequency detection for Intel XE driver (GPU, Linux)
+* Detect init system on Android (InitSystem, Android)
+* Use background to display color blocks (Colors)
+    * To fix weird vertical black lines in some terminals and match the behavior of neofetch (#1094)
+    * Can be reverted to old behavior with `--colors-symbol block`
+* Support Zed terminal version detection (Terminal)
+* Improve wezterm font detection (TerminalFont)
+* Add option `--separator-length`
+* Support GPU frequency detection for Apple Silicon (GPU, macOS)
+* Detect maximum refresh rate (#1101, Monitor)
+* Detect if HDR mode is supported and enabled (Windows, Display / Monitor)
+* Support physical monitor info detection for FreeBSD and SunOS (Monitor)
+* Support defining constant strings in JSON config file, which can be used to dedupe formattion strings
+```jsonc
+{
+    "display": {
+        "constants": [
+            "Hello", // {$1}
+            "world"  // {$2}
+        ]
+    },
+    "modules": [
+        {
+            "type": "custom",
+            "format": "{$1} {$2}!" // print "Hello world!"
+        },
+        {
+            "type": "custom",
+            "format": "{$2} {$1}" // print "world Hello"
+        }
+    ]
+}
+```
+
+Bugfixes:
+* Fix some presets
+* Better detection for XTerm terminal fonts (#1095, TerminalFont, Linux)
+* Remove debug output (#1097, Windows)
+* Fix command line option `--gpu-hide-type` doesn't work (#1098, GPU)
+* Fix wrong date on Raspbian 10 (#1108, DateTime, Linux)
+* Use `brightness` instead of `actuall_brightness` when detecting current brightness level (Brightness, Linux)
+    * Ref: https://bugzilla.kernel.org/show_bug.cgi?id=203905
+* Fix buffer overflow with long font family names when detecting kitty term font (TerminalFont)
+* Fix some typos
+
+Logos:
+* Update void_small
+* Add ALT Linux
+
+# 2.18.1
+
+Fix a regression introduced in v2.18.0
+
+Changes:
+* `--ts-version` has been renamed to `--detect-version`
+    * `general.detectVersion` in JSON config file
+
+Bugfixes:
+* Fix and improve GPU driver detection (#1084, GPU, Linux)
+
+# 2.18.0
+
+Changes:
+* `yyjson 0.10.0` is required
+* Fastfetch no longer prints `*` (which means it's the default route) if `defaultRouteOnly` is set (LocalIP)
+
+Bugfixes:
+* Fix some memory leaks
+* Fix compatibility with old Python versions
+* Don't detect frequency for AMD cards (GPU, Linux)
+    * Fix possible hang with discrete AMD cards (#1077)
+* Don't print colors in `--pipe` mode (Separator)
+* Don't print `(null)` in property `locator` (PhysicalMemory)
+* Ignore disabled PCI devices (GPU)
+* Fix flag `--opengl-library` doesn't work (OpenGL)
+
+Features:
+* Detect revision of USB drives (#1048, Disk)
+* Support fractional scale factor detection (Display, Linux)
+* Support primary display detection for KDE and GNOME (Display, Linux)
+* Support percent bar in custom formatting
+* Print signal quality by default (Wifi)
+* Detect used OpenGL library version (OpenGL)
+* Support detecting OpenGL version by `EGL` (ANGLE) on Windows (OpenGL)
+
+Logos:
+* Add Arkane Linux
+* Add Opak
+
+# 2.17.2
+
+Changes:
+* Flatpak package count no longer takes runtime packages into account (Packages, Linux)
+
+Bugfixes:
+* Fix formattion with multiple batteries (Battery)
+* Fix incorrect size value for large memory sticks (PhysicalMemory)
+* Fix spelling of `Qt` and `LXQt`
+* Fix building on SunOS if imagemagick support is enabled (Logo, SunOS)
+* Fix typos
+
+Features:
+* Support Ptyxis terminal version and font detection (Terminal / TerminalFont, Linux)
+* Improve Cinnamon version detection (DE)
+* Support `cinnamon-wayland` (WMTheme)
+* `--ts-version false` will disable editor version detection (Editor)
+
+# 2.17.1
+
+Hotfix for a regression that breaks Qt font detection
+
+Bugfixes:
+* Don't generate and install `libffwinrt.dll.a` on MinGW (Windows)
+* Fix building on Windows when imagemagick support is enabled (Logo, Windows)
+* Don't print GPU frequency with `--gpu-temp` for Nvidia cards (#1052, GPU)
+    * `--gpu-driver-specific` needs to be specified
+* Print formatted size when `--gpu-format` is used (#1052, GPU)
+* Ignore QVariant format; fix unreadable Qt font (#1053, Theme, Linux)
+* Fix segfaults with `--show-errors` and an invalid module (#1055)
+
+# 2.17.0
+
+Changes:
+* CMake option `ENABLE_PROPRIETARY_GPU_DRIVER_API` is removed. The GPU driver APIs are now enabled by default.
+    * The option was introduced to reduce the license concerns. Since all non MIT proprietary code has been rewritten manually from scratch, it is no longer necessary.
+    * See <https://github.com/fastfetch-cli/fastfetch/issues/533#issuecomment-2122830958> for detail
+* Option `--logo-separate true` is changed to `--logo-position top` for better readability
+    * Builtin ascii logos can be positioned on the right side now with`--logo-position right`
+
+Features:
+* Add support for `--gpu-detection-method opencl` which uses OpenCL to detect GPUs.
+* Support detecting CPU cache size by using SMBIOS as fallback (CPUCache)
+* Support GPU detection (SunOS)
+* Support GPU type detection with AMD GPU driver (GPU, Windows)
+* Add fast path of version and font detection for kitty (Terminal / TerminalFont)
+* Make sure `stdin` and `stdout` are TTYs when querying terminal
+    * So modules like `TerminalSize` should work when `stdin` or `stdout` is redirected
+* Support argument truncation in `--<module>-format` (#1043)
+    * See `fastfetch --help format` for detail
+* Improve Qt theme detection (#1047, Theme, Linux)
+* Add new JSON config option `general.preRun`, which is executed before fastfetch prints output.
+    * It can be used to generate a temp logo file. For example  
+```jsonc
+{
+    "general": {
+        "preRun": "kitten icat --align=left /path/to/image > /tmp/logo.kitty"
+    },
+    "logo": {
+        "source": "/tmp/logo.kitty",
+        "type": "raw"
+    }
+}
+```
+
+Bugfixes:
+* Fix invalid path (#1031, LM, Linux)
+* Fix VMEM detection for Nvidia GPU (requires `--gpu-driver-specific`) (GPU)
+* Fix AMD `--gpu-driver-specific` for AMD cards (#1032, GPU, Windows)
+* Use Coordinated Universal Time rather than timezone-varying local date (#1046)
+
+Logo:
+* Fix colors of Asahi Linux
+
+# 2.16.0
+
+This release added basic support for SunOS (Solaris, illumos). The binaries provided in the release lack a few useful features (such as Display detection). People who use SunOS should consider building fastfetch themselves.
+
+Changes:
+* Fastfetch now prefers `/etc/os-release` over `/etc/lsb-release` when detecting distro info. 
+    * This may break some distros (notably some debian based distros). File a bug with the content of `os-release` and `lsb-release` if it breaks your distro.
+
+Features:
+* Support Media detection in Windows (Media / Player, Windows)
+    * Requires Windows 10 and later
+* Add new option `--users-myself-only` to display current login user only (Users)
+* Add code name of macOS Sequoia (OS, macOS)
+* Add new module `DNS` to show active DNS servers (DNS)
+* Add new option `--loadavg-compact`. Defaults to true (Loadavg)
+    * Use `--loadavg-compact false` to display load averages in different lines
+* Detect MTU size (LocalIP)
+* Support version detection of pluma, which is the default editor of OpenIndiana (Editor)
+* Print used OGL library, eg EGL, GLX or OSMesa (OpenGL)
+
+Bugfixes:
+* Report error if cache size is unavailable (CPUCache, Android)
+* Trim white spaces in device name (Sound, Linux, #1005)
+* Fix `display.bar.border{Left,Right}` doesn't work in JSON config files (Config)
+* Fix invalid call to `realpath(3)` (Platform, Linux)
+* Fix result calculation (CPUUsage, FreeBSD)
+
+Logos:
+* Add Mauna
+* Add Tuxdeo
+* Add Manjaro ARM
+* Add RedOS
+* Add Arch3
+
+# 2.15.0
+
+Changes:
+* `--bar-border <?bool>` has been changed to `--bar-border-left <string>` and `--bar-border-right <string>`, which are used for customizing the style of bar border.
+    * `--bar-border-left '' --bar-border-right ''` can be used to disable the border
+
+Features:
+* Add ability to skip installing license with INSTALL_LICENSE option (CMake)
+* Make it possible to shorten the theme and icons output (Theme / Icons)
+* Support `-l '?'` to show a question mark
+* Add new module `CPUCache` to display CPU cache sizes (CPUCache)
+* In `--<module>-format`, `{#keys}` and `{#title}` can be used to reference the color of keys and title
+* Improve speed of Guix package detection (Packages, Linux)
+* Assume wm plugins are daemon processes to improve performance (WM, macOS)
+
+Bugfixes:
+* Remove shebangs from completions (#980)
+* Fix while chars not visible in terminal of light theme (Logo)
+* Normalize bright colors to fix color display in Apple Terminal (#991, Colors)
+* Correctly capitalize GNOME (#997, DE, Linux)
+* Fix segfault on system using turkish language (#995, InitSystem, Linux)
+* Fix kubuntu detection (#1000, OS, Linux)
+* Don't display duplicate entries (OS, Linux)
+
 # 2.14.0
 
 Features:
@@ -7,12 +244,14 @@ Features:
 * Print all presets in `--list-presets` for better Windows support (Windows)
 * Support for guix package manager detection (Packages, Linux)
 * Support named variable placeholders in custom module formattion string (#796)
-    * `--title-format '{user-name-colored}{at-symbol-colored}{host-name-colored}'` is equivalent to `--title-format '{6}{7}{8}'`
+    * `--title-format '{user-name-colored}{at-symbol-colored}{host-name-colored}'` is now equivalent to `--title-format '{6}{7}{8}'`
 * Support named color placeholders in custom module formattion string
-    * `--<module>-format '{#red}'` is equivalent to `--<module>-format '{#31}'`
+    * `--<module>-format '{#red}'` is now equivalent to `--<module>-format '{#31}'`
     * `'{#red}'` or `'{#31}'` is preferred over `\u001b[31m` because is more readable and `--pipe` aware (will be ignored in pipe mode)
     * Supported in `Custom` module too
     * See `fastfetch -h format` for detail
+* Add new module `InitSystem`, which detects the name of init system
+    * i.e. process name of pid1. `init`, `systemd`, etc
 * Add option `--color-separator` to set the color of key-value separators
 * Support Guix package manager count (#792, Packages, Linux)
 * Improve python based shell detection (#977, Shell, macOS)
@@ -254,7 +493,7 @@ Features:
 * Improve GPU detection on Linux (GPU, Linux)
     * Support GPU memory usage detection for AMD GPUs
     * Support GPU frequency detection for Intel GPUs
-* Improve performance of Gnome version detection (DE, Linux)
+* Improve performance of GNOME version detection (DE, Linux)
 * Improve performance of kitty version detection (Terminal, Linux)
 * Detect refresh rate when using `--ds-force-drm sysfs-only` (Display, Linux)
 * Add option `--ts-version` to disable terminal and shell version detection. Mainly for benchmarking purposes
@@ -945,7 +1184,7 @@ Bugfixes:
 This release backports some changes from dev branch, and fixes 2 crashing issues
 
 Features:
-* Support KDE / LXQT / MATE / Cinnamon wallpaper detection (Wallpaper, Linux)
+* Support KDE / LXQt / MATE / Cinnamon wallpaper detection (Wallpaper, Linux)
 * Support QTerminal version & terminal font detection
 * Support MATE Terminal version & terminal font detection
 * Set `--pipe true` automatically if stdout is not a tty
@@ -961,7 +1200,7 @@ Bugfixes:
 * Fix Windows drives detection in WSL (Linux, Disk)
 * Fix CPU temp detection (FreeBSD, CPU)
 * Fix disk detection (Android, Disk)
-* Fix Gnome Terminal version and font detection (FreeBSD, TerminalFont)
+* Fix GNOME Terminal version and font detection (FreeBSD, TerminalFont)
 * Fix crash on newer wayland desktops (Linux, Display, #477)
 * Fix vendor detection for Intel GPU (macOS, GPU)
 * Fix possible crashes on Windows Server (Windows, GPU, #484)
@@ -987,11 +1226,11 @@ Features:
 * Add mac address detection `--localip-show-mac` (LocalIP, #451)
 
 Bugfixes:
-* Fix Gnome version detection on Fedora (DE)
+* Fix GNOME version detection on Fedora (DE)
 * Fix Windows drives detection in WSL (Disk)
 
 Changes:
-* In order to make Icons module consistent between different platforms, `--icons-format` no longer supports individual GTK / QT icon params.
+* In order to make Icons module consistent between different platforms, `--icons-format` no longer supports individual GTK / Qt icon params.
 * `--theme-format` no longer supports individual GTK / plasma theme params.
 * `--local-ip-*` and `--public-ip-*` have been changed to `--localip-*` and `--publicip-*`
 * `--localip-compact-type` is no longer supported. Fastfetch now display IPs as `--localip-compat-type multiline` by default, with `--local-compact true` can be set as an alias of `--localip-compact-type oneline`
@@ -1365,7 +1604,7 @@ Fixes build on android (#205)
 # 1.6.0
 
 Features:
-* Detect QT on more DEs than just KDE Plasma. The [Plasma] category was therefore renamed to [QT]
+* Detect Qt on more DEs than just KDE Plasma. The [Plasma] category was therefore renamed to [Qt]
 * Alacritty font detection
 * Load `/etc/fastfetch/config.conf` before user config
 * Disk: print one decimal point if size < 100GB

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.14.0
+    VERSION 2.19.0
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -18,6 +18,8 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(LINUX TRUE CACHE BOOL "..." FORCE) # LINUX means GNU/Linux, not just the kernel
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
     set(BSD TRUE CACHE BOOL "..." FORCE)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
+    set(SunOS TRUE CACHE BOOL "..." FORCE)
 elseif(NOT APPLE AND NOT WIN32)
     message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
 endif()
@@ -42,40 +44,41 @@ include(CheckIncludeFile)
 
 include(CMakeDependentOption)
 
-cmake_dependent_option(ENABLE_VULKAN "Enable vulkan" ON "LINUX OR APPLE OR BSD OR WIN32 OR ANDROID" OFF)
+cmake_dependent_option(ENABLE_VULKAN "Enable vulkan" ON "LINUX OR APPLE OR BSD OR WIN32 OR ANDROID OR SunOS" OFF)
 cmake_dependent_option(ENABLE_WAYLAND "Enable wayland-client" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_XCB_RANDR "Enable xcb-randr" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_XCB "Enable xcb" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_X11 "Enable x11" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_DRM "Enable libdrm" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_DCONF "Enable dconf" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_DBUS "Enable dbus-1" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_XFCONF "Enable libxfconf-0" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_SQLITE3 "Enable sqlite3" ON "LINUX OR BSD OR APPLE" OFF)
+cmake_dependent_option(ENABLE_XCB_RANDR "Enable xcb-randr" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_XCB "Enable xcb" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_X11 "Enable x11" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DRM "Enable libdrm" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DCONF "Enable dconf" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DBUS "Enable dbus-1" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_XFCONF "Enable libxfconf-0" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_SQLITE3 "Enable sqlite3" ON "LINUX OR BSD OR APPLE OR SunOS" OFF)
 cmake_dependent_option(ENABLE_RPM "Enable rpm" ON "LINUX" OFF)
-cmake_dependent_option(ENABLE_IMAGEMAGICK7 "Enable imagemagick 7" ON "LINUX OR BSD OR APPLE OR WIN32" OFF)
-cmake_dependent_option(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON "LINUX OR BSD OR APPLE" OFF)
+cmake_dependent_option(ENABLE_IMAGEMAGICK7 "Enable imagemagick 7" ON "LINUX OR BSD OR APPLE OR WIN32 OR SunOS" OFF)
+cmake_dependent_option(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON "LINUX OR BSD OR APPLE OR SunOS" OFF)
 cmake_dependent_option(ENABLE_CHAFA "Enable chafa" ON "ENABLE_IMAGEMAGICK6 OR ENABLE_IMAGEMAGICK7" OFF)
 cmake_dependent_option(ENABLE_ZLIB "Enable zlib" ON "ENABLE_IMAGEMAGICK6 OR ENABLE_IMAGEMAGICK7" OFF)
-cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR BSD" OFF)
-cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR BSD OR WIN32" OFF)
+cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX OR BSD OR WIN32 OR SunOS" OFF)
+cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR BSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR BSD OR WIN32 OR ANDROID OR SunOS" OFF)
 cmake_dependent_option(ENABLE_LIBNM "Enable libnm" ON "LINUX" OFF)
 cmake_dependent_option(ENABLE_FREETYPE "Enable freetype" ON "ANDROID" OFF)
-cmake_dependent_option(ENABLE_PULSE "Enable pulse" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_PULSE "Enable pulse" ON "LINUX OR SunOS" OFF)
 cmake_dependent_option(ENABLE_DDCUTIL "Enable ddcutil" ON "LINUX" OFF)
 cmake_dependent_option(ENABLE_DIRECTX_HEADERS "Enable DirectX headers for WSL" ON "LINUX" OFF)
 cmake_dependent_option(ENABLE_THREADS "Enable multithreading" ON "Threads_FOUND" OFF)
 
 option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded) yyjson library" OFF)
 option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF)
-option(ENABLE_PROPRIETARY_GPU_DRIVER_API "Enable proprietary GPU driver API (NVML, IGCL and AGS)" ON)
+option(ENABLE_LTO "Enable link-time optimization in release mode if supported" ON)
 option(BUILD_TESTS "Build tests" OFF) # Also create test executables
 option(SET_TWEAK "Add tweak to project version" ON) # This is set to off by github actions for release builds
 option(IS_MUSL "Build with musl libc" OFF) # Used by Github Actions
+option(INSTALL_LICENSE "Install license into /usr/share/licenses" ON)
 
 set(BINARY_LINK_TYPE_OPTIONS dlopen dynamic static)
 set(BINARY_LINK_TYPE dlopen CACHE STRING "How to link fastfetch")
@@ -117,7 +120,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} -Werror=incompatible-pointe
 if(WIN32 OR ENABLE_DIRECTX_HEADERS)
     enable_language(CXX)
     set(CMAKE_CXX_STANDARD 17)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -fno-exceptions -fno-rtti")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
 endif()
 
 if(WIN32)
@@ -137,7 +140,7 @@ if(NOT WIN32)
     set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
 endif()
 
-if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+if(ENABLE_LTO AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     message(STATUS "Enabling LTO")
     include(CheckIPOSupported)
     check_ipo_supported(RESULT IPO_SUPPORTED)
@@ -253,7 +256,7 @@ if(APPLE)
     configure_file(src/util/apple/Info.plist.in Info.plist @ONLY)
 endif()
 
-string(TIMESTAMP FASTFETCH_BUILD_DATE "%d %B %Y")
+string(TIMESTAMP FASTFETCH_BUILD_DATE "%d %B %Y" UTC)
 configure_file(doc/fastfetch.1.in fastfetch.1 @ONLY)
 
 ####################
@@ -304,6 +307,7 @@ set(LIBFASTFETCH_SRC
     src/detection/media/media.c
     src/detection/netio/netio.c
     src/detection/opencl/opencl.c
+    src/detection/opengl/opengl_shared.c
     src/detection/os/os.c
     src/detection/packages/packages.c
     src/detection/physicalmemory/physicalmemory.c
@@ -330,6 +334,7 @@ set(LIBFASTFETCH_SRC
     src/modules/chassis/chassis.c
     src/modules/colors/colors.c
     src/modules/cpu/cpu.c
+    src/modules/cpucache/cpucache.c
     src/modules/cpuusage/cpuusage.c
     src/modules/cursor/cursor.c
     src/modules/custom/custom.c
@@ -338,6 +343,7 @@ set(LIBFASTFETCH_SRC
     src/modules/de/de.c
     src/modules/disk/disk.c
     src/modules/diskio/diskio.c
+    src/modules/dns/dns.c
     src/modules/editor/editor.c
     src/modules/font/font.c
     src/modules/gpu/gpu.c
@@ -390,6 +396,7 @@ set(LIBFASTFETCH_SRC
     src/options/general.c
     src/options/library.c
     src/util/edidHelper.c
+    src/util/base64.c
     src/util/FFlist.c
     src/util/FFstrbuf.c
     src/util/platform/FFPlatform.c
@@ -410,10 +417,12 @@ if(LINUX)
         src/detection/brightness/brightness_linux.c
         src/detection/chassis/chassis_linux.c
         src/detection/cpu/cpu_linux.c
+        src/detection/cpucache/cpucache_linux.c
         src/detection/cpuusage/cpuusage_linux.c
         src/detection/cursor/cursor_linux.c
         src/detection/bluetooth/bluetooth_linux.c
         src/detection/disk/disk_linux.c
+        src/detection/dns/dns_linux.c
         src/detection/physicaldisk/physicaldisk_linux.c
         src/detection/physicalmemory/physicalmemory_linux.c
         src/detection/diskio/diskio_linux.c
@@ -422,7 +431,11 @@ if(LINUX)
         src/detection/displayserver/linux/wayland/wayland.c
         src/detection/displayserver/linux/wayland/global-output.c
         src/detection/displayserver/linux/wayland/zwlr-output.c
+        src/detection/displayserver/linux/wayland/kde-output.c
         src/detection/displayserver/linux/wayland/wlr-output-management-unstable-v1-protocol.c
+        src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c
+        src/detection/displayserver/linux/wayland/kde-output-order-v1-protocol.c
+        src/detection/displayserver/linux/wayland/xdg-output-unstable-v1-protocol.c
         src/detection/displayserver/linux/wmde.c
         src/detection/displayserver/linux/xcb.c
         src/detection/displayserver/linux/xlib.c
@@ -480,9 +493,11 @@ elseif(ANDROID)
         src/detection/brightness/brightness_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_linux.c
+        src/detection/cpucache/cpucache_linux.c
         src/detection/cursor/cursor_nosupport.c
         src/detection/cpuusage/cpuusage_linux.c
         src/detection/disk/disk_linux.c
+        src/detection/dns/dns_linux.c
         src/detection/physicaldisk/physicaldisk_linux.c
         src/detection/physicalmemory/physicalmemory_nosupport.c
         src/detection/diskio/diskio_linux.c
@@ -540,9 +555,11 @@ elseif(BSD)
         src/detection/brightness/brightness_bsd.c
         src/detection/chassis/chassis_bsd.c
         src/detection/cpu/cpu_bsd.c
+        src/detection/cpucache/cpucache_shared.c
         src/detection/cpuusage/cpuusage_bsd.c
         src/detection/cursor/cursor_linux.c
         src/detection/disk/disk_bsd.c
+        src/detection/dns/dns_linux.c
         src/detection/physicaldisk/physicaldisk_bsd.c
         src/detection/physicalmemory/physicalmemory_linux.c
         src/detection/diskio/diskio_bsd.c
@@ -551,7 +568,11 @@ elseif(BSD)
         src/detection/displayserver/linux/wayland/wayland.c
         src/detection/displayserver/linux/wayland/global-output.c
         src/detection/displayserver/linux/wayland/zwlr-output.c
+        src/detection/displayserver/linux/wayland/kde-output.c
         src/detection/displayserver/linux/wayland/wlr-output-management-unstable-v1-protocol.c
+        src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c
+        src/detection/displayserver/linux/wayland/kde-output-order-v1-protocol.c
+        src/detection/displayserver/linux/wayland/xdg-output-unstable-v1-protocol.c
         src/detection/displayserver/linux/wmde.c
         src/detection/displayserver/linux/xcb.c
         src/detection/displayserver/linux/xlib.c
@@ -570,7 +591,7 @@ elseif(BSD)
         src/detection/gamepad/gamepad_bsd.c
         src/detection/media/media_linux.c
         src/detection/memory/memory_bsd.c
-        src/detection/monitor/monitor_nosupport.c
+        src/detection/monitor/monitor_linux.c
         src/detection/netio/netio_bsd.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_linux.c
@@ -610,9 +631,11 @@ elseif(APPLE)
         src/detection/brightness/brightness_apple.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_apple.c
+        src/detection/cpucache/cpucache_apple.c
         src/detection/cpuusage/cpuusage_apple.c
         src/detection/cursor/cursor_apple.m
         src/detection/disk/disk_bsd.c
+        src/detection/dns/dns_linux.c
         src/detection/physicaldisk/physicaldisk_apple.c
         src/detection/physicalmemory/physicalmemory_apple.m
         src/detection/diskio/diskio_apple.c
@@ -671,12 +694,14 @@ elseif(WIN32)
         src/detection/brightness/brightness_windows.cpp
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_windows.c
+        src/detection/cpucache/cpucache_windows.c
         src/detection/cpuusage/cpuusage_windows.c
         src/detection/cursor/cursor_windows.c
         src/detection/disk/disk_windows.c
         src/detection/physicaldisk/physicaldisk_windows.c
         src/detection/diskio/diskio_windows.c
         src/detection/displayserver/displayserver_windows.c
+        src/detection/dns/dns_windows.c
         src/detection/font/font_windows.c
         src/detection/gpu/gpu_windows.c
         src/detection/host/host_windows.c
@@ -688,7 +713,7 @@ elseif(WIN32)
         src/detection/locale/locale_windows.c
         src/detection/localip/localip_windows.c
         src/detection/gamepad/gamepad_windows.c
-        src/detection/media/media_nosupport.c
+        src/detection/media/media_windows.c
         src/detection/memory/memory_windows.c
         src/detection/physicalmemory/physicalmemory_linux.c
         src/detection/monitor/monitor_windows.c
@@ -720,6 +745,81 @@ elseif(WIN32)
         src/util/windows/wmi.cpp
         src/util/platform/FFPlatform_windows.c
     )
+elseif(SunOS)
+    list(APPEND LIBFASTFETCH_SRC
+        src/common/dbus.c
+        src/common/io/io_unix.c
+        src/common/netif/netif_bsd.c
+        src/common/networking_linux.c
+        src/common/processing_linux.c
+        src/detection/battery/battery_nosupport.c
+        src/detection/bios/bios_windows.c
+        src/detection/board/board_windows.c
+        src/detection/bootmgr/bootmgr_nosupport.c
+        src/detection/brightness/brightness_nosupport.c
+        src/detection/chassis/chassis_windows.c
+        src/detection/cpu/cpu_sunos.c
+        src/detection/cpucache/cpucache_shared.c
+        src/detection/cpuusage/cpuusage_sunos.c
+        src/detection/cursor/cursor_linux.c
+        src/detection/bluetooth/bluetooth_nosupport.c
+        src/detection/disk/disk_sunos.c
+        src/detection/dns/dns_linux.c
+        src/detection/physicaldisk/physicaldisk_nosupport.c
+        src/detection/physicalmemory/physicalmemory_linux.c
+        src/detection/diskio/diskio_sunos.c
+        src/detection/displayserver/linux/displayserver_linux.c
+        src/detection/displayserver/linux/drm.c
+        src/detection/displayserver/linux/wayland/wayland.c
+        src/detection/displayserver/linux/wayland/global-output.c
+        src/detection/displayserver/linux/wayland/zwlr-output.c
+        src/detection/displayserver/linux/wayland/kde-output.c
+        src/detection/displayserver/linux/wayland/wlr-output-management-unstable-v1-protocol.c
+        src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c
+        src/detection/displayserver/linux/wayland/kde-output-order-v1-protocol.c
+        src/detection/displayserver/linux/wayland/xdg-output-unstable-v1-protocol.c
+        src/detection/displayserver/linux/wmde.c
+        src/detection/displayserver/linux/xcb.c
+        src/detection/displayserver/linux/xlib.c
+        src/detection/font/font_linux.c
+        src/detection/gpu/gpu_sunos.c
+        src/detection/gpu/gpu_pci.c
+        src/detection/gtk_qt/gtk.c
+        src/detection/host/host_windows.c
+        src/detection/icons/icons_linux.c
+        src/detection/initsystem/initsystem_linux.c
+        src/detection/libc/libc_nosupport.c
+        src/detection/lm/lm_nosupport.c
+        src/detection/loadavg/loadavg_sunos.c
+        src/detection/locale/locale_linux.c
+        src/detection/localip/localip_linux.c
+        src/detection/gamepad/gamepad_nosupport.c
+        src/detection/media/media_linux.c
+        src/detection/memory/memory_sunos.c
+        src/detection/monitor/monitor_linux.c
+        src/detection/netio/netio_sunos.c
+        src/detection/opengl/opengl_linux.c
+        src/detection/os/os_sunos.c
+        src/detection/packages/packages_sunos.c
+        src/detection/poweradapter/poweradapter_nosupport.c
+        src/detection/processes/processes_linux.c
+        src/detection/gtk_qt/qt.c
+        src/detection/sound/sound_linux.c
+        src/detection/swap/swap_sunos.c
+        src/detection/terminalfont/terminalfont_linux.c
+        src/detection/terminalshell/terminalshell_linux.c
+        src/detection/terminalsize/terminalsize_linux.c
+        src/detection/theme/theme_linux.c
+        src/detection/uptime/uptime_sunos.c
+        src/detection/users/users_linux.c
+        src/detection/wallpaper/wallpaper_linux.c
+        src/detection/wifi/wifi_nosupport.c
+        src/detection/wm/wm_nosupport.c
+        src/detection/de/de_linux.c
+        src/detection/wmtheme/wmtheme_linux.c
+        src/detection/camera/camera_nosupport.c
+        src/util/platform/FFPlatform_unix.c
+    )
 endif()
 
 if(ENABLE_DIRECTX_HEADERS)
@@ -727,15 +827,13 @@ if(ENABLE_DIRECTX_HEADERS)
     list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_wsl.cpp)
 endif()
 
-if(ENABLE_PROPRIETARY_GPU_DRIVER_API AND (LINUX OR BSD OR WIN32))
-    message(STATUS "Enabling proprietary GPU driver API")
-    if(LINUX OR BSD OR WIN32)
-        list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_nvidia.c)
-    endif()
-    if(WIN32)
-        list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_intel.c)
-        list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_amd.c)
-    endif()
+# Proprietary GPU driver APIs
+if(LINUX OR BSD OR WIN32)
+    list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_nvidia.c)
+endif()
+if(WIN32)
+    list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_intel.c)
+    list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_amd.c)
 endif()
 
 include(CheckFunctionExists)
@@ -764,10 +862,6 @@ add_library(libfastfetch OBJECT
     ${LIBFASTFETCH_SRC}
 )
 
-if(ENABLE_PROPRIETARY_GPU_DRIVER_API AND (LINUX OR BSD OR WIN32))
-    target_compile_definitions(libfastfetch PRIVATE FF_USE_PROPRIETARY_GPU_DRIVER_API)
-endif()
-
 if(yyjson_FOUND)
     target_compile_definitions(libfastfetch PRIVATE FF_USE_SYSTEM_YYJSON)
     target_link_libraries(libfastfetch PRIVATE yyjson::yyjson)
@@ -807,6 +901,8 @@ if(WIN32)
     target_compile_definitions(libfastfetch PUBLIC WIN32_LEAN_AND_MEAN=1)
 elseif(APPLE)
     target_compile_definitions(libfastfetch PUBLIC _DARWIN_C_SOURCE)
+elseif(SunOS)
+    target_compile_definitions(libfastfetch PUBLIC __EXTENSIONS__ _POSIX_C_SOURCE=1)
 endif()
 
 if(HAVE_STATX)
@@ -1035,6 +1131,13 @@ elseif(BSD)
         PRIVATE "usbhid"
         PRIVATE "geom"
     )
+elseif(SunOS)
+    target_link_libraries(libfastfetch
+        PRIVATE "m"
+        PRIVATE "socket"
+        PRIVATE "kstat"
+        PRIVATE "proc"
+    )
 elseif(ANDROID)
     CHECK_LIBRARY_EXISTS(-l:libandroid-wordexp.a wordexp "" HAVE_LIBANDROID_WORDEXP_STATIC)
     if(HAVE_LIBANDROID_WORDEXP_STATIC)
@@ -1060,6 +1163,24 @@ target_link_libraries(libfastfetch
     PRIVATE ${CMAKE_DL_LIBS}
 )
 
+target_compile_options(libfastfetch PRIVATE
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions -fno-rtti>)
+
+if(WIN32)
+    set(CMAKE_CXX_STANDARD 20)
+    include(CheckIncludeFileCXX)
+    CHECK_INCLUDE_FILE_CXX("winrt/Windows.Foundation.h" HAVE_WINRT)
+    if(HAVE_WINRT)
+        add_library(ffwinrt MODULE src/detection/media/media_windows.dll.cpp)
+        target_link_libraries(ffwinrt PRIVATE "RuntimeObject")
+        target_compile_definitions(ffwinrt PRIVATE WIN32_LEAN_AND_MEAN=1 WINRT_LEAN_AND_MEAN=1)
+        target_link_options(ffwinrt
+            PRIVATE "-static" # stdc++, winpthread, gcc_s, etc.
+        )
+    endif()
+        set(CMAKE_CXX_STANDARD 17)
+endif()
+
 ######################
 # Executable targets #
 ######################
@@ -1098,12 +1219,9 @@ if(yyjson_FOUND)
 endif()
 
 if(WIN32)
-    set(TARGET_NAME fastfetch)
     target_sources(fastfetch
         PRIVATE src/util/windows/version.rc
     )
-
-    set(TARGET_NAME flashfetch)
     target_sources(flashfetch
         PRIVATE src/util/windows/version.rc
     )
@@ -1156,14 +1274,21 @@ install(
     DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )
 
+if (TARGET ffwinrt)
+    install(
+        TARGETS ffwinrt
+        DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+endif()
+
 install(
-    FILES "${CMAKE_SOURCE_DIR}/completions/bash"
+    FILES "${CMAKE_SOURCE_DIR}/completions/${CMAKE_PROJECT_NAME}.bash"
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/bash-completion/completions"
     RENAME "${CMAKE_PROJECT_NAME}"
 )
 
 install(
-    FILES "${CMAKE_SOURCE_DIR}/completions/fish"
+    FILES "${CMAKE_SOURCE_DIR}/completions/${CMAKE_PROJECT_NAME}.fish"
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/fish/vendor_completions.d"
     RENAME "${CMAKE_PROJECT_NAME}.fish"
 )
@@ -1173,10 +1298,12 @@ install(
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}"
 )
 
-install(
-    FILES "${CMAKE_SOURCE_DIR}/LICENSE"
-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${CMAKE_PROJECT_NAME}"
-)
+if(INSTALL_LICENSE)
+    install(
+        FILES "${CMAKE_SOURCE_DIR}/LICENSE"
+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${CMAKE_PROJECT_NAME}"
+    )
+endif()
 
 install(
     FILES "${PROJECT_BINARY_DIR}/fastfetch.1"
@@ -1210,12 +1337,17 @@ if(LINUX)
         set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 
         if(NOT IS_MUSL)
-            EXECUTE_PROCESS (
+            EXECUTE_PROCESS(
                 COMMAND getconf GNU_LIBC_VERSION
                 OUTPUT_VARIABLE GLIBC_VERSION
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
-            STRING (REPLACE "glibc " "" GLIBC_VERSION ${GLIBC_VERSION})
-            set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= ${GLIBC_VERSION})")
+            if(GLIBC_VERSION)
+                STRING(REPLACE "glibc " "" GLIBC_VERSION ${GLIBC_VERSION})
+                set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= ${GLIBC_VERSION})")
+                message(STATUS "found glibc ${GLIBC_VERSION}")
+            else()
+                message(WARNING "Could not determine glibc version. If `musl` is used, `-DIS_MUSL=ON` should be set")
+            endif()
         endif()
     endif()
 

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2021 Linus Dierheimer
+Copyright (c) 2021-2023 Linus Dierheimer
+Copyright (c) 2022-2024 Carter Li
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -11,7 +11,7 @@
 [![latest packaged version(s)](https://repology.org/badge/latest-versions/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
 [![Packaging status](https://repology.org/badge/tiny-repos/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
 
-Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying them in a pretty way. It is written mainly in C, with performance and customizability in mind. Currently, Linux, Android, FreeBSD, MacOS and Windows 7+ are supported.
+Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying it prettily. It is written mainly in C, with performance and customizability in mind. Currently, Linux, Android, FreeBSD, macOS, SunOS and Windows 7+ are supported.
 
 <img src="screenshots/example1.png" width="49%" align="left" />
 <img src="https://upload.wikimedia.org/wikipedia/commons/2/24/Transparent_Square_Tiles_Texture.png" width="49%" height="16px" align="left" />
@@ -21,15 +21,16 @@ Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for
 <img src="screenshots/example3.png" width="48%" align="top" />
 <img src="screenshots/example5.png" height="15%" align="top" />
 
-There are [screenshots on different platforms](https://github.com/fastfetch-cli/fastfetch/wiki)
+There are [screenshots on different platforms](https://github.com/fastfetch-cli/fastfetch/wiki).
 
 ## Installation
 
 ### Linux
 
-Some distros packaged an outdated fastfetch version. Older version is not supported, please always ensure that the latest version is used.
+Some distros packaged an outdated fastfetch version. Older version receive no support, so please try always to use the latest version.
 
 * Ubuntu: [`ppa:zhangsongcui3371/fastfetch`](https://launchpad.net/~zhangsongcui3371/+archive/ubuntu/fastfetch) (for Ubuntu 22.04 or newer)
+* Debian: `sudo apt install fastfetch` (for Debian 13 or newer)
 * Debian / Ubuntu: Download `fastfetch-linux-<proper architecture>.deb` from [Github release page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and double-click it (for Ubuntu 20.04 or newer and Debian 11 or newer).
 * Arch Linux: `sudo pacman -S fastfetch`
 * Fedora: `sudo dnf install fastfetch`
@@ -56,7 +57,7 @@ If fastfetch is not packaged for your distro or an outdated version is packaged,
 * [winget](https://github.com/microsoft/winget-pkgs/tree/master/manifests/f/Fastfetch-cli/Fastfetch): `winget install fastfetch`
 * [MSYS2 MinGW](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-fastfetch): `pacman -S mingw-w64-<subsystem>-<arch>-fastfetch`
 
-You may also download it directly from [GitHub releases page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and extract the archive.
+You may also download the program directly from [the GitHub releases page](https://github.com/fastfetch-cli/fastfetch/releases/latest) in the form of an archive file.
 
 ### FreeBSD
 
@@ -80,7 +81,7 @@ See Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building
 
 ## Customization
 
-Fastfetch uses the JSONC (or JSON with comments) for configuration. [See Wiki for detail](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration). There are some premade config files in [`presets`](presets), including the ones used for the screenshots above. You can load them using `-c <filename>`. They may also serve as a good example for format arguments.
+Fastfetch uses the JSONC (or JSON with comments) for configuration. [See Wiki for detail](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration). There are some premade config files in [`presets`](presets), including the ones used for the screenshots above. You can load them using `-c <filename>`. Those files can serve as examples of the configuration syntax.
 
 Logos can be heavily customized too; see the [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for more information.
 
@@ -102,10 +103,10 @@ Logos can be heavily customized too; see the [logo documentation](https://github
 
 1. Fastfetch is actively maintained.
 2. Fastfetch is faster. As the name suggests.
-3. Fastfetch is more feature-rich. By default fastfetch only has a few modules enabled. Use `fastfetch -c all` to find what you want.
-4. Fastfetch is more configurable. You can find more information in the Wiki: <https://github.com/fastfetch-cli/fastfetch/wiki/Configuration>
-5. Fastfetch is more polished. For example, neofetch prints `555MiB` in `Memory` module and `23G` in `Disk` module (notibily the difference of `MiB` and `G`), while fastfetch prints `555.00 MiB` and `22.97 GiB` respectively.
-6. Fastfetch is more accurate. For example, [neofetch never actually supports Wayland protocol](https://github.com/dylanaraps/neofetch/pull/2395).
+3. Fastfetch has a greater number of features, though by default fastfetch only has a few modules enabled; use `fastfetch -c all` to find what you want.
+4. Fastfetch is more configurable. You can find more information in the Wiki: <https://github.com/fastfetch-cli/fastfetch/wiki/Configuration>.
+5. Fastfetch is more polished. For example, neofetch prints `555MiB` in `Memory` module and `23G` in `Disk` module, whereas fastfetch prints `555.00 MiB` and `22.97 GiB` respectively.
+6. Fastfetch is more accurate. For example, [neofetch never actually supports the Wayland protocol](https://github.com/dylanaraps/neofetch/pull/2395).
 
 ### Q: Fastfetch shows my local IP address. It leaks my privacy!
 
@@ -117,7 +118,7 @@ If you really don't like it, you can disable the `Local IP` module in `config.js
 
 ### Q: Where is the config file? I can't find it.
 
-`Fastfetch` don't generate config file automatically. You can use `fastfetch --gen-config` to generate one. The config file will be saved in `~/.config/fastfetch/config.jsonc` by default. See [Wiki for detail](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration).
+`Fastfetch` does not generate config file automatically. You can use `fastfetch --gen-config` to generate one. The config file will be saved in `~/.config/fastfetch/config.jsonc` by default. See [Wiki for detail](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration).
 
 ### Q: The configuration is so complex. Where is the documentation?
 
@@ -125,13 +126,17 @@ Fastfetch uses JSON (with comments) for configuration. I suggest you use an IDE
 
 Alternatively, you can refer to the presets in [`presets` directory](https://github.com/fastfetch-cli/fastfetch/tree/dev/presets).
 
+The **correct** way to edit the configuration:
+
+[![asciicast](https://asciinema.org/a/1uF6sTPGKrHKI1MVaFcikINSQ.svg)](https://asciinema.org/a/1uF6sTPGKrHKI1MVaFcikINSQ)
+
 ### Q: I WANT THE DOCUMENTATION!
 
 [Here is the documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Json-Schema). It is generated from [JSON schema](https://github.com/fastfetch-cli/fastfetch/blob/dev/doc/json_schema.json) but you won't like it.
 
 ### Q: How can I customize the module output?
 
-Fastfetch uses `format` to generate output. For example to make `GPU` module show GPU name only and ignore other information, you can use
+Fastfetch uses `format` to generate output. For example, to make the `GPU` module show only the GPU name (leaving other information undisplayed), you can use
 
 ```jsonc
 {
@@ -144,15 +149,15 @@ Fastfetch uses `format` to generate output. For example to make `GPU` module sho
 }
 ```
 
-which is equivalent to `fastfetch -s gpu --gpu-format '{2}'`
+. . which is equivalent to `fastfetch -s gpu --gpu-format '{2}'`
 
-See `fastfetch -h format` for basic usage. For module specific formattion, see `fastfetch -h <module>-format`
+See `fastfetch -h format` for information on basic usage. For module specific formattion, see `fastfetch -h <module>-format`
 
 ### Q: I have my own ascii-art / image file. How can I show it with fastfetch?
 
 Try `fastfetch -l /path/to/logo`. See [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for detail.
 
-If you just want to display distro name in [FIGlet text](https://github.com/pwaller/pyfiglet)
+If you just want to display distro name in [FIGlet text](https://github.com/pwaller/pyfiglet):
 
 ```bash
 # install pyfiglet and jq first
@@ -168,6 +173,10 @@ The p10k doc clearly states that you should NOT print anything to stdout after `
 
 You can always use `fastfetch --pipe false` to force fastfetch running in colorful mode.
 
+### Q: Why do fastfetch and neofetch show different memory usage result?
+
+See [#1096](https://github.com/fastfetch-cli/fastfetch/issues/1096).
+
 ### Q: I want feature A / B / C. Will fastfetch support it?
 
 Fastfetch is a system information tool. We only accept hardware or system level software feature requests. For most personal uses, I recommend using `Command` module to detect it yourself, which can be used to grab output from a custom shell script:

completions/fastfetch.bash

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 __fastfetch_complete_help()
 {
     local __ff_helps=(
@@ -85,12 +83,12 @@ __fastfetch_complete_logo_type()
 
 __fastfetch_complete_binary_prefix()
 {
-    local __ff_binary_prefixes=(
+    local __ff_size_binary_prefixes=(
         "iec"
         "si"
         "jedec"
     )
-    COMPREPLY=($(compgen -W "${__ff_binary_prefixes[*]}" -- "$CURRENT_WORD"))
+    COMPREPLY=($(compgen -W "${__ff_size_binary_prefixes[*]}" -- "$CURRENT_WORD"))
 }
 
 __fastfetch_complete_gl()
@@ -349,6 +347,7 @@ __fastfetch_completion()
         "--users-key"
         "--users-format"
         "--users-key-color"
+        "--users-myself-only"
         "--bluetooth-key"
         "--bluetooth-format"
         "--bluetooth-key-color"
@@ -357,7 +356,6 @@ __fastfetch_completion()
     local FF_OPTIONS_PATH=(
         "-c"
         "--config"
-        "--lib-pci"
         "--lib-vulkan"
         "--lib-wayland"
         "--lib-xcb-randr"

completions/fastfetch.fish

@@ -0,0 +1,101 @@
+if not type -q fastfetch
+    exit
+end
+
+complete -c fastfetch -f
+
+function __fastfetch_complete_bool
+    echo -e "true\tBool"
+    echo -e "false\tBool"
+end
+
+function __fastfetch_complete_color
+    echo -e "black\tColor"
+    echo -e "red\tColor"
+    echo -e "green\tColor"
+    echo -e "yellow\tColor"
+    echo -e "blue\tColor"
+    echo -e "magenta\tColor"
+    echo -e "cyan\tColor"
+    echo -e "white\tColor"
+    echo -e "default\tColor"
+end
+
+function __fastfetch_complete_command
+    for line in (fastfetch --list-modules autocompletion)
+        set -l pair (string split -m 2 : $line)
+        set -l module (string lower $pair[1])
+
+        echo -e "$module-format\tModule format"
+    end
+    echo -e "format\tCustom format"
+    echo -e "color\tColor format"
+end
+
+function __fastfetch_complete_config
+    for line in (fastfetch --list-presets autocompletion)
+        echo -e "$line\tPreset"
+    end
+    echo -e "none\tDisable loading config file"
+end
+
+function __fastfetch_complete_logo
+    for line in (fastfetch --list-logos autocompletion)
+        echo -e "$line\tBuiltin logo"
+    end
+    echo -e "none\tDon't print logo"
+    echo -e "small\tPrint small ascii logo if available"
+end
+
+function __fastfetch_complete_structure
+    for line in (fastfetch --list-modules autocompletion)
+        set -l pair (string split -m 2 : $line)
+        echo -e "$pair[1]\t$pair[2]"
+    end
+end
+
+echo '
+import json, subprocess, sys
+
+def main():
+    data: dict[str, list[dict]] = json.loads(subprocess.check_output(["fastfetch", "--help-raw"]))
+
+    for key in data:
+        for flag in data[key]:
+            if flag.get("pseudo", False):
+                continue
+
+            command_prefix = f"""complete -c fastfetch -d "{flag["desc"]}" -l "{flag["long"]}\""""
+            if "short" in flag:
+                command_prefix += f""" -o {flag["short"]}"""
+
+            if "arg" in flag:
+                type: str = flag["arg"]["type"];
+                if type == "bool":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_bool)\"")
+                elif type == "color":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_color)\"")
+                elif type == "command":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_command)\"")
+                elif type == "config":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_config)\"")
+                elif type == "enum":
+                    temp: str = " ".join(flag["arg"]["enum"])
+                    print(f"{command_prefix} -x -a \"{temp}\"")
+                elif type == "logo":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_logo)\"")
+                elif type == "structure":
+                    print(f"{command_prefix} -x -a \"(__fish_complete_list : __fastfetch_complete_structure)\"")
+                elif type == "path":
+                    print(f"{command_prefix} -r -F")
+                else:
+                    print(f"{command_prefix} -x")
+            else:
+                print(f"{command_prefix} -f")
+
+if __name__ == "__main__":
+    try:
+        main()
+    except:
+        sys.exit(1)
+' | python3 | source

completions/fish

@@ -1,106 +0,0 @@
-#!/usr/bin/env fish
-
-if not type -q fastfetch
-    exit
-end
-
-complete -c fastfetch -f
-
-function __fastfetch_complete_bool
-    echo -e "true\tBool"
-    echo -e "false\tBool"
-end
-
-function __fastfetch_complete_color
-    echo -e "black\tColor"
-    echo -e "red\tColor"
-    echo -e "green\tColor"
-    echo -e "yellow\tColor"
-    echo -e "blue\tColor"
-    echo -e "magenta\tColor"
-    echo -e "cyan\tColor"
-    echo -e "white\tColor"
-    echo -e "default\tColor"
-end
-
-function __fastfetch_complete_command
-    for line in (fastfetch --list-modules autocompletion)
-        set -l pair (string split -m 2 : $line)
-        set -l module (string lower $pair[1])
-
-        echo -e "$module-format\tModule format"
-    end
-    echo -e "format\tCustom format"
-    echo -e "color\tColor format"
-end
-
-function __fastfetch_complete_config
-    for line in (fastfetch --list-presets autocompletion)
-        echo -e "$line\tPreset"
-    end
-    echo -e "none\tDisable loading config file"
-end
-
-function __fastfetch_complete_logo
-    for line in (fastfetch --list-logos autocompletion)
-        echo -e "$line\tBuiltin logo"
-    end
-    echo -e "none\tDon't print logo"
-    echo -e "small\tPrint small ascii logo if available"
-end
-
-function __fastfetch_complete_structure
-    for line in (fastfetch --list-modules autocompletion)
-        set -l pair (string split -m 2 : $line)
-        echo -e "$pair[1]\t$pair[2]"
-    end
-end
-
-string match -r -a -g "^###> ?(.*)" < (status -f) | string collect | python3 | source
-
-###> #!/usr/bin/env python3
-###>
-###> import json, subprocess, sys
-###>
-###> def main():
-###>     data: dict[str, list[dict]] = json.loads(subprocess.check_output(['fastfetch', '--help-raw']))
-###>
-###>     for key in data:
-###>         for flag in data[key]:
-###>             if flag.get('pseudo', False):
-###>                 continue
-###>
-###>             command_prefix: str = f'complete -c fastfetch -d "{flag["desc"]}" -l "{flag["long"]}"';
-###>             if 'short' in flag:
-###>                 command_prefix += f' -o "{flag["short"]}"'
-###>
-###>             if 'arg' in flag:
-###>                 type: str = flag['arg']['type'];
-###>                 if type == 'bool':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_bool)"')
-###>                 elif type == 'color':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_color)"')
-###>                 elif type == 'command':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_command)"')
-###>                 elif type == 'config':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_config)"')
-###>                 elif type == 'enum':
-###>                     temp: str = ' '.join(flag["arg"]["enum"])
-###>                     print(f'{command_prefix} -x -a "{temp}"')
-###>                 elif type == 'logo':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_logo)"')
-###>                 elif type == 'structure':
-###>                     print(f'{command_prefix} -x -a "(__fish_complete_list : __fastfetch_complete_structure)"')
-###>                 elif type == 'path':
-###>                     print(f'{command_prefix} -r -F')
-###>                 else:
-###>                     print(f'{command_prefix} -x')
-###>             else:
-###>                 print(f'{command_prefix} -f')
-###>
-###> if __name__ == "__main__":
-###>     try:
-###>         main()
-###>     except:
-###>         sys.exit(1)
-###>

debian/changelog

@@ -1,3 +1,51 @@
+fastfetch (2.18.1) jammy; urgency=medium
+
+  * Update to 2.18.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 11 Jul 2024 14:32:15 +0800
+
+fastfetch (2.18.0) jammy; urgency=medium
+
+  * Update to 2.18.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 10 Jul 2024 16:46:32 +0800
+
+fastfetch (2.17.2) jammy; urgency=medium
+
+  * Update to 2.17.2
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 04 Jul 2024 10:22:44 +0800
+
+fastfetch (2.17.1) jammy; urgency=medium
+
+  * Update to 2.17.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 01 Jul 2024 08:56:29 +0800
+
+fastfetch (2.17.0) jammy; urgency=medium
+
+  * Update to 2.17.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 28 Jun 2024 13:43:18 +0800
+
+fastfetch (2.16.0) jammy; urgency=medium
+
+  * Update to 2.16.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 19 Jun 2024 14:53:43 +0800
+
+fastfetch (2.15.0) jammy; urgency=medium
+
+  * Update to 2.15.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 07 Jun 2024 13:52:43 +0800
+
+fastfetch (2.14.0) jammy; urgency=medium
+
+  * Update to 2.14.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 30 May 2024 14:27:54 +0800
+
 fastfetch (2.13.2) jammy; urgency=medium
 
   * Update to 2.13.2

debian/files

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

doc/fastfetch.1.in

@@ -26,7 +26,7 @@ the exit code will be non\-zero.
 .SS "Informative Options"
 .TP
 
-.B \-h, \-\-help \fI [command]
+.B \-h, \-\-help \fI[command]
 Show help output, displaying all available options or help for given command
 .TP
 
@@ -43,7 +43,7 @@ List search paths of presets and logos
 .TP
 
 .B \-\-list\-logos
-List available logos, they can be loaded with \fI \-\-logo
+List available logos, they can be loaded with \fI\-\-logo
 .TP
 
 .B \-\-list\-modules
@@ -51,7 +51,7 @@ List available modules
 .TP
 
 .B \-\-list\-presets
-List available presets, they can be loaded with \fI \-\-config
+List available presets, they can be loaded with \fI\-\-config
 .TP
 
 .B \-\-list\-features
@@ -64,16 +64,24 @@ Print available logos
 
 .B \-\-print\-structure
 Print the default structure
+.TP
+
+.B \-\-format \fI<type>
+Set the output format. Besides the
+.I default
+format, only
+.I json
+is supported currently.
 
 
 .SS "Display Options"
 .TP
 
-.B \-l, \-\-logo \fI <logo>
+.B \-l, \-\-logo \fI<logo>
 Set the logo to display
 .TP
 
-.B \-s, \-\-structure \fI <structure>
+.B \-s, \-\-structure \fI<structure>
 Set the structure of the fetch. For details about the structure,
 see the CONFIGURATION section.
 
@@ -81,38 +89,40 @@ see the CONFIGURATION section.
 .SS "Config Options"
 .TP
 
-.B \-c, \-\-config \fI <config>
-Use the specified config file or preset. If "none", disable further config
-loading. For details about config files, see the CONFIGURATION section
+.B \-c, \-\-config \fI<config>
+Use the specified config file or preset. If
+.I none
+is specified, disable further config loading. For details about
+config files, see the CONFIGURATION section
 .TP
 
-.B \-\-gen\-config \fI [file]
+.B \-\-gen\-config \fI[file]
 Generate a config file with options specified on the command line.
-If \fI file \fR is specified, the configuration will written to the
+If \fIfile\fR is specified, the configuration will be written to the
 file, otherwise it will be written to stdout.
 .TP
 
-.B \-\-gen\-config\-force \fI [file]
-Same as \fB \-\-gen\-config\fR, but overwrites existing config
+.B \-\-gen\-config\-force \fI[file]
+Same as \fB\-\-gen\-config\fR, but overwrites existing config
 .TP
 
 
-To list all options, use \fB \-\-help\fR this will also print all available module options.
+To list all options, use \fB\-\-help\fR. It will also print all available module options.
 
 .SH CONFIGURATION
 .SS "Fetch Structure"
 The structure of a fetch describes the modules that should be included in
 the output. It consists of a string of modules, separated by a colon (:).
-To list all available modules, use \fB \-\-list\-modules \fR
+To list all available modules, use \fB\-\-list\-modules\fR
 
 .SS "Config Files"
 
 Fastfetch uses JSONC based format for configuration. Fastfetch doesn't generate
-config file automatically; it should be generated manually by \fB \-\-gen\-config\fR.
+config file automatically; it should be generated manually by \fB\-\-gen\-config\fR.
 The config file will be saved in \fB~/.config/fastfetch/config.jsonc\fR by default.
 
-A JSONC config file is a JSON file that also supports comments with (//). Those
-files must have the extension '.jsonc'.
+A JSONC config file is a JSON file that also supports comments with (// and /* */).
+Those files must have the extension '.jsonc'.
 
 The specified configuration/preset files are searched in the following order:
 
@@ -128,4 +138,4 @@ Fastfetch provides some default presets. List them with \fB\-\-list\-presets\fR.
 .BR neofetch (1)
 
 .SH BUGS
-Please report bugs to:\fI https://github.com/fastfetch\-cli/fastfetch/issues \fR
+Please report bugs to: \fIhttps://github.com/fastfetch\-cli/fastfetch/issues\fR

doc/json_schema.json

@@ -23,7 +23,7 @@
             "default": 0
         },
         "format": {
-            "description": "Output format of the module. See `-h <module>-format` for detail",
+            "description": "Output format of the module. See `-h <module>-format` for detail. I.e: fastfetch -h disk-format",
             "type": "string"
         },
         "outputColor": {
@@ -89,10 +89,12 @@
             "default": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json"
         },
         "logo": {
+            "description": "Fastfetch logo configurations\nSee also https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options",
             "oneOf": [
                 {
                     "description": "Disable logo",
-                    "type": "null"
+                    "type": "null",
+                    "const": null
                 },
                 {
                     "description": "Set the source file of the logo",
@@ -217,10 +219,15 @@
                             "description": "If true, regenerate image logo cache",
                             "default": false
                         },
-                        "separate": {
-                            "type": "boolean",
-                            "description": "If true, print modules at bottom of the logo",
-                            "default": false
+                        "position": {
+                            "type": "string",
+                            "description": "Set the position of the logo should be displayed",
+                            "enum": [
+                                "left",
+                                "top",
+                                "right"
+                            ],
+                            "default": "left"
                         },
                         "chafa": {
                             "type": "object",
@@ -327,6 +334,16 @@
                     "type": "integer",
                     "description": "Set the timeout (ms) when waiting for child processes, `-1` for no timeout",
                     "default": 1000
+                },
+                "preRun": {
+                    "type": "string",
+                    "description": "Set the command to be executed before printing logos",
+                    "default": ""
+                },
+                "showVersion": {
+                    "type": "boolean",
+                    "description": "Whether to detect and display component versions. Mainly for benchmarking",
+                    "default": true
                 }
             }
         },
@@ -407,29 +424,29 @@
                     "minimum": 0,
                     "default": 0
                 },
-                "binaryPrefix": {
-                    "type": "string",
-                    "description": "Set the binary prefix to used when printing bytes",
-                    "oneOf": [
-                        {
-                            "const": "iec",
-                            "description": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ... (standard)"
-                        },
-                        {
-                            "const": "si",
-                            "description": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ..."
-                        },
-                        {
-                            "const": "jedec",
-                            "description": "1024 Bytes = 1 kB, 1024 K = 1 MB, ..."
-                        }
-                    ]
-                },
                 "size": {
                     "type": "object",
                     "additionalProperties": false,
                     "description": "Set how a size value should be displayed",
                     "properties": {
+                        "binaryPrefix": {
+                            "type": "string",
+                            "description": "Set the binary prefix to used when formatting sizes",
+                            "oneOf": [
+                                {
+                                    "const": "iec",
+                                    "description": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ... (standard)"
+                                },
+                                {
+                                    "const": "si",
+                                    "description": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ..."
+                                },
+                                {
+                                    "const": "jedec",
+                                    "description": "1024 Bytes = 1 kB, 1024 K = 1 MB, ..."
+                                }
+                            ]
+                        },
                         "maxPrefix": {
                             "type": "string",
                             "description": "Set the largest binary prefix to use when formatting sizes",
@@ -499,10 +516,15 @@
                             "description": "Set the character to use in total part",
                             "default": "-"
                         },
-                        "border": {
-                            "type": "boolean",
-                            "description": "Whether to show a border around the bar",
-                            "default": true
+                        "borderLeft": {
+                            "type": "string",
+                            "description": "Set the string to use at left border",
+                            "default": "[ "
+                        },
+                        "borderRight": {
+                            "type": "string",
+                            "description": "Set the string to use at right border",
+                            "default": " ]"
                         },
                         "width": {
                             "type": "integer",
@@ -552,15 +574,31 @@
                         }
                     }
                 },
+                "freq": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "description": "Set how frequency values should be displayed",
+                    "properties": {
+                        "ndigits": {
+                            "type": "integer",
+                            "description": "Set the number of digits to keep after the decimal point when formatting frequency values\nA positive value will show the frequency in GHz of decimal\n-1 will show the frequency in MHz",
+                            "minimum": -1,
+                            "maximum": 9,
+                            "default": 2
+                        }
+                    }
+                },
                 "noBuffer": {
                     "type": "boolean",
                     "description": "Whether to disable the stdout application buffer",
                     "default": false
                 },
-                "tsVersion": {
-                    "type": "boolean",
-                    "description": "Whether to detect and display the version of terminal and shell. Mainly for benchmarking",
-                    "default": true
+                "constants": {
+                    "type": "array",
+                    "description": "List of strings to be used in custom format of modules",
+                    "items": {
+                        "type": "string"
+                    }
                 }
             }
         },
@@ -569,10 +607,6 @@
             "type": "object",
             "additionalProperties": false,
             "properties": {
-                "pci": {
-                    "type": "string",
-                    "description": "GPU output (Linux and FreeBSD)"
-                },
                 "vulkan": {
                     "type": "string",
                     "description": "Vulkan module & fallback for GPU output"
@@ -587,39 +621,39 @@
                 },
                 "xcbRandr": {
                     "type": "string",
-                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD)"
+                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD, SunOS)"
                 },
                 "xcb": {
                     "type": "string",
-                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD)"
+                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD, SunOS)"
                 },
                 "xrandr": {
                     "type": "string",
-                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD)"
+                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD, SunOS)"
                 },
                 "x11": {
                     "type": "string",
-                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD)"
+                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD, SunOS)"
                 },
                 "drm": {
                     "type": "string",
-                    "description": "Used for fast resolution and refresh rate detection (Linux)"
+                    "description": "Used for fast resolution and refresh rate detection (Linux, FreeBSD)"
                 },
                 "gio": {
                     "type": "string",
-                    "description": "Needed for values that are only stored GSettings (Linux, FreeBSD)"
+                    "description": "Needed for values that are only stored GSettings (Linux, FreeBSD, SunOS)"
                 },
                 "dconf": {
                     "type": "string",
-                    "description": "Needed for values that are only stored in DConf + Fallback for GSettings (Linux, FreeBSD)"
+                    "description": "Needed for values that are only stored in DConf + Fallback for GSettings (Linux, FreeBSD, SunOS)"
                 },
                 "dbus": {
                     "type": "string",
-                    "description": "Bluetooth, Player & Media detection (Linux, FreeBSD)"
+                    "description": "Bluetooth, Player & Media detection (Linux, FreeBSD, SunOS)"
                 },
                 "xfconf": {
                     "type": "string",
-                    "description": "Needed for XFWM theme and XFCE Terminal font (Linux, FreeBSD)"
+                    "description": "Needed for XFWM theme and XFCE Terminal font (Linux, FreeBSD, SunOS)"
                 },
                 "sqlite3": {
                     "type": "string",
@@ -631,34 +665,34 @@
                 },
                 "imagemagick": {
                     "type": "string",
-                    "description": "Images in terminal using sixel or kitty graphics protocol (Linux, FreeBSD, macOS)"
+                    "description": "Images in terminal using sixel or kitty graphics protocol (Linux, FreeBSD, SunOS, macOS)"
                 },
                 "z": {
-                    "description": "Libz. Faster image output when using kitty graphics protocol (Linux, FreeBSD, macOS)",
+                    "description": "Libz. Faster image output when using kitty graphics protocol (Linux, FreeBSD, SunOS, macOS)",
                     "type": "string"
                 },
                 "chafa": {
                     "type": "string",
-                    "description": "Image output as ascii art (Linux, FreeBSD, macOS)"
+                    "description": "Image output as ascii art (Linux, FreeBSD, SunOS, macOS)"
                 },
                 "egl": {
                     "type": "string",
-                    "description": "Needed by the OpenGL module for gl context creation (Linux, FreeBSD)"
+                    "description": "Library used by the OpenGL module for gl context creation (Linux, FreeBSD, SunOS, Windows)"
                 },
                 "glx": {
                     "type": "string",
-                    "description": "Needed by the OpenGL module for gl context creation (Linux, FreeBSD)"
+                    "description": "Library used by the OpenGL module for gl context creation (Linux, FreeBSD, SunOS)"
                 },
                 "osmesa": {
                     "type": "string",
-                    "description": "Needed by the OpenGL module for gl context creation (Linux, FreeBSD)"
+                    "description": "Library used by the OpenGL module for gl context creation (Linux, FreeBSD, SunOS)"
                 },
                 "opencl": {
                     "type": "string",
-                    "description": "OpenCL module (Linux, FreeBSD, Windows)"
+                    "description": "OpenCL module (Linux, FreeBSD, SunOS, Windows)"
                 },
                 "pulse": {
-                    "description": "Pulseaudio. Used for Sound detection (Linux, FreeBSD)",
+                    "description": "Pulseaudio. Used for Sound detection (Linux, FreeBSD, SunOS)",
                     "type": "string"
                 },
                 "nm": {
@@ -690,6 +724,7 @@
                             "camera",
                             "chassis",
                             "cpu",
+                            "cpucache",
                             "cpuusage",
                             "command",
                             "colors",
@@ -699,12 +734,14 @@
                             "disk",
                             "diskio",
                             "de",
+                            "dns",
                             "editor",
                             "font",
                             "gamepad",
                             "gpu",
                             "host",
                             "icons",
+                            "initsystem",
                             "kernel",
                             "lm",
                             "loadavg",
@@ -792,6 +829,10 @@
                                                 "const": "camera",
                                                 "description": "Print available cameras"
                                             },
+                                            {
+                                                "const": "cpucache",
+                                                "description": "Print CPU cache sizes"
+                                            },
                                             {
                                                 "const": "cursor",
                                                 "description": "Print cursor style name"
@@ -816,6 +857,10 @@
                                                 "const": "icons",
                                                 "description": "Print icon style name"
                                             },
+                                            {
+                                                "const": "initsystem",
+                                                "description": "Print init system (pid 1) name and version"
+                                            },
                                             {
                                                 "const": "kernel",
                                                 "description": "Print system kernel version"
@@ -888,10 +933,6 @@
                                                 "const": "uptime",
                                                 "description": "Print how long system has been running"
                                             },
-                                            {
-                                                "const": "users",
-                                                "description": "Print users currently logged in"
-                                            },
                                             {
                                                 "const": "version",
                                                 "description": "Print Fastfetch version"
@@ -1076,13 +1117,6 @@
                                     "temp": {
                                         "$ref": "#/$defs/temperature"
                                     },
-                                    "freqNdigits": {
-                                        "description": "Set the number of digits to keep after the decimal point when printing CPU frequency",
-                                        "type": "integer",
-                                        "minimum": 0,
-                                        "maximum": 9,
-                                        "default": 2
-                                    },
                                     "showPeCoreCount": {
                                         "description": "Detect and display CPU frequency of different core types (eg. Pcore and Ecore) if supported",
                                         "type": "boolean",
@@ -1121,6 +1155,21 @@
                                         "type": "boolean",
                                         "description": "Display CPU usage per CPU logical core, instead of an average result",
                                         "default": false
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
                                     }
                                 }
                             },
@@ -1138,13 +1187,14 @@
                                         "type": "string",
                                         "enum": [
                                             "block",
+                                            "background",
                                             "circle",
                                             "diamond",
                                             "triangle",
                                             "square",
                                             "star"
                                         ],
-                                        "default": "block"
+                                        "default": "background"
                                     },
                                     "paddingLeft": {
                                         "description": "Set the number of white spaces to print before the symbol",
@@ -1423,6 +1473,41 @@
                                     }
                                 }
                             },
+                            {
+                                "title": "DNS",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "type": {
+                                        "const": "dns",
+                                        "description": "Print DNS servers"
+                                    },
+                                    "showType": {
+                                        "enum": [
+                                            "ipv4",
+                                            "ipv6",
+                                            "both"
+                                        ],
+                                        "default": "both",
+                                        "description": "Specify the type of DNS servers should be detected"
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                }
+                            },
                             {
                                 "title": "Gamepad",
                                 "type": "object",
@@ -1476,6 +1561,7 @@
                                             "auto",
                                             "pci",
                                             "vulkan",
+                                            "opencl",
                                             "opengl"
                                         ],
                                         "default": "auto"
@@ -1621,6 +1707,14 @@
                                         "maximum": 9,
                                         "default": 2
                                     },
+                                    "compact": {
+                                        "type": "boolean",
+                                        "description": "Show values in one line",
+                                        "default": true
+                                    },
+                                    "percent": {
+                                        "$ref": "#/$defs/percent"
+                                    },
                                     "key": {
                                         "$ref": "#/$defs/key"
                                     },
@@ -1688,7 +1782,7 @@
                                         "const": "opengl"
                                     },
                                     "library": {
-                                        "description": "Set the OpenGL context creation library to use. Linux only",
+                                        "description": "Set the OpenGL context creation library to use",
                                         "enum": [
                                             "auto",
                                             "egl",
@@ -1737,6 +1831,9 @@
                                                 "emerge",
                                                 "eopkg",
                                                 "flatpak",
+                                                "guix",
+                                                "lpkg",
+                                                "lpkgbuild",
                                                 "macports",
                                                 "nix",
                                                 "opkg",
@@ -1747,6 +1844,7 @@
                                                 "rpm",
                                                 "scoop",
                                                 "snap",
+                                                "sorcery",
                                                 "winget",
                                                 "xbps"
                                             ],
@@ -1857,12 +1955,19 @@
                                         "const": "separator"
                                     },
                                     "string": {
-                                        "description": "Set the string to be printed",
+                                        "description": "Set the string to be printed by the separator line",
                                         "type": "string",
                                         "default": "-"
                                     },
                                     "outputColor": {
+                                        "description": "Set the color of the separator line",
                                         "$ref": "#/$defs/outputColor"
+                                    },
+                                    "length": {
+                                        "description": "Set the length of the separator line, or 0 to auto-detect",
+                                        "type": "integer",
+                                        "minimum": 0,
+                                        "default": 0
                                     }
                                 }
                             },
@@ -1984,6 +2089,42 @@
                                     }
                                 }
                             },
+                            {
+                                "title": "Users",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "type": {
+                                        "const": "users",
+                                        "description": "Print users currently logged in"
+                                    },
+                                    "compact": {
+                                        "type": "boolean",
+                                        "description": "Show all active users in one line",
+                                        "default": false
+                                    },
+                                    "myselfOnly": {
+                                        "type": "boolean",
+                                        "description": "Show only the current user",
+                                        "default": false
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                }
+                            },
                             {
                                 "title": "Weather",
                                 "type": "object",

presets/all.jsonc

@@ -1,5 +1,10 @@
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "padding": {
+            "top": 2
+        }
+    },
     "modules": [
         "title",
         "separator",
@@ -35,10 +40,16 @@
         "terminaltheme",
         {
             "type": "cpu",
-            "showPeCoreCount": true
+            "showPeCoreCount": true,
+            "temp": true
         },
+        "cpucache",
         "cpuusage",
-        "gpu",
+        {
+            "type": "gpu",
+            "driverSpecific": true,
+            "temp": true
+        },
         "memory",
         "physicalmemory",
         "swap",
@@ -50,9 +61,10 @@
         "publicip",
         {
             "type": "localip",
-            "showIpV6": true,
+            "showIpv6": true,
             "showMac": true
         },
+        "dns",
         "wifi",
         "datetime",
         "locale",
@@ -64,10 +76,16 @@
         "sound",
         "camera",
         "gamepad",
-        "weather",
+        {
+          "type": "weather",
+          "timeout": 1000
+        },
         "netio",
         "diskio",
-        "physicaldisk",
+        {
+            "type": "physicaldisk",
+            "temp": true
+        },
         "version",
         "break",
         "colors"

presets/ci.jsonc

@@ -42,10 +42,16 @@
     "terminaltheme",
     {
         "type": "cpu",
-        "showPeCoreCount": true
+        "showPeCoreCount": true,
+        "temp": true
     },
+    "cpucache",
     "cpuusage",
-    "gpu",
+    {
+        "type": "gpu",
+        "driverSpecific": true,
+        "temp": true
+    },
     "memory",
     "physicalmemory",
     "swap",
@@ -57,9 +63,10 @@
     "publicip",
     {
         "type": "localip",
-        "showIpV6": true,
+        "showIpv6": true,
         "showMac": true
     },
+    "dns",
     "wifi",
     "datetime",
     "locale",
@@ -77,7 +84,10 @@
     },
     "netio",
     "diskio",
-    "physicaldisk",
+    {
+        "type": "physicaldisk",
+        "temp": true
+    },
     "version",
     "break",
     "colors"

presets/examples/10.jsonc

@@ -9,12 +9,15 @@
         }
     },
     "display": {
-        "separator": " -> "
+        "separator": " -> ",
+        "constants": [
+            "──────────────────────────────"
+        ]
     },
     "modules": [
         {
             "type": "custom",
-            "format": "┌────────────────────────────────────────────────────────────┐",
+            "format": "┌{$1}{$1}┐",
             "outputColor": "90"
         },
         {
@@ -23,7 +26,7 @@
         },
         {
             "type": "custom",
-            "format": "└────────────────────────────────────────────────────────────┘",
+            "format": "└{$1}{$1}┘",
             "outputColor": "90"
         },
         {
@@ -32,7 +35,7 @@
         },
         {
             "type": "custom",
-            "format": "┌────────────────────────────────────────────────────────────┐",
+            "format": "┌{$1}{$1}┐",
             "outputColor": "90"
         },
         {
@@ -142,7 +145,7 @@
         },
         {
             "type": "custom",
-            "format": "└────────────────────────────────────────────────────────────┘",
+            "format": "└{$1}{$1}┘",
             "outputColor": "90"
         },
         "break",

presets/examples/12.jsonc

@@ -7,7 +7,10 @@
         "separator": "->   ",
         "color": {
             "separator": "1"
-        }
+        },
+        "constants": [
+            "─────────────────────────────"
+        ]
     },
     "modules": [
         {
@@ -17,7 +20,7 @@
         "break",
         {
             "type": "custom",
-            "format": "┌───────────────────────────── {#1}System Information{#} ─────────────────────────────┐"
+            "format": "┌{$1} {#1}System Information{#} {$1}┐"
         },
         "break",
         {
@@ -95,7 +98,7 @@
         "break",
         {
             "type": "custom",
-            "format": "└──────────────────────────────────────────────────────────────────────────────┘"
+            "format": "└{$1}────────────────────{$1}┘"
         },
         "break",
         {

presets/examples/13.jsonc

@@ -1,3 +1,4 @@
+// Inspired by Catnap
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
     "logo": {
@@ -16,56 +17,55 @@
             "type": "custom"
         },
         {
-            // draw borders first to make colors of left and right border consistant
-            "key": "│           │\u001b[11D{#31} user",
+            "key": "│ {#31} user    {#keys}│",
             "type": "title",
             "format": "{1}"
         },
         {
-            "key": "│           │\u001b[11D{#32}󰇅 hname",
+            "key": "│ {#32}󰇅 hname   {#keys}│",
             "type": "title",
             "format": "{2}"
         },
         {
-            "key": "│           │\u001b[11D{#33}󰅐 uptime",
+            "key": "│ {#33}󰅐 uptime  {#keys}│",
             "type": "uptime"
         },
         {
-            "key": "│           │\u001b[11D{#34}󰟾 distro",
+            "key": "│ {#34}󰟾 distro  {#keys}│",
             "type": "os"
         },
         {
-            "key": "│           │\u001b[11D{#35} kernel",
+            "key": "│ {#35} kernel  {#keys}│",
             "type": "kernel"
         },
         {
-            "key": "│           │\u001b[11D{#36}󰇄 desktop",
+            "key": "│ {#36}󰇄 desktop {#keys}│",
             "type": "de"
         },
         {
-            "key": "│           │\u001b[11D{#31} term",
+            "key": "│ {#31} term    {#keys}│",
             "type": "terminal"
         },
         {
-            "key": "│           │\u001b[11D{#32} shell",
+            "key": "│ {#32} shell   {#keys}│",
             "type": "shell"
         },
         {
-            "key": "│           │\u001b[11D{#33}󰍛 cpu",
+            "key": "│ {#33}󰍛 cpu     {#keys}│",
             "type": "cpu",
             "showPeCoreCount": true
         },
         {
-            "key": "│           │\u001b[11D{#34}󰉉 disk",
+            "key": "│ {#34}󰉉 disk    {#keys}│",
             "type": "disk",
             "folders": "/"
         },
         {
-            "key": "│           │\u001b[11D{#35} memory",
+            "key": "│ {#35} memory  {#keys}│",
             "type": "memory"
         },
         {
-            "key": "│           │\u001b[11D{#36}󰩟 network",
+            "key": "│ {#36}󰩟 network {#keys}│",
             "type": "localip",
             "format": "{1} ({4})"
         },
@@ -74,7 +74,7 @@
             "type": "custom"
         },
         {
-            "key": "│           │\u001b[11D{#39} colors",
+            "key": "│ {#39} colors  {#keys}│",
             "type": "colors",
             "symbol": "circle"
         },

presets/examples/14.jsonc

@@ -0,0 +1,86 @@
+// Inspired by Catnap
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "display": {
+        "separator": "",
+        "keyWidth": 12
+    },
+    "modules": [
+        {
+            // draw borders first to make colors of left and right border consistant
+            "key": " user",
+            "type": "title",
+            "format": "{1}",
+            "keyColor": "31"
+        },
+        {
+            "key": "󰇅 hname",
+            "type": "title",
+            "format": "{2}",
+            "keyColor": "32"
+
+        },
+        {
+            "key": "󰅐 uptime",
+            "type": "uptime",
+            "keyColor": "33"
+        },
+        {
+            "key": "󰟾 distro",
+            "type": "os",
+            "keyColor": "34"
+        },
+        {
+            "key": " kernel",
+            "type": "kernel",
+            "keyColor": "35"
+        },
+        {
+            "key": "󰇄 desktop",
+            "type": "de",
+            "keyColor": "36"
+        },
+        {
+            "key": " term",
+            "type": "terminal",
+            "keyColor": "31"
+        },
+        {
+            "key": " shell",
+            "type": "shell",
+            "keyColor": "32"
+        },
+        {
+            "key": "󰍛 cpu",
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "keyColor": "33"
+        },
+        {
+            "key": "󰉉 disk",
+            "type": "disk",
+            "folders": "/",
+            "keyColor": "34"
+        },
+        {
+            "key": " memory",
+            "type": "memory",
+            "keyColor": "35"
+        },
+        {
+            "key": "󰩟 network",
+            "type": "localip",
+            "format": "{1} ({4})",
+            "keyColor": "36"
+        },
+        {
+            "key": " colors",
+            "type": "colors",
+            "symbol": "circle",
+            "keyColor": "39"
+        }
+    ]
+}

presets/examples/15.jsonc

@@ -0,0 +1,86 @@
+// Inspired by Catnap
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small",
+        "padding": {
+            "top": 1
+        }
+    },
+    "display": {
+        "separator": "",
+        "keyWidth": 15
+    },
+    "modules": [
+        {
+            "key": "•••••••••••••",
+            "type": "custom"
+        },
+        {
+            "key": "• {#31} user    {#keys}•",
+            "type": "title",
+            "format": "{1}"
+        },
+        {
+            "key": "• {#32}󰇅 hname   {#keys}•",
+            "type": "title",
+            "format": "{2}"
+        },
+        {
+            "key": "• {#33}󰅐 uptime  {#keys}•",
+            "type": "uptime"
+        },
+        {
+            "key": "• {#34}󰟾 distro  {#keys}•",
+            "type": "os"
+        },
+        {
+            "key": "• {#35} kernel  {#keys}•",
+            "type": "kernel"
+        },
+        {
+            "key": "• {#36}󰇄 desktop {#keys}•",
+            "type": "de"
+        },
+        {
+            "key": "• {#31} term    {#keys}•",
+            "type": "terminal"
+        },
+        {
+            "key": "• {#32} shell   {#keys}•",
+            "type": "shell"
+        },
+        {
+            "key": "• {#33}󰍛 cpu     {#keys}•",
+            "type": "cpu",
+            "showPeCoreCount": true
+        },
+        {
+            "key": "• {#34}󰉉 disk    {#keys}•",
+            "type": "disk",
+            "folders": "/"
+        },
+        {
+            "key": "• {#35} memory  {#keys}•",
+            "type": "memory"
+        },
+        {
+            "key": "• {#36}󰩟 network {#keys}•",
+            "type": "localip",
+            "format": "{1} ({4})"
+        },
+        {
+            "key": "•••••••••••••",
+            "type": "custom"
+        },
+        {
+            "key": "• {#39} colors  {#keys}•",
+            "type": "colors",
+            "symbol": "circle"
+        },
+        {
+            "key": "•••••••••••••",
+            "type": "custom"
+        }
+    ]
+}

presets/examples/16.jsonc

@@ -0,0 +1,85 @@
+// Inspired by Catnap
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small",
+        "padding": {
+            "top": 1
+        }
+    },
+    "display": {
+        "separator": " "
+    },
+    "modules": [
+        {
+            "key": "╔═══════════╗",
+            "type": "custom"
+        },
+        {
+            "key": "║ {#31} user    {#keys}║",
+            "type": "title",
+            "format": "{1}"
+        },
+        {
+            "key": "║ {#32}󰇅 hname   {#keys}║",
+            "type": "title",
+            "format": "{2}"
+        },
+        {
+            "key": "║ {#33}󰅐 uptime  {#keys}║",
+            "type": "uptime"
+        },
+        {
+            "key": "║ {#34}󰟾 distro  {#keys}║",
+            "type": "os"
+        },
+        {
+            "key": "║ {#35} kernel  {#keys}║",
+            "type": "kernel"
+        },
+        {
+            "key": "║ {#36}󰇄 desktop {#keys}║",
+            "type": "de"
+        },
+        {
+            "key": "║ {#31} term    {#keys}║",
+            "type": "terminal"
+        },
+        {
+            "key": "║ {#32} shell   {#keys}║",
+            "type": "shell"
+        },
+        {
+            "key": "║ {#33}󰍛 cpu     {#keys}║",
+            "type": "cpu",
+            "showPeCoreCount": true
+        },
+        {
+            "key": "║ {#34}󰉉 disk    {#keys}║",
+            "type": "disk",
+            "folders": "/"
+        },
+        {
+            "key": "║ {#35} memory  {#keys}║",
+            "type": "memory"
+        },
+        {
+            "key": "║ {#36}󰩟 network {#keys}║",
+            "type": "localip",
+            "format": "{1} ({4})"
+        },
+        {
+            "key": "╠═══════════╣",
+            "type": "custom"
+        },
+        {
+            "key": "║ {#39} colors  {#keys}║",
+            "type": "colors",
+            "symbol": "circle"
+        },
+        {
+            "key": "╚═══════════╝",
+            "type": "custom"
+        }
+    ]
+}

presets/examples/17.jsonc

@@ -0,0 +1,87 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small",
+        "padding": {
+            "top": 1,
+            "right": 2
+        }
+    },
+    "display": {
+        "separator": ">  ",
+        "color": {
+            "separator": "red"
+        },
+        "constants": [
+            "───────────────────────────────────────────────────────────────────────────",
+            "│\u001b[75C│\u001b[75D"
+        ]
+    },
+    "modules": [
+        {
+            "format": "{#1}{#keys}╭{$1}╮\u001b[76D {6}{7}{8} 🖥  ",
+            "type": "title"
+        },
+        {
+            "key": "{$2}{#31} kernel   ",
+            "type": "kernel"
+        },
+        {
+            "key": "{$2}{#32}󰅐 uptime   ",
+            "type": "uptime"
+        },
+        {
+            "key": "{$2}{#33}󰟾 distro   ",
+            "type": "os"
+        },
+        {
+            "key": "{$2}{#34}󰇄 desktop  ",
+            "type": "de"
+        },
+        {
+            "key": "{$2}{#35} term     ",
+            "type": "terminal"
+        },
+        {
+            "key": "{$2}{#36} shell    ",
+            "type": "shell"
+        },
+        {
+            "key": "{$2}{#35}󰍛 cpu      ",
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "temp": true
+        },
+        {
+            "key": "{$2}{#34}󰍛 gpu      ",
+            "type": "gpu"
+        },
+        {
+            "key": "{$2}{#33}󰉉 disk     ",
+            "type": "disk",
+            "folders": "/"
+        },
+        {
+            "key": "{$2}{#32} memory   ",
+            "type": "memory"
+        },
+        {
+            "key": "{$2}{#31}󰩟 network  ",
+            "type": "localip",
+            "format": "{1} ({4})"
+        },
+        {
+            "format": "{#1}{#keys}├{$1}┤",
+            "type": "custom"
+        },
+        {
+            "key": "{$2}{#39} colors   ",
+            "type": "colors",
+            "symbol": "circle"
+        },
+        {
+            "format": "{#1}{#keys}╰{$1}╯",
+            "type": "custom"
+        }
+    ]
+}

presets/examples/18.jsonc

@@ -0,0 +1,87 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small",
+        "padding": {
+            "top": 1,
+            "right": 2
+        }
+    },
+    "display": {
+        "separator": ">  ",
+        "color": {
+            "separator": "red"
+        },
+        "constants": [
+            "═══════════════════════════════════════════════════════════════════════════",
+            "║\u001b[75C║\u001b[75D"
+        ]
+    },
+    "modules": [
+        {
+            "format": "{#1}{#keys}╔{$1}╗\u001b[76D {6}{7}{8} 💻 ",
+            "type": "title"
+        },
+        {
+            "key": "{$2}{#31} kernel   ",
+            "type": "kernel"
+        },
+        {
+            "key": "{$2}{#32}󰅐 uptime   ",
+            "type": "uptime"
+        },
+        {
+            "key": "{$2}{#33}󰟾 distro   ",
+            "type": "os"
+        },
+        {
+            "key": "{$2}{#34}󰇄 desktop  ",
+            "type": "de"
+        },
+        {
+            "key": "{$2}{#35} term     ",
+            "type": "terminal"
+        },
+        {
+            "key": "{$2}{#36} shell    ",
+            "type": "shell"
+        },
+        {
+            "key": "{$2}{#35}󰍛 cpu      ",
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "temp": true
+        },
+        {
+            "key": "{$2}{#34}󰍛 gpu      ",
+            "type": "gpu"
+        },
+        {
+            "key": "{$2}{#33}󰉉 disk     ",
+            "type": "disk",
+            "folders": "/"
+        },
+        {
+            "key": "{$2}{#32} memory   ",
+            "type": "memory"
+        },
+        {
+            "key": "{$2}{#31}󰩟 network  ",
+            "type": "localip",
+            "format": "{1} ({4})"
+        },
+        {
+            "format": "{#1}{#keys}╠{$1}╣",
+            "type": "custom"
+        },
+        {
+            "key": "{$2}{#39} colors   ",
+            "type": "colors",
+            "symbol": "circle"
+        },
+        {
+            "format": "{#1}{#keys}╚{$1}╝",
+            "type": "custom"
+        }
+    ]
+}

presets/examples/19.jsonc

@@ -0,0 +1,188 @@
+//   _____ _____ _____ _____ _____ _____ _____ _____ _____
+//  |   __|  _  |   __|_   _|   __|   __|_   _|     |  |  |
+//  |   __|     |__   | | | |   __|   __| | | |   --|     |
+//  |__|  |__|__|_____| |_| |__|  |_____| |_| |_____|__|__|
+//
+//  By CarterLi - https://github.com/CarterLi
+//  Homepage - https://github.com/fastfetch-cli/fastfetch
+//  config.jsonc - ニリ @niri-san
+//  pokemon-colorscripts - https://gitlab.com/phoneybadger/pokemon-colorscripts
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "source": " _____ _____ _____ _____ _____ _____ _____ _____ _____\n|   __|  _  |   __|_   _|   __|   __|_   _|     |  |  |\n|   __|     |__   | | | |   __|   __| | | |   --|     |\n|__|  |__|__|_____| |_| |__|  |_____| |_| |_____|__|__|",
+        "type": "data",
+        "position": "top",
+        "padding": {
+            "right": 2
+        }
+    },
+    "display": {
+        "separator": " - "
+    },
+    "modules": [
+        {
+            "type": "custom", // HardwareInfo
+            "format": "• {#green}SYSTEM INFORMATION"
+        },
+        {
+            "type": "host",
+            "key": "HOST",
+            "format": "{name}{?vendor} ({vendor}){?}",
+            "keyColor": "green"
+        },
+        {
+            "type": "chassis",
+            "key": "COMPUTER TYPE",
+            "keyColor": "green"
+        },
+        {
+            "type": "cpu",
+            "key": "CPU",
+            "keyColor": "green"
+        },
+        {
+            "type": "gpu",
+            "key": "GPU",
+            "keyColor": "green"
+        },
+        {
+            "type": "memory",
+            "key": "MEMORY USED",
+            "keyColor": "green"
+        },
+        {
+            "type": "swap",
+            "key": "SWAP USED",
+            "keyColor": "green"
+        },
+        {
+            "type": "disk",
+            "key": "DISK",
+            "folders": "/",
+            "keyColor": "green"
+        },
+        {
+            "type": "custom", // SoftwareInfo
+            "format": "• {#red}SOFTWARE INFORMATION"
+        },
+        {
+            "type": "os",
+            "key": "DISTRO",
+            "keyColor": "red"
+        },
+        {
+            "type": "disk",
+            "folders": "/", // Use "/System/Volumes/VM" or something else on macOS
+            "format": "{create-time}",
+            "key": "INSTALLED DATE",
+            "keyColor": "red"
+        },
+        {
+            "type": "kernel",
+            "key": "KERNEL",
+            "keyColor": "red"
+        },
+        {
+            "type": "packages",
+            "key": "PACKAGES",
+            "keyColor": "red"
+        },
+        {
+            "type": "uptime",
+            "key": "UPTIME",
+            "keyColor": "red"
+        },
+        {
+            "type": "custom", // DisplayInfo
+            "format": "• {#blue}DISPLAY INFORMATION"
+        },
+        {
+            "type": "de",
+            "key": "DESKTOP ENVIRONMENT",
+            "keyColor": "blue"
+        },
+        {
+            "type": "lm",
+            "key": "LOGIN MANAGER",
+            "format": "{type}",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wm",
+            "key": "WM",
+            "keyColor": "blue"
+        },
+        {
+            "type": "wmtheme",
+            "key": "WM THEME",
+            "keyColor": "blue"
+        },
+        {
+            "type": "monitor",
+            "key": "MONITOR ({name})",
+            "keyColor": "blue"
+        },
+        {
+            "type": "custom", // DesignInfo
+            "format": "• {#yellow}DESIGN INFORMATION"
+        },
+        {
+            "type": "wallpaper",
+            "key": "WALLPAPER",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "theme",
+            "key": "KDE THEME",
+            "format": "{1}",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "icons",
+            "key": "ICON THEME",
+            "format": "{1}",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "font",
+            "key": "FONT",
+            "format": "{?1}{1} [Qt]{?}{/1}Unknown", // Remove "[Qt]" if not using Qt
+            "keyColor": "yellow"
+        },
+        {
+            "type": "terminalfont",
+            "key": "TERMINAL FONT",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "cursor",
+            "key": "CURSOR",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "custom", // OtherInfo
+            "format": "• {#cyan}VARIOUS INFORMATION"
+        },
+        {
+            "type": "media",
+            "key": "NOW PLAYING",
+            "format": "{?artist}{artist} - {?}{title}",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "weather",
+            "key": "WEATHER",
+            "timeout": 1000,
+            "keyColor": "cyan"
+        },
+        {
+            "type": "version",
+            "key": "INFO",
+            "keyColor": "cyan"
+        },
+        "break",
+        "colors",
+        "break"
+    ]
+}

presets/examples/2.jsonc

@@ -5,17 +5,21 @@
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
     // "logo": {
     //     "type": "iterm",
-    //     "source": "/Users/carter/Desktop/apple1.png",
+    //     "source": "~/Desktop/apple1.png",
     //     "width": 28,
     //     "height": 12
     // },
     "display": {
-        "separator": "  "
+        "separator": "  ",
+        "constants": [
+            "───────────────"
+        ]
     },
     "modules": [
         {
             "type": "custom", // HardwareStart
-            "format": "┌─────────── {#1}Hardware Information{#} ───────────┐" // {#1} is the same as `\u001b[1m`. {#} is `\u001b[m`
+            // {#1} is equivalent to `\u001b[1m`. {#} is equivalent to `\u001b[m`
+            "format": "┌{$1} {#1}Hardware Information{#} {$1}┐"
         },
         {
             "type": "host",
@@ -71,12 +75,12 @@
         },
         {
             "type": "custom", // SoftwareStart
-            "format": "├─────────── {#1}Software Information{#} ───────────┤"
+            "format": "├{$1} {#1}Software Information{#} {$1}┤"
         },
         {
             "type": "title",
             "key": "  ",
-            "format": "{1}@{2}"
+            "format": "{1}${2}"
         },
         {
             "type": "os",
@@ -155,7 +159,7 @@
         },
         {
             "type": "custom", // InformationEnd
-            "format": "└────────────────────────────────────────────┘"
+            "format": "└{$1}──────────────────────{$1}┘"
         },
         {
             "type": "colors",

presets/examples/20.jsonc

@@ -0,0 +1,163 @@
+// Inspired by https://github.com/usgraphics/TR-100
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": null,
+    "display": {
+        "pipe": true,
+        "keyWidth": 16,
+        "separator": "│ ",
+        "percent": {
+            "type": 6
+        },
+        "bar": {
+            "borderLeft": "",
+            "borderRight": "",
+            "charElapsed": "█",
+            "charTotal": "░",
+            "width": 40
+        },
+        "constants": [
+            "\u001b[42C"
+        ]
+    },
+    "modules": [
+        {
+            "type": "custom",
+            "format": "┌┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┬┐"
+        },
+        {
+            "type": "custom",
+            "format": "├┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┴┤"
+        },
+        {
+            "type": "version",
+            "key": " ",
+            "format": "│                   FASTFETCH v{version}                   │"
+        },
+        {
+            "type": "custom",
+            "format": "│                 TR-100 MACHINE REPORT                 │"
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┬──────────────────────────────────────────┤"
+        },
+        {
+            "type": "os",
+            "key": "│ OS         │{$1}"
+        },
+        {
+            "type": "kernel",
+            "key": "│ KERNEL     │{$1}"
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "title",
+            "key": "│ HOSTNAME   │{$1}",
+            "format": "{host-name}"
+        },
+        {
+            "type": "localip",
+            "key": "│ CLIENT IP  │{$1}",
+            "format": "{ipv4}"
+        },
+        {
+            "type": "localip",
+            "key": "│ MAC ADDR   │{$1}",
+            "format": "{mac} ({ifname})",
+            "showIPv4": false,
+            "showMac": true
+        },
+        {
+            "type": "dns",
+            "key": "│ DNS        │{$1}",
+            "showType": "ipv4"
+        },
+        {
+            "type": "title",
+            "key": "│ USER       │{$1}",
+            "format": "{user-name}"
+        },
+        {
+            "type": "host",
+            "key": "│ MACHINE    │{$1}",
+            "format": "{name}"
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "cpu",
+            "key": "│ PROCESSOR  │{$1}",
+            "format": "{name}"
+        },
+        {
+            "type": "cpu",
+            "key": "│ CORES      │{$1}",
+            "format": "{cores-physical} PHYSICAL CORES / {cores-logical} THREADS",
+            "showPeCoreCount": false
+        },
+        {
+            "type": "cpu",
+            "key": "│ CPU FREQ   │{$1}",
+            "format": "{freq-max}{/freq-max}{freq-base}{/} GHz"
+        },
+        {
+            "type": "loadavg",
+            "compact": false,
+            // {duration} is not fixed length, hack it
+            "key": "│ LOAD \u001b[s{duration}m\u001b[u\u001b[6C│{$1}"
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "memory",
+            "key": "│ MEMORY     │{$1}",
+            "format": "{used} / {total} [{percentage}]"
+        },
+        {
+            "type": "memory",
+            "key": "│ USAGE      │{$1}",
+            "format": ""
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "disk",
+            "key": "│ VOLUME     │{$1}",
+            "format": "{size-used} / {size-total} [{size-percentage}]",
+            "folders": "/"
+        },
+        {
+            "type": "disk",
+            "key": "│ DISK USAGE │{$1}",
+            "format": ""
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "users",
+            "key": "│ LAST LOGIN │{$1}",
+            "format": "{login-time}{?client-ip} ({client-ip})",
+            "myselfOnly": true
+        },
+        {
+            "type": "uptime",
+            "key": "│ UPTIME     │{$1}"
+        },
+        {
+            "type": "custom",
+            "format": "└────────────┴──────────────────────────────────────────┘"
+        }
+    ]
+  }

presets/examples/21.jsonc

@@ -0,0 +1,48 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "display": {
+        "constants": [
+            "██ "
+        ]
+    },
+    "modules": [
+        {
+            "key": "{$1}Distro",
+            "keyColor": "38;5;210",
+            "type": "os"
+        },
+        {
+            "key": "{$1}Kernel",
+            "keyColor": "38;5;84",
+            "type": "kernel"
+        },
+        {
+            "key": "{$1}Shell",
+            "keyColor": "38;5;147",
+            "type": "shell"
+        },
+        {
+            "key": "{$1}Packages",
+            "keyColor": "38;5;200",
+            "type": "packages"
+        },
+        {
+            "key": "{$1}WM",
+            "keyColor": "38;5;44",
+            "type": "wm"
+        },
+        {
+            "key": "{$1}CPU",
+            "keyColor": "38;5;75",
+            "type": "cpu"
+        },
+        {
+            "key": "{$1}Memory",
+            "keyColor": "38;5;123",
+            "type": "memory"
+        }
+    ]
+}

presets/examples/22.jsonc

@@ -0,0 +1,112 @@
+// 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",
+    "logo": {
+        "source": "arch3",
+        "color": {
+            "1": "red",
+            "2": "yellow"
+        }
+    },
+    "display": {
+        "color": {
+            "separator": "blue"
+        },
+        "separator": " | ",
+        "constants": [
+            ">-----------<+>---------------------------------------------<"
+        ]
+    },
+    "modules": [
+        {
+            "type": "kernel",
+            "key": " /\\rch Linux",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "custom",
+            "format": "{$1}",
+            "outputColor": "separator"
+        },
+        {
+            "type": "uptime",
+            "key": "   Uptime   ",
+            "keyColor": "green"
+        },
+        {
+            "type": "shell",
+            "key": "   Shell    ",
+            "keyColor": "green"
+        },
+        {
+            "type": "terminal",
+            "key": "   Terminal ",
+            "keyColor": "green"
+        },
+        {
+            "type": "terminalfont",
+            "key": "   Font     ",
+            "keyColor": "green"
+        },
+        {
+            "type": "packages",
+            "key": "   Packages ",
+            "keyColor": "green"
+        },
+        {
+            "type": "localip",
+            "key": "   Local IP ",
+            "keyColor": "green"
+        },
+        {
+            "type": "custom",
+            "format": "{$1}",
+            "outputColor": "separator"
+        },
+        {
+            "type": "display",
+            "key": "   Display  ",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "cpu",
+            "key": "   CPU      ",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "gpu",
+            "key": "   GPU      ",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "memory",
+            "key": "   RAM      ",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "swap",
+            "key": "   SWAP     ",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "disk",
+            "key": "   Disk     ",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "battery",
+            "key": "   Battery  ",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "custom",
+            "format": "{$1}",
+            "outputColor": "separator"
+        },
+        "break",
+        {
+            "type": "colors",
+            "paddingLeft": 15
+        }
+    ]
+}

presets/examples/3.jsonc

@@ -2,9 +2,13 @@
 
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": "debian_small",
+    "logo": {
+        "type": "small"
+    },
     "display": {
-        "binaryPrefix": "si"
+        "size": {
+            "binaryPrefix": "si"
+        }
     },
     "modules": [
         "vulkan",

presets/examples/4.jsonc

@@ -3,13 +3,15 @@
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
     "logo": {
-        "source": "arch_small",
+        "type": "small",
         "padding": {
             "right": 1
         }
     },
     "display": {
-        "binaryPrefix": "si",
+        "size": {
+            "binaryPrefix": "si"
+        },
         "color": "blue",
         "separator": "  "
     },

presets/examples/5.jsonc

@@ -4,7 +4,7 @@
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
     "logo": null,
     "display": {
-        "color": "reset_magenta"
+        "color": "magenta"
     },
     "modules": [
         {

presets/examples/6.jsonc

@@ -3,12 +3,6 @@
 
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    // "logo": {
-    //     "type": "iterm",
-    //     "source": "/Users/carter/Desktop/apple1.png",
-    //     "width": 28,
-    //     "height": 12
-    // },
     "display": {
         "separator": " "
     },
@@ -125,8 +119,8 @@
             "key": "╰─󰸉",
             "keyColor": "yellow"
         },
-
         "break",
+
         {
             "type": "title",
             "key": "╭─",

presets/examples/9.jsonc

@@ -9,6 +9,9 @@
             "charElapsed": "=",
             "charTotal": "-",
             "width": 13
+        },
+        "percent": {
+            "type": 2
         }
     },
     "modules": [
@@ -16,11 +19,14 @@
         "separator",
         "memory",
         "swap",
-        "disk",
+        {
+            "type": "disk",
+            "folders": "/"
+        },
         "battery",
         {
             "type": "colors",
-            "paddingLeft": 11,
+            "paddingLeft": 10,
             "symbol": "circle"
         }
     ]

presets/paleofetch.jsonc

@@ -17,10 +17,7 @@
         "break",
         "packages",
         "shell",
-        {
-            "type": "display",
-            "key": "Display"
-        },
+        "display",
         "terminal",
         "break",
         "cpu",

presets/screenfetch.jsonc

@@ -0,0 +1,37 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "modules": [
+        "title",
+        "os",
+        "kernel",
+        "uptime",
+        {
+            "type": "packages",
+            "format": "{all}"
+        },
+        "shell",
+        {
+            "type": "display",
+            "key": "Resolution",
+            "compactType": "original"
+        },
+        "de",
+        "wm",
+        "wmtheme",
+        {
+            "type": "terminalfont",
+            "key": "font"
+        },
+        {
+            "type": "disk",
+            "folders": "/",
+            "key": "Disk"
+        },
+        "cpu",
+        "gpu",
+        {
+            "type": "memory",
+            "key": "RAM"
+        }
+    ]
+}

src/3rdparty/igcl/LICENSE

@@ -1,27 +0,0 @@
-Intel Software License Agreement
-10.07.21 
-
-Use and Redistribution. You may use and redistribute Intel’s Control API software and the header files for the Intel® Graphics Control Library (collectively, the “Software”), solely for use on Intel platforms, provided the following conditions are met:
-* Redistributions must reproduce the above copyright notice and the following terms of use in the Software and in the documentation and/or other materials provided with the distribution.
-* Neither the name of Intel nor the names of its suppliers may be used to endorse or promote products derived from this Software without specific prior written permission.
-* No reverse engineering, decompilation, or disassembly of Software provided to you in binary form is permitted.
-
-Third Party Software. The Software may contain Third Party Software. “Third Party Software” is third party software, open source software or other Intel software listed in the “third-party-software.txt” or other similarly named text file that is included with the Software. Third Party Software, even if included with the distribution of the Software, may be governed by separate license terms, including without limitation, third party license terms, open source software notices and terms, and/or other Intel software license terms. These separate license terms solely govern your use of the Third Party Software.
-
-Ownership. Title to the Software and all copies remain with Intel or its suppliers. 
-
-DISCLAIMER. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE DISCLAIMED. THIS SOFTWARE IS NOT INTENDED FOR USE IN SYSTEMS OR APPLICATIONS WHERE FAILURE OF THE SOFTWARE MAY CAUSE PERSONAL INJURY OR DEATH AND YOU AGREE THAT YOU ARE FULLY RESPONSIBLE FOR ANY CLAIMS, COSTS, DAMAGES, EXPENSES, AND ATTORNEYS’ FEES ARISING OUT OF ANY SUCH USE, EVEN IF ANY CLAIM ALLEGES THAT INTEL WAS NEGLIGENT REGARDING THE DESIGN OR MANUFACTURE OF THE SOFTWARE.
-
-LIMITATION OF LIABILITY; INDEMNITY. IN NO EVENT WILL INTEL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. YOU AGREE TO INDEMNIFY, DEFEND, AND HOLD INTEL HARMLESS AGAINST ANY CLAIMS, DAMAGES, AND EXPENSES RESULTING FROM YOUR USE OR UNAUTHORIZED USE OF THE SOFTWARE.
-
-No support. Intel may make changes to the Software, at any time without notice, and is not obligated to support, update or provide training for the Software.
-
-Termination. Your right to use the Software is terminated immediately in the event of your breach of this agreement.
-
-Feedback. Should you provide Intel with comments, modifications, corrections, enhancements or other input (“Feedback”) related to the Software Intel will be free to use, disclose, reproduce, license or otherwise distribute or exploit the Feedback in its sole discretion without any obligations or restrictions of any kind, including without limitation, intellectual property rights or licensing obligations.
-
-Compliance with laws. You agree to comply with all applicable laws and regulations governing your use, transfer, import or export (or prohibition thereof) of the Software.
-
-Governing law. All disputes will be governed by the laws of the United States of America and the State of Delaware without reference to conflict of law principles and subject to the exclusive jurisdiction of the state or federal courts sitting in the State of Delaware, and each party agrees that it submits to the personal jurisdiction and venue of those courts and waives any objections. The United Nations Convention on Contracts for the International Sale of Goods (1980) is specifically excluded and will not apply to the Software.
-
-Severability. The parties intend that if a court holds that any provision of this agreement is invalid or unenforceable under applicable law, the court will modify the provision to the minimum extent necessary to make it valid and enforceable or sever and delete the provision from this agreement. Any change to or deletion of a provision of this agreement under this Section will not affect the validity or enforceability of the remainder of this agreement, which will continue in full force and effect.

src/3rdparty/igcl/repo.json

@@ -1,6 +0,0 @@
-{
-    "home": "https://github.com/intel/drivers.gpu.control-library",
-    "license": "./LICENSE",
-    "version": "v184",
-    "author": "Intel Corporation"
-}

src/3rdparty/mk_wcwidch/repo.json

@@ -1,6 +1,6 @@
 {
     "home": "https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c",
-    "license": "Embed in source",
+    "license": "MIT compatible (embed in source)",
     "version": "2007-05-26 (Unicode 5.0)",
     "author": "Markus Kuhn",
     "modified": "CarterLi"

src/3rdparty/yyjson/repo.json

@@ -1,6 +1,6 @@
 {
     "home": "https://github.com/ibireme/yyjson",
     "license": "MIT ( embed in source )",
-    "version": "0.9.0",
+    "version": "0.10.0",
     "author": "ibireme"
 }

src/3rdparty/yyjson/yyjson.c

@@ -1831,6 +1831,42 @@ bool unsafe_yyjson_mut_equals(yyjson_mut_val *lhs, yyjson_mut_val *rhs) {
     }
 }
 
+bool yyjson_locate_pos(const char *str, size_t len, size_t pos,
+                       size_t *line, size_t *col, size_t *chr) {
+    usize line_sum = 0, line_pos = 0, chr_sum = 0;
+    const u8 *cur = (const u8 *)str;
+    const u8 *end = cur + pos;
+    
+    if (!str || pos > len) {
+        if (line) *line = 0;
+        if (col) *col = 0;
+        if (chr) *chr = 0;
+        return false;
+    }
+    
+    while (cur < end) {
+        u8 c = *cur;
+        chr_sum += 1;
+        if (likely(c < 0x80)) {         /* 0xxxxxxx (0x00-0x7F) ASCII */
+            if (c == '\n') {
+                line_sum += 1;
+                line_pos = chr_sum;
+            }
+            cur += 1;
+        }
+        else if (c < 0xC0) cur += 1;    /* 10xxxxxx (0x80-0xBF) Invalid */
+        else if (c < 0xE0) cur += 2;    /* 110xxxxx (0xC0-0xDF) 2-byte UTF-8 */
+        else if (c < 0xF0) cur += 3;    /* 1110xxxx (0xE0-0xEF) 3-byte UTF-8 */
+        else if (c < 0xF8) cur += 4;    /* 11110xxx (0xF0-0xF7) 4-byte UTF-8 */
+        else               cur += 1;    /* 11111xxx (0xF8-0xFF) Invalid */
+    }
+    
+    if (line) *line = line_sum + 1;
+    if (col) *col = chr_sum - line_pos + 1;
+    if (chr) *chr = chr_sum;
+    return true;
+}
+
 
 
 #if !YYJSON_DISABLE_UTILS
@@ -4434,7 +4470,7 @@ static_inline bool read_number(u8 **ptr,
     bool sign;
     
     /* read number as raw string if has `YYJSON_READ_NUMBER_AS_RAW` flag */
-    if (unlikely(pre && !has_read_flag(BIGNUM_AS_RAW))) {
+    if (has_read_flag(NUMBER_AS_RAW)) {
         return read_number_raw(ptr, pre, flg, val, msg);
     }
     
@@ -5036,7 +5072,7 @@ static_inline bool read_number(u8 **ptr,
     bool sign;
     
     /* read number as raw string if has `YYJSON_READ_NUMBER_AS_RAW` flag */
-    if (unlikely(pre && !has_read_flag(BIGNUM_AS_RAW))) {
+    if (has_read_flag(NUMBER_AS_RAW)) {
         return read_number_raw(ptr, pre, flg, val, msg);
     }
     
@@ -5744,18 +5780,18 @@ static_noinline yyjson_doc *read_root_single(u8 *hdr,
     }
     if (*cur == 't') {
         if (likely(read_true(&cur, val))) goto doc_end;
-        goto fail_literal;
+        goto fail_literal_true;
     }
     if (*cur == 'f') {
         if (likely(read_false(&cur, val))) goto doc_end;
-        goto fail_literal;
+        goto fail_literal_false;
     }
     if (*cur == 'n') {
         if (likely(read_null(&cur, val))) goto doc_end;
         if (has_read_flag(ALLOW_INF_AND_NAN)) {
             if (read_nan(false, &cur, pre, val)) goto doc_end;
         }
-        goto fail_literal;
+        goto fail_literal_null;
     }
     if (has_read_flag(ALLOW_INF_AND_NAN)) {
         if (read_inf_or_nan(false, &cur, pre, val)) goto doc_end;
@@ -5789,15 +5825,26 @@ fail_string:
 fail_number:
     return_err(cur, INVALID_NUMBER, msg);
 fail_alloc:
-    return_err(cur, MEMORY_ALLOCATION, "memory allocation failed");
-fail_literal:
-    return_err(cur, LITERAL, "invalid literal");
-fail_comment:
-    return_err(cur, INVALID_COMMENT, "unclosed multiline comment");
+    return_err(cur, MEMORY_ALLOCATION, 
+               "memory allocation failed");
+fail_literal_true:
+    return_err(cur, LITERAL, 
+               "invalid literal, expected a valid literal such as 'true'");
+fail_literal_false:
+    return_err(cur, LITERAL, 
+               "invalid literal, expected a valid literal such as 'false'");
+fail_literal_null:
+    return_err(cur, LITERAL, 
+               "invalid literal, expected a valid literal such as 'null'");
 fail_character:
-    return_err(cur, UNEXPECTED_CHARACTER, "unexpected character");
+    return_err(cur, UNEXPECTED_CHARACTER, 
+               "unexpected character, expected a valid root value");
+fail_comment:
+    return_err(cur, INVALID_COMMENT,
+               "unclosed multiline comment");
 fail_garbage:
-    return_err(cur, UNEXPECTED_CONTENT, "unexpected content after document");
+    return_err(cur, UNEXPECTED_CONTENT, 
+               "unexpected content after document");
     
 #undef return_err
 }
@@ -5927,13 +5974,13 @@ arr_val_begin:
         val_incr();
         ctn_len++;
         if (likely(read_true(&cur, val))) goto arr_val_end;
-        goto fail_literal;
+        goto fail_literal_true;
     }
     if (*cur == 'f') {
         val_incr();
         ctn_len++;
         if (likely(read_false(&cur, val))) goto arr_val_end;
-        goto fail_literal;
+        goto fail_literal_false;
     }
     if (*cur == 'n') {
         val_incr();
@@ -5942,7 +5989,7 @@ arr_val_begin:
         if (has_read_flag(ALLOW_INF_AND_NAN)) {
             if (read_nan(false, &cur, pre, val)) goto arr_val_end;
         }
-        goto fail_literal;
+        goto fail_literal_null;
     }
     if (*cur == ']') {
         cur++;
@@ -5960,13 +6007,13 @@ arr_val_begin:
         val_incr();
         ctn_len++;
         if (read_inf_or_nan(false, &cur, pre, val)) goto arr_val_end;
-        goto fail_character;
+        goto fail_character_val;
     }
     if (has_read_flag(ALLOW_COMMENTS)) {
         if (skip_spaces_and_comments(&cur)) goto arr_val_begin;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_val;
     
 arr_val_end:
     if (*cur == ',') {
@@ -5985,7 +6032,7 @@ arr_val_end:
         if (skip_spaces_and_comments(&cur)) goto arr_val_end;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_arr_end;
     
 arr_end:
     /* get parent container */
@@ -6038,7 +6085,7 @@ obj_key_begin:
         if (skip_spaces_and_comments(&cur)) goto obj_key_begin;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_obj_key;
     
 obj_key_end:
     if (*cur == ':') {
@@ -6053,7 +6100,7 @@ obj_key_end:
         if (skip_spaces_and_comments(&cur)) goto obj_key_end;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_obj_sep;
     
 obj_val_begin:
     if (*cur == '"') {
@@ -6080,13 +6127,13 @@ obj_val_begin:
         val++;
         ctn_len++;
         if (likely(read_true(&cur, val))) goto obj_val_end;
-        goto fail_literal;
+        goto fail_literal_true;
     }
     if (*cur == 'f') {
         val++;
         ctn_len++;
         if (likely(read_false(&cur, val))) goto obj_val_end;
-        goto fail_literal;
+        goto fail_literal_false;
     }
     if (*cur == 'n') {
         val++;
@@ -6095,7 +6142,7 @@ obj_val_begin:
         if (has_read_flag(ALLOW_INF_AND_NAN)) {
             if (read_nan(false, &cur, pre, val)) goto obj_val_end;
         }
-        goto fail_literal;
+        goto fail_literal_null;
     }
     if (char_is_space(*cur)) {
         while (char_is_space(*++cur));
@@ -6106,13 +6153,13 @@ obj_val_begin:
         val++;
         ctn_len++;
         if (read_inf_or_nan(false, &cur, pre, val)) goto obj_val_end;
-        goto fail_character;
+        goto fail_character_val;
     }
     if (has_read_flag(ALLOW_COMMENTS)) {
         if (skip_spaces_and_comments(&cur)) goto obj_val_begin;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_val;
     
 obj_val_end:
     if (likely(*cur == ',')) {
@@ -6131,7 +6178,7 @@ obj_val_end:
         if (skip_spaces_and_comments(&cur)) goto obj_val_end;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_obj_end;
     
 obj_end:
     /* pop container */
@@ -6174,17 +6221,41 @@ fail_string:
 fail_number:
     return_err(cur, INVALID_NUMBER, msg);
 fail_alloc:
-    return_err(cur, MEMORY_ALLOCATION, "memory allocation failed");
+    return_err(cur, MEMORY_ALLOCATION, 
+               "memory allocation failed");
 fail_trailing_comma:
-    return_err(cur, JSON_STRUCTURE, "trailing comma is not allowed");
-fail_literal:
-    return_err(cur, LITERAL, "invalid literal");
+    return_err(cur, JSON_STRUCTURE, 
+               "trailing comma is not allowed");
+fail_literal_true:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'true'");
+fail_literal_false:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'false'");
+fail_literal_null:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'null'");
+fail_character_val:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a valid JSON value");
+fail_character_arr_end:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a comma or a closing bracket");
+fail_character_obj_key:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a string for object key");
+fail_character_obj_sep:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a colon after object key");
+fail_character_obj_end:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a comma or a closing brace");
 fail_comment:
-    return_err(cur, INVALID_COMMENT, "unclosed multiline comment");
-fail_character:
-    return_err(cur, UNEXPECTED_CHARACTER, "unexpected character");
+    return_err(cur, INVALID_COMMENT,
+               "unclosed multiline comment");
 fail_garbage:
-    return_err(cur, UNEXPECTED_CONTENT, "unexpected content after document");
+    return_err(cur, UNEXPECTED_CONTENT, 
+               "unexpected content after document");
     
 #undef val_incr
 #undef return_err
@@ -6330,13 +6401,13 @@ arr_val_begin:
         val_incr();
         ctn_len++;
         if (likely(read_true(&cur, val))) goto arr_val_end;
-        goto fail_literal;
+        goto fail_literal_true;
     }
     if (*cur == 'f') {
         val_incr();
         ctn_len++;
         if (likely(read_false(&cur, val))) goto arr_val_end;
-        goto fail_literal;
+        goto fail_literal_false;
     }
     if (*cur == 'n') {
         val_incr();
@@ -6345,7 +6416,7 @@ arr_val_begin:
         if (has_read_flag(ALLOW_INF_AND_NAN)) {
             if (read_nan(false, &cur, pre, val)) goto arr_val_end;
         }
-        goto fail_literal;
+        goto fail_literal_null;
     }
     if (*cur == ']') {
         cur++;
@@ -6363,13 +6434,13 @@ arr_val_begin:
         val_incr();
         ctn_len++;
         if (read_inf_or_nan(false, &cur, pre, val)) goto arr_val_end;
-        goto fail_character;
+        goto fail_character_val;
     }
     if (has_read_flag(ALLOW_COMMENTS)) {
         if (skip_spaces_and_comments(&cur)) goto arr_val_begin;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_val;
     
 arr_val_end:
     if (byte_match_2(cur, ",\n")) {
@@ -6392,7 +6463,7 @@ arr_val_end:
         if (skip_spaces_and_comments(&cur)) goto arr_val_end;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_arr_end;
     
 arr_end:
     /* get parent container */
@@ -6458,7 +6529,7 @@ obj_key_begin:
         if (skip_spaces_and_comments(&cur)) goto obj_key_begin;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_obj_key;
     
 obj_key_end:
     if (byte_match_2(cur, ": ")) {
@@ -6477,7 +6548,7 @@ obj_key_end:
         if (skip_spaces_and_comments(&cur)) goto obj_key_end;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_obj_sep;
     
 obj_val_begin:
     if (*cur == '"') {
@@ -6504,13 +6575,13 @@ obj_val_begin:
         val++;
         ctn_len++;
         if (likely(read_true(&cur, val))) goto obj_val_end;
-        goto fail_literal;
+        goto fail_literal_true;
     }
     if (*cur == 'f') {
         val++;
         ctn_len++;
         if (likely(read_false(&cur, val))) goto obj_val_end;
-        goto fail_literal;
+        goto fail_literal_false;
     }
     if (*cur == 'n') {
         val++;
@@ -6519,7 +6590,7 @@ obj_val_begin:
         if (has_read_flag(ALLOW_INF_AND_NAN)) {
             if (read_nan(false, &cur, pre, val)) goto obj_val_end;
         }
-        goto fail_literal;
+        goto fail_literal_null;
     }
     if (char_is_space(*cur)) {
         while (char_is_space(*++cur));
@@ -6530,13 +6601,13 @@ obj_val_begin:
         val++;
         ctn_len++;
         if (read_inf_or_nan(false, &cur, pre, val)) goto obj_val_end;
-        goto fail_character;
+        goto fail_character_val;
     }
     if (has_read_flag(ALLOW_COMMENTS)) {
         if (skip_spaces_and_comments(&cur)) goto obj_val_begin;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_val;
     
 obj_val_end:
     if (byte_match_2(cur, ",\n")) {
@@ -6559,7 +6630,7 @@ obj_val_end:
         if (skip_spaces_and_comments(&cur)) goto obj_val_end;
         if (byte_match_2(cur, "/*")) goto fail_comment;
     }
-    goto fail_character;
+    goto fail_character_obj_end;
     
 obj_end:
     /* pop container */
@@ -6603,17 +6674,41 @@ fail_string:
 fail_number:
     return_err(cur, INVALID_NUMBER, msg);
 fail_alloc:
-    return_err(cur, MEMORY_ALLOCATION, "memory allocation failed");
+    return_err(cur, MEMORY_ALLOCATION,
+               "memory allocation failed");
 fail_trailing_comma:
-    return_err(cur, JSON_STRUCTURE, "trailing comma is not allowed");
-fail_literal:
-    return_err(cur, LITERAL, "invalid literal");
+    return_err(cur, JSON_STRUCTURE,
+               "trailing comma is not allowed");
+fail_literal_true:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'true'");
+fail_literal_false:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'false'");
+fail_literal_null:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'null'");
+fail_character_val:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a valid JSON value");
+fail_character_arr_end:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a comma or a closing bracket");
+fail_character_obj_key:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a string for object key");
+fail_character_obj_sep:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a colon after object key");
+fail_character_obj_end:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a comma or a closing brace");
 fail_comment:
-    return_err(cur, INVALID_COMMENT, "unclosed multiline comment");
-fail_character:
-    return_err(cur, UNEXPECTED_CHARACTER, "unexpected character");
+    return_err(cur, INVALID_COMMENT,
+               "unclosed multiline comment");
 fail_garbage:
-    return_err(cur, UNEXPECTED_CONTENT, "unexpected content after document");
+    return_err(cur, UNEXPECTED_CONTENT,
+               "unexpected content after document");
     
 #undef val_incr
 #undef return_err
@@ -7835,7 +7930,7 @@ static const u8 esc_single_char_table[512] = {
 
 /** Returns the encode table with options. */
 static_inline const char_enc_type *get_enc_table_with_flag(
-    yyjson_read_flag flg) {
+    yyjson_write_flag flg) {
     if (has_write_flag(ESCAPE_UNICODE)) {
         if (has_write_flag(ESCAPE_SLASHES)) {
             return enc_table_esc_slash;

src/3rdparty/yyjson/yyjson.h

@@ -527,16 +527,16 @@ extern "C" {
 #define YYJSON_VERSION_MAJOR  0
 
 /** The minor version of yyjson. */
-#define YYJSON_VERSION_MINOR  9
+#define YYJSON_VERSION_MINOR  10
 
 /** The patch version of yyjson. */
 #define YYJSON_VERSION_PATCH  0
 
 /** The version of yyjson in hex: `(major << 16) | (minor << 8) | (patch)`. */
-#define YYJSON_VERSION_HEX    0x000900
+#define YYJSON_VERSION_HEX    0x000A00
 
 /** The version string of yyjson. */
-#define YYJSON_VERSION_STRING "0.9.0"
+#define YYJSON_VERSION_STRING "0.10.0"
 
 /** The version of yyjson in hex, same as `YYJSON_VERSION_HEX`. */
 yyjson_api uint32_t yyjson_version(void);
@@ -841,6 +841,24 @@ typedef struct yyjson_read_err {
     size_t pos;
 } yyjson_read_err;
 
+/**
+ Locate the line and column number for a byte position in a string.
+ This can be used to get better description for error position.
+ 
+ @param str The input string.
+ @param len The byte length of the input string.
+ @param pos The byte position within the input string.
+ @param line A pointer to receive the line number, starting from 1.
+ @param col  A pointer to receive the column number, starting from 1.
+ @param chr  A pointer to receive the character index, starting from 0.
+ @return true on success, false if `str` is NULL or `pos` is out of bounds.
+ @note Line/column/character are calculated based on Unicode characters for
+    compatibility with text editors. For multi-byte UTF-8 characters,
+    the returned value may not directly correspond to the byte position.
+ */
+yyjson_api bool yyjson_locate_pos(const char *str, size_t len, size_t pos,
+                                  size_t *line, size_t *col, size_t *chr);
+
 
 
 /**

src/common/commandoption.c

@@ -130,10 +130,7 @@ void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc)
             {
                 char str[32];
                 int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
-                if(instance.config.display.pipe)
-                    puts(str);
-                else
-                    printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+                printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
             }
         }
 

src/common/format.c

@@ -52,24 +52,28 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
  * @param placeholderValue the string to parse
  * @return uint32_t the parsed value
  */
-static uint32_t getArgumentIndex(const FFstrbuf* placeholderValue, uint32_t numArgs, const FFformatarg* arguments)
+static uint32_t getArgumentIndex(const char* placeholderValue, uint32_t numArgs, const FFformatarg* arguments)
 {
-    char firstChar = placeholderValue->chars[0];
+    char firstChar = placeholderValue[0];
+    if (firstChar == '\0')
+        return 0; // use arg counter
 
-    if(firstChar >= '1' && firstChar <= '9')
+    if (firstChar >= '0' && firstChar <= '9')
     {
         char* pEnd = NULL;
-        unsigned long result = strtoul(placeholderValue->chars, &pEnd, 10);
-        if (pEnd != placeholderValue->chars + placeholderValue->length || result > numArgs)
+        uint32_t result = (uint32_t) strtoul(placeholderValue, &pEnd, 10);
+        if (result > numArgs)
             return UINT32_MAX;
-        return (uint32_t) result;
+        if (*pEnd != '\0')
+            return UINT32_MAX;
+        return result;
     }
     else if (ffCharIsEnglishAlphabet(firstChar))
     {
         for (uint32_t i = 0; i < numArgs; ++i)
         {
             const FFformatarg* arg = &arguments[i];
-            if(arg->name && ffStrbufIgnCaseEqualS(placeholderValue, arg->name))
+            if (arg->name && strcasecmp(placeholderValue, arg->name) == 0)
                 return i + 1;
         }
     }
@@ -86,16 +90,6 @@ static inline void appendInvalidPlaceholder(FFstrbuf* buffer, const char* start,
         ffStrbufAppendC(buffer, '}');
 }
 
-static inline void appendEmptyPlaceholder(FFstrbuf* buffer, const char* placeholder, uint32_t* argCounter, uint32_t numArgs, const FFformatarg* arguments)
-{
-    if(*argCounter >= numArgs)
-        ffStrbufAppendS(buffer, placeholder);
-    else
-        ffFormatAppendFormatArg(buffer, arguments + *argCounter);
-
-    (*argCounter)++;
-}
-
 static inline bool formatArgSet(const FFformatarg* arg)
 {
     return arg->value != NULL && (
@@ -128,13 +122,6 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
             continue;
         }
 
-        // if we have an { at the end handle it as {}
-        if(i == formatstr->length - 1)
-        {
-            appendEmptyPlaceholder(buffer, "{", &argCounter, numArgs, arguments);
-            continue;
-        }
-
         // jump to next char, the start of the placeholder value
         ++i;
 
@@ -145,13 +132,6 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
             continue;
         }
 
-        // placeholder is {}
-        if(formatstr->chars[i] == '}')
-        {
-            appendEmptyPlaceholder(buffer, "{}", &argCounter, numArgs, arguments);
-            continue;
-        }
-
         ffStrbufClear(&placeholderValue);
 
         {
@@ -205,7 +185,7 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
         {
             ffStrbufSubstrAfter(&placeholderValue, 0);
 
-            uint32_t index = getArgumentIndex(&placeholderValue, numArgs, arguments);
+            uint32_t index = getArgumentIndex(placeholderValue.chars, numArgs, arguments);
 
             // testing for an invalid index
             if (index > numArgs)
@@ -231,7 +211,7 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
         {
             ffStrbufSubstrAfter(&placeholderValue, 0);
 
-            uint32_t index = getArgumentIndex(&placeholderValue, numArgs, arguments);
+            uint32_t index = getArgumentIndex(placeholderValue.chars, numArgs, arguments);
 
             // testing for an invalid index
             if (index > numArgs)
@@ -264,16 +244,70 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
             continue;
         }
 
-        uint32_t index = getArgumentIndex(&placeholderValue, numArgs, arguments);
+        //test for constant, if so evaluate it
+        if (firstChar == '$')
+        {
+            char* pend = NULL;
+            int32_t indexSigned = (int32_t) strtol(placeholderValue.chars + 1, &pend, 10);
+            uint32_t index = (uint32_t) indexSigned;
+            bool backward = indexSigned < 0;
+
+            if (indexSigned == 0 || *pend != '\0' || instance.config.display.constants.length < index)
+            {
+                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
+                continue;
+            }
+
+            FFstrbuf* item = FF_LIST_GET(FFstrbuf, instance.config.display.constants, backward
+                ? instance.config.display.constants.length - index
+                : index - 1);
+            ffStrbufAppend(buffer, item);
+            continue;
+        }
+
+        int32_t truncLength = INT32_MAX;
+        char* pColon = memchr(placeholderValue.chars, ':', placeholderValue.length);
+        if (pColon != NULL)
+        {
+            char* pEnd = NULL;
+            truncLength = (int32_t) strtol(pColon + 1, &pEnd, 10);
+            if (*pEnd != '\0')
+            {
+                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
+                continue;
+            }
+            *pColon = '\0';
+        }
+
+        uint32_t index = getArgumentIndex(placeholderValue.chars, numArgs, arguments);
 
         // test for invalid index
+        if (index == 0)
+            index = ++argCounter;
+
         if (index > numArgs)
         {
+            if (pColon) *pColon = ':';
             appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
             continue;
         }
 
+        bool ellipsis = false;
+        if (truncLength < 0)
+        {
+            ellipsis = true;
+            truncLength = -truncLength;
+        }
+
+        uint32_t oldLength = buffer->length;
         ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
+        if (buffer->length - oldLength > (uint32_t) truncLength)
+        {
+            ffStrbufSubstrBefore(buffer, oldLength + (uint32_t) truncLength);
+            ffStrbufTrimRightSpace(buffer);
+            if (ellipsis)
+                ffStrbufAppendS(buffer, "…");
+        }
     }
 
     if (!instance.config.display.pipe)

src/common/format.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "util/FFstrbuf.h"
+
 typedef enum FFformatargtype
 {
     FF_FORMAT_ARG_TYPE_NULL = 0,

src/common/init.c

@@ -2,6 +2,7 @@
 #include "common/parsing.h"
 #include "common/thread.h"
 #include "detection/displayserver/displayserver.h"
+#include "detection/terminaltheme/terminaltheme.h"
 #include "util/textModifier.h"
 #include "logo/logo.h"
 
@@ -22,10 +23,18 @@ static void initState(FFstate* state)
     state->logoWidth = 0;
     state->logoHeight = 0;
     state->keysHeight = 0;
+    state->terminalLightTheme = false;
 
     ffPlatformInit(&state->platform);
     state->configDoc = NULL;
     state->resultDoc = NULL;
+
+    {
+        // don't enable bright color if the terminal is in light mode
+        FFTerminalThemeResult result;
+        if (ffDetectTerminalTheme(&result, true /* forceEnv for performance */) && !result.bg.dark)
+            state->terminalLightTheme = true;
+    }
 }
 
 static void defaultConfig(void)
@@ -43,8 +52,12 @@ void ffInitInstance(void)
         //https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/setlocale-wsetlocale?source=recommendations&view=msvc-170#utf-8-support
         setlocale(LC_ALL, ".UTF8");
     #else
-        // used for mbsrtowcs in Module `separator`
-        setlocale(LC_ALL, "");
+        // Never use `setlocale(LC_ALL, "")`
+        setlocale(LC_TIME, "");
+        setlocale(LC_NUMERIC, "");
+        #ifdef LC_MESSAGES
+            setlocale(LC_MESSAGES, "");
+        #endif
     #endif
 
     initState(&instance.state);
@@ -241,9 +254,6 @@ void ffListFeatures(void)
         #ifdef FF_HAVE_DIRECTX_HEADERS
             "Directx Headers\n"
         #endif
-        #ifdef FF_USE_PROPRIETARY_GPU_DRIVER_API
-            "Proprietary GPU driver API\n"
-        #endif
         #ifdef FF_USE_SYSTEM_YYJSON
             "System yyjson\n"
         #endif

src/common/io/io.h

@@ -8,11 +8,13 @@
     #include <handleapi.h>
     #include <io.h>
     typedef HANDLE FFNativeFD;
+    #define FF_INVALID_FD INVALID_HANDLE_VALUE
 #else
     #include <unistd.h>
     #include <dirent.h>
     #include <sys/stat.h>
     typedef int FFNativeFD;
+    #define FF_INVALID_FD (-1)
     // procfs's file can be changed between read calls such as /proc/meminfo and /proc/uptime.
     // one safe way to read correct data is reading the whole file in a single read syscall
     // 8192 comes from procps-ng: https://gitlab.com/procps-ng/procps/-/blob/master/library/meminfo.c?ref_type=heads#L39
@@ -99,17 +101,25 @@ static inline bool ffPathExists(const char* path, FFPathType pathType)
 
     #else
 
-    struct stat fileStat;
-    if(stat(path, &fileStat) != 0)
-        return false;
+    if (pathType == FF_PATHTYPE_ANY)
+    {
+        // Zero overhead
+        return access(path, F_OK) == 0;
+    }
+    else
+    {
+        struct stat fileStat;
+        if(stat(path, &fileStat) != 0)
+            return false;
 
-    unsigned int mode = fileStat.st_mode & S_IFMT;
+        unsigned int mode = fileStat.st_mode & S_IFMT;
 
-    if(pathType & FF_PATHTYPE_FILE && mode != S_IFDIR)
-        return true;
+        if(pathType & FF_PATHTYPE_FILE && mode != S_IFDIR)
+            return true;
 
-    if(pathType & FF_PATHTYPE_DIRECTORY && mode == S_IFDIR)
-        return true;
+        if(pathType & FF_PATHTYPE_DIRECTORY && mode == S_IFDIR)
+            return true;
+    }
 
     #endif
 

src/common/io/io_unix.c

@@ -133,32 +133,44 @@ bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* o
 
 const char* ffGetTerminalResponse(const char* request, const char* format, ...)
 {
-    if (instance.config.display.pipe)
-        return "Not supported in --pipe mode";
+    int fin = STDIN_FILENO, fout = STDOUT_FILENO;
+    FF_AUTO_CLOSE_FD int ftty = -1;
 
-    struct termios oldTerm, newTerm;
-    if(tcgetattr(STDIN_FILENO, &oldTerm) == -1)
+    if (!isatty(STDIN_FILENO))
+    {
+        if (ftty < 0)
+            ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
+        fin = ftty;
+    }
+    if (!isatty(STDOUT_FILENO))
+    {
+        if (ftty < 0)
+            ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
+        fout = ftty;
+    }
+
+    struct termios oldTerm;
+    if(tcgetattr(fin, &oldTerm) == -1)
         return "tcgetattr(STDIN_FILENO, &oldTerm) failed";
 
-    newTerm = oldTerm;
+    struct termios newTerm = oldTerm;
     newTerm.c_lflag &= (tcflag_t) ~(ICANON | ECHO);
-    if(tcsetattr(STDIN_FILENO, TCSANOW, &newTerm) == -1)
-        return "tcsetattr(STDIN_FILENO, TCSANOW, &newTerm)";
+    if(tcsetattr(fin, TCSAFLUSH, &newTerm) == -1)
+        return "tcsetattr(STDIN_FILENO, TCSAFLUSH, &newTerm)";
 
-    fputs(request, stdout);
-    fflush(stdout);
+    ffWriteFDData(fout, strlen(request), request);
 
-    //Give the terminal 35ms to respond
-    if(poll(&(struct pollfd) { .fd = STDIN_FILENO, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS) <= 0)
+    //Give the terminal some time to respond
+    if(poll(&(struct pollfd) { .fd = fin, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS) <= 0)
     {
-        tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
+        tcsetattr(fin, TCSANOW, &oldTerm);
         return "poll() timeout or failed";
     }
 
     char buffer[512];
-    ssize_t bytesRead = read(STDIN_FILENO, buffer, sizeof(buffer) - 1);
+    ssize_t bytesRead = read(fin, buffer, sizeof(buffer) - 1);
 
-    tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
+    tcsetattr(fin, TCSANOW, &oldTerm);
 
     if(bytesRead <= 0)
         return "read(STDIN_FILENO, buffer, sizeof(buffer) - 1) failed";
@@ -204,7 +216,11 @@ bool ffSuppressIO(bool suppress)
 
 void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indentation, const char* folderName, bool pretty)
 {
-    DIR* dir = opendir(folder->chars);
+    FF_AUTO_CLOSE_FD int dfd = open(folder->chars, O_RDONLY);
+    if (dfd < 0)
+        return;
+
+    DIR* dir = fdopendir(dfd);
     if(dir == NULL)
         return;
 
@@ -221,7 +237,21 @@ void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indenta
 
     while((entry = readdir(dir)) != NULL)
     {
-        if(entry->d_type == DT_DIR)
+        bool isDir = false;
+#ifdef _DIRENT_HAVE_D_TYPE
+        if(entry->d_type != DT_UNKNOWN && entry->d_type != DT_LNK)
+            isDir = entry->d_type == DT_DIR;
+        else
+#else
+        {
+            struct stat stbuf;
+            if (fstatat(dfd, entry->d_name, &stbuf, 0) < 0)
+                isDir = false;
+            else
+                isDir = S_ISDIR(stbuf.st_mode);
+        }
+#endif
+        if (isDir)
         {
             if(ffStrEquals(entry->d_name, ".") || ffStrEquals(entry->d_name, ".."))
                 continue;

src/common/io/io_windows.c

@@ -114,8 +114,40 @@ bool ffPathExpandEnv(const char* in, FFstrbuf* out)
 
 bool ffSuppressIO(bool suppress)
 {
-    (void) suppress; //Not implemented.
-    return false;
+    static bool init = false;
+    static HANDLE hOrigOut = INVALID_HANDLE_VALUE;
+    static HANDLE hOrigErr = INVALID_HANDLE_VALUE;
+    static HANDLE hNullFile = INVALID_HANDLE_VALUE;
+    static int fOrigOut = -1;
+    static int fOrigErr = -1;
+    static int fNullFile = -1;
+
+    if (!init)
+    {
+        if(!suppress)
+            return true;
+
+        hOrigOut = GetStdHandle(STD_OUTPUT_HANDLE);
+        hOrigErr = GetStdHandle(STD_ERROR_HANDLE);
+        hNullFile = CreateFileW(L"NUL", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, NULL);
+        fOrigOut = _dup(STDOUT_FILENO);
+        fOrigErr = _dup(STDERR_FILENO);
+        fNullFile = _open_osfhandle((intptr_t) hNullFile, 0);
+
+        init = true;
+    }
+    if (hNullFile == INVALID_HANDLE_VALUE || fNullFile == -1)
+        return false;
+
+    fflush(stdout);
+    fflush(stderr);
+
+    SetStdHandle(STD_OUTPUT_HANDLE, suppress ? hNullFile : hOrigOut);
+    SetStdHandle(STD_ERROR_HANDLE, suppress ? hNullFile : hOrigErr);
+    _dup2(suppress ? fNullFile : fOrigOut, STDOUT_FILENO);
+    _dup2(suppress ? fNullFile : fOrigErr, STDERR_FILENO);
+
+    return true;
 }
 
 void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indentation, const char* folderName, bool pretty)
@@ -175,24 +207,36 @@ void ffListFilesRecursively(const char* path, bool pretty)
 
 const char* ffGetTerminalResponse(const char* request, const char* format, ...)
 {
-    if (instance.config.display.pipe)
-        return "Not supported in --pipe mode";
-
     HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
-    DWORD prev_mode;
-    GetConsoleMode(hInput, &prev_mode);
+    FF_AUTO_CLOSE_FD HANDLE hConin = INVALID_HANDLE_VALUE;
+    DWORD inputMode;
+    if (!GetConsoleMode(hInput, &inputMode))
+    {
+        hConin = CreateFileW(L"CONIN$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, NULL);
+        hInput = hConin;
+    }
     SetConsoleMode(hInput, 0);
 
     FlushConsoleInputBuffer(hInput);
 
-    DWORD bytes = 0;
-    WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), request, (DWORD) strlen(request), &bytes, NULL);
+    {
+        DWORD bytes = 0;
+        HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+        FF_AUTO_CLOSE_FD HANDLE hConout = INVALID_HANDLE_VALUE;
+        DWORD outputMode;
+        if (!GetConsoleMode(hOutput, &outputMode))
+        {
+            hConout = CreateFileW(L"CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, NULL);
+            hOutput = hConout;
+        }
+        WriteFile(hOutput, request, (DWORD) strlen(request), &bytes, NULL);
+    }
 
     while (true)
     {
         if (WaitForSingleObjectEx(hInput, FF_IO_TERM_RESP_WAIT_MS, TRUE) != WAIT_OBJECT_0)
         {
-            SetConsoleMode(hInput, prev_mode);
+            SetConsoleMode(hInput, inputMode);
             return "WaitForSingleObject() failed or timeout";
         }
 
@@ -213,10 +257,10 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
     }
 
     char buffer[512];
-    bytes = 0;
+    DWORD bytes = 0;
     ReadFile(hInput, buffer, sizeof(buffer) - 1, &bytes, NULL);
 
-    SetConsoleMode(hInput, prev_mode);
+    SetConsoleMode(hInput, inputMode);
 
     if(bytes <= 0)
         return "ReadFile() failed";

src/common/jsonconfig.c

@@ -213,10 +213,7 @@ static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
             {
                 char str[32];
                 int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
-                if(instance.config.display.pipe)
-                    puts(str);
-                else
-                    printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+                printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
             }
         }
 

src/common/modules.c

@@ -21,6 +21,7 @@ static FFModuleBaseInfo* C[] = {
     (void*) &instance.config.modules.command,
     (void*) &instance.config.modules.colors,
     (void*) &instance.config.modules.cpu,
+    (void*) &instance.config.modules.cpuCache,
     (void*) &instance.config.modules.cpuUsage,
     (void*) &instance.config.modules.cursor,
     (void*) &instance.config.modules.custom,
@@ -33,6 +34,7 @@ static FFModuleBaseInfo* D[] = {
     (void*) &instance.config.modules.display,
     (void*) &instance.config.modules.disk,
     (void*) &instance.config.modules.diskIo,
+    (void*) &instance.config.modules.dns,
     NULL,
 };
 

src/common/netif/netif_bsd.c

@@ -18,6 +18,8 @@
 # define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
 #elif defined(__OpenBSD__)
 # define ROUNDUP(a)           ROUNDUP2((a), sizeof(int))
+#elif defined(__sun)
+# define ROUNDUP(a)           ROUNDUP2((a), _SS_ALIGNSIZE)
 #else
 # error unknown platform
 #endif
@@ -31,9 +33,13 @@ get_rt_address(struct rt_msghdr *rtm, int desired)
     {
         if (rtm->rtm_addrs & (1 << i))
         {
-            if ((1 <<i ) == desired)
+            if ((1 << i) == desired)
                 return sa;
+#ifdef __sun
+            sa = (struct sockaddr *)(ROUNDUP(sizeof(struct sockaddr)) + (char *)sa);
+#else
             sa = (struct sockaddr *)(ROUNDUP(sa->sa_len) + (char *)sa);
+#endif
         }
     }
     return NULL;
@@ -71,7 +77,9 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
         },
         .dst = {
             .sin_family = AF_INET,
+            #ifndef __sun
             .sin_len = sizeof(rtmsg.dst),
+            #endif
         },
     };
 

src/common/option.c

@@ -1,3 +1,4 @@
+#include "fastfetch.h"
 #include "common/option.h"
 #include "common/color.h"
 #include "util/stringUtils.h"
@@ -147,12 +148,22 @@ bool ffOptionParseBoolean(const char* str)
 
 void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
 {
+    // If value is already an ANSI escape code, use it
+    if (value[0] == '\e' && value[1] == '[')
+    {
+        ffStrbufAppendS(buffer, value + 2);
+        ffStrbufTrimRight(buffer, 'm');
+        return;
+    }
+
     ffStrbufEnsureFree(buffer, 63);
 
     while(*value != '\0')
     {
         #define FF_APPEND_COLOR_CODE_COND(prefix, code) \
             if(ffStrStartsWithIgnCase(value, #prefix)) { ffStrbufAppendS(buffer, code); value += strlen(#prefix); continue; }
+        #define FF_APPEND_COLOR_PROP_COND(prefix, prop) \
+            if(ffStrStartsWithIgnCase(value, #prefix)) { if (instance.config.display.prop.length) ffStrbufAppend(buffer, &instance.config.display.prop); else ffStrbufAppendS(buffer, FF_COLOR_FG_DEFAULT); value += strlen(#prefix); continue; }
 
         if (ffCharIsEnglishAlphabet(value[0]))
         {
@@ -182,11 +193,16 @@ void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
             else FF_APPEND_COLOR_CODE_COND(light_magenta, FF_COLOR_FG_LIGHT_MAGENTA)
             else FF_APPEND_COLOR_CODE_COND(light_cyan, FF_COLOR_FG_LIGHT_CYAN)
             else FF_APPEND_COLOR_CODE_COND(light_white, FF_COLOR_FG_LIGHT_WHITE)
+            else FF_APPEND_COLOR_PROP_COND(keys, colorKeys)
+            else FF_APPEND_COLOR_PROP_COND(title, colorTitle)
+            else FF_APPEND_COLOR_PROP_COND(output, colorOutput)
+            else FF_APPEND_COLOR_PROP_COND(separator, colorSeparator)
         }
         ffStrbufAppendC(buffer, *value);
         ++value;
 
         #undef FF_APPEND_COLOR_CODE_COND
+        #undef FF_APPEND_COLOR_PROP_COND
     }
 }
 

src/common/parsing.c

@@ -79,15 +79,15 @@ static void parseSize(FFstrbuf* result, uint64_t bytes, uint32_t base, const cha
 
 void ffParseSize(uint64_t bytes, FFstrbuf* result)
 {
-    switch (instance.config.display.binaryPrefixType)
+    switch (instance.config.display.sizeBinaryPrefix)
     {
-        case FF_BINARY_PREFIX_TYPE_IEC:
+        case FF_SIZE_BINARY_PREFIX_TYPE_IEC:
             parseSize(result, bytes, 1024, (const char*[]) {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", NULL});
             break;
-        case FF_BINARY_PREFIX_TYPE_SI:
+        case FF_SIZE_BINARY_PREFIX_TYPE_SI:
             parseSize(result, bytes, 1000, (const char*[]) {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL});
             break;
-        case FF_BINARY_PREFIX_TYPE_JEDEC:
+        case FF_SIZE_BINARY_PREFIX_TYPE_JEDEC:
             parseSize(result, bytes, 1024, (const char*[]) {"B", "KB", "MB", "GB", "TB", NULL});
             break;
         default:
@@ -96,6 +96,20 @@ void ffParseSize(uint64_t bytes, FFstrbuf* result)
     }
 }
 
+bool ffParseFrequency(uint32_t mhz, FFstrbuf* result)
+{
+    if (mhz == 0)
+        return false;
+
+    int8_t ndigits = instance.config.display.freqNdigits;
+
+    if (ndigits >= 0)
+        ffStrbufAppendF(result, "%.*f GHz", ndigits, mhz / 1000.);
+    else
+        ffStrbufAppendF(result, "%u MHz", (unsigned) mhz);
+    return true;
+}
+
 void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, const FFstrbuf* gtk4)
 {
     if(gtk2->length > 0 && gtk3->length > 0 && gtk4->length > 0)

src/common/parsing.h

@@ -26,3 +26,4 @@ void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty);
 int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2);
 
 void ffParseSize(uint64_t bytes, FFstrbuf* result);
+bool ffParseFrequency(uint32_t mhz, FFstrbuf* result);

src/common/percent.c

@@ -24,12 +24,11 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig con
     uint32_t blocksPercent = (uint32_t) (percent / 100.0 * options->barWidth + 0.5);
     assert(blocksPercent <= options->barWidth);
 
-    if(options->barBorder)
+    if(options->barBorderLeft.length)
     {
         if(!options->pipe)
-            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m[ ");
-        else
-            ffStrbufAppendS(buffer, "[ ");
+            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m");
+        ffStrbufAppend(buffer, &options->barBorderLeft);
     }
 
     if (percent != percent)
@@ -91,12 +90,11 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig con
         }
     }
 
-    if(options->barBorder)
+    if(options->barBorderRight.length)
     {
         if(!options->pipe)
-            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m ]");\
-        else
-            ffStrbufAppendS(buffer, " ]");
+            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m");
+        ffStrbufAppend(buffer, &options->barBorderRight);
     }
 
     if(!options->pipe)

src/common/printing.c

@@ -64,7 +64,7 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
     if(!instance.config.display.pipe)
     {
         fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
-        if (moduleArgs->outputColor.length)
+        if (moduleArgs && moduleArgs->outputColor.length)
             ffPrintColor(&moduleArgs->outputColor);
         else if (instance.config.display.colorOutput.length)
             ffPrintColor(&instance.config.display.colorOutput);

src/common/printing.h

@@ -5,7 +5,7 @@
 
 typedef enum FFPrintType {
     FF_PRINT_TYPE_DEFAULT = 0,
-    FF_PRINT_TYPE_NO_CUSTOM_KEY = 1 << 0,
+    FF_PRINT_TYPE_NO_CUSTOM_KEY = 1 << 0, // key has been formatted outside
     FF_PRINT_TYPE_NO_CUSTOM_KEY_COLOR = 1 << 1,
     FF_PRINT_TYPE_NO_CUSTOM_KEY_WIDTH = 1 << 2,
     FF_PRINT_TYPE_NO_CUSTOM_OUTPUT_FORMAT = 1 << 3, // reserved

src/common/processing_linux.c

@@ -18,8 +18,10 @@
     #include <sys/user.h>
     #include <sys/sysctl.h>
 #endif
-#ifdef __APPLE__
+#if defined(__APPLE__)
     #include <libproc.h>
+#elif defined(__sun)
+    #include <procfs.h>
 #endif
 
 enum { FF_PIPE_BUFSIZ = 8192 };
@@ -234,6 +236,29 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
         ffStrbufSetS(exe, arg0);
     }
 
+    #elif defined(__sun)
+
+    char filePath[PATH_MAX];
+    snprintf(filePath, sizeof(filePath), "/proc/%d/psinfo", (int) pid);
+    psinfo_t proc;
+    if (ffReadFileData(filePath, sizeof(proc), &proc) == sizeof(proc))
+    {
+        ffStrbufSetS(exe, proc.pr_psargs);
+        ffStrbufSubstrBeforeFirstC(exe, ' ');
+    }
+
+    if (exePath)
+    {
+        snprintf(filePath, sizeof(filePath), "/proc/%d/path/a.out", (int) pid);
+        ffStrbufEnsureFixedLengthFree(exePath, PATH_MAX);
+        ssize_t length = readlink(filePath, exePath->chars, exePath->allocated - 1);
+        if (length > 0) // doesn't contain trailing NUL
+        {
+            exePath->chars[length] = '\0';
+            exePath->length = (uint32_t) length;
+        }
+    }
+
     #endif
 
     if(exe->length == 0)
@@ -335,6 +360,19 @@ const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, i
             *tty = -1;
     }
 
+    #elif defined(__sun)
+    char path[128];
+    snprintf(path, sizeof(path), "/proc/%d/psinfo", (int) pid);
+    psinfo_t proc;
+    if (ffReadFileData(path, sizeof(proc), &proc) != sizeof(proc))
+        return "ffReadFileData(psinfo) failed";
+
+    ffStrbufSetS(name, proc.pr_fname);
+    if (ppid)
+        *ppid = proc.pr_ppid;
+    if (tty)
+        *tty = (int) proc.pr_ttydev;
+
     #else
 
     return "Unsupported platform";

src/common/properties.c

@@ -4,11 +4,12 @@
 #include "util/mallocHelper.h"
 
 #include <stdlib.h>
+#include <ctype.h>
 #ifdef _WIN32
     #include "util/windows/getline.h"
 #endif
 
-static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)
+bool ffParsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)
 {
     if(**line == '\0')
         return false;
@@ -32,7 +33,7 @@ static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf*
         }
 
         //Line doesn't match start, skip it
-        if(**line != *start || **line == '\0')
+        if(tolower(**line) != tolower(*start) || **line == '\0')
             return false;
 
         //Line and start match, continue testing
@@ -69,14 +70,9 @@ static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf*
     return true;
 }
 
-bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer)
-{
-    return parsePropLinePointer(&line, start, buffer);
-}
-
 bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer)
 {
-    while(!parsePropLinePointer(&lines, start, buffer))
+    while(!ffParsePropLinePointer(&lines, start, buffer))
     {
         while(*lines != '\0' && *lines != '\n')
             ++lines;

src/common/properties.h

@@ -8,12 +8,18 @@ typedef struct FFpropquery
     FFstrbuf* buffer;
 } FFpropquery;
 
-bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer);
 bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer);
 bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquery* queries);
 bool ffParsePropFileHomeValues(const char* relativeFile, uint32_t numQueries, FFpropquery* queries);
 bool ffParsePropFileListValues(const FFlist* list, const char* relativeFile, uint32_t numQueries, FFpropquery* queries);
 
+bool ffParsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer);
+
+static inline bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer)
+{
+    return ffParsePropLinePointer(&line, start, buffer);
+}
+
 static inline bool ffParsePropFile(const char* filename, const char* start, FFstrbuf* buffer)
 {
     return ffParsePropFileValues(filename, 1, (FFpropquery[]){{start, buffer}});

src/common/time.h

@@ -20,7 +20,7 @@ static inline uint64_t ffTimeGetTick() //In msec
     #else
         struct timespec timeNow;
         clock_gettime(CLOCK_MONOTONIC, &timeNow);
-        return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
+        return (uint64_t)(((uint64_t) timeNow.tv_sec * 1000u) + ((uint64_t) timeNow.tv_nsec / 1000000u));
     #endif
 }
 
@@ -33,7 +33,7 @@ static inline uint64_t ffTimeGetNow()
     #else
         struct timespec timeNow;
         clock_gettime(CLOCK_REALTIME, &timeNow);
-        return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
+        return (uint64_t)(((uint64_t) timeNow.tv_sec * 1000u) + ((uint64_t) timeNow.tv_nsec / 1000000u));
     #endif
 }
 

src/data/help.json

@@ -51,6 +51,18 @@
         {
             "long": "print-structure",
             "desc": "Print the default structure"
+        },
+        {
+            "long": "format",
+            "desc": "Set output format",
+            "arg": {
+                "type": "enum",
+                "enum": {
+                    "default": "Default format",
+                    "json": "JSON format"
+                },
+                "default": "default"
+            }
         }
     ],
     "Config": [
@@ -136,13 +148,23 @@
                     "false": "Try `wayland`, then `x11`, then `drm`"
                 }
             }
+        },
+        {
+            "long": "detect-version",
+            "desc": "Whether to detect and display the version of terminal, shell and editor",
+            "remark": "Mainly for benchmarking",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": true
+            }
         }
     ],
     "Logo": [
         {
             "short": "l",
             "long": "logo",
-            "desc": "Set the logo source",
+            "desc": "Set the logo source. Use \"none\" to disable the logo",
             "remark": "Should be the name of a builtin logo, or a path to an image file. See also https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options",
             "arg": {
                 "type": "logo"
@@ -245,12 +267,15 @@
             }
         },
         {
-            "long": "logo-separate",
-            "desc": "If true, print modules at bottom of the logo",
+            "long": "logo-position",
+            "desc": "Set the position of the logo should be displayed",
             "arg": {
-                "type": "bool",
-                "optional": true,
-                "default": false
+                "type": "enum",
+                "enum": {
+                    "left": "Left",
+                    "top": "Top",
+                    "right": "Right"
+                }
             }
         },
         {
@@ -426,7 +451,7 @@
         },
         {
             "long": "pipe",
-            "desc": "Disable logo and all escape sequences",
+            "desc": "Disable colors",
             "remark": "Auto detection based on isatty(1)",
             "arg": {
                 "type": "bool",
@@ -524,19 +549,6 @@
                 "default": false
             }
         },
-        {
-            "long": "binary-prefix",
-            "desc": "Set the binary prefix to used",
-            "arg": {
-                "type": "enum",
-                "enum": {
-                    "IEC": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ...",
-                    "SI": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ...",
-                    "JEDEC": "1024 Bytes = 1 kB, 1024 kB = 1 MB, ..."
-                },
-                "default": "IEC"
-            }
-        },
         {
             "long": "percent-type",
             "desc": "Set the percentage output type",
@@ -604,6 +616,22 @@
                 "default": "-"
             }
         },
+        {
+            "long": "bar-border-left",
+            "desc": "Set the string to use at left border of percentage bars",
+            "arg": {
+                "type": "string",
+                "default": "[ "
+            }
+        },
+        {
+            "long": "bar-border-right",
+            "desc": "Set the string to use at right border of percentage bars",
+            "arg": {
+                "type": "string",
+                "default": " ]"
+            }
+        },
         {
             "long": "bar-width",
             "desc": "Set the width of percentage bars, in number of characters",
@@ -612,15 +640,6 @@
                 "default": 10
             }
         },
-        {
-            "long": "bar-border",
-            "desc": "Whether to show a border around percentage bars",
-            "arg": {
-                "type": "bool",
-                "optional": true,
-                "default": true
-            }
-        },
         {
             "long": "no-buffer",
             "desc": "Set if the stdout application buffer should be disabled",
@@ -637,6 +656,19 @@
                 "type": "num"
             }
         },
+        {
+            "long": "size-binary-prefix",
+            "desc": "Set the binary prefix to used when formatting sizes",
+            "arg": {
+                "type": "enum",
+                "enum": {
+                    "IEC": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ...",
+                    "SI": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ...",
+                    "JEDEC": "1024 Bytes = 1 kB, 1024 kB = 1 MB, ..."
+                },
+                "default": "IEC"
+            }
+        },
         {
             "long": "size-max-prefix",
             "desc": "Set the largest binary prefix to use when formatting sizes",
@@ -656,6 +688,14 @@
                 "default": "YB"
             }
         },
+        {
+            "long": "freq-ndigits",
+            "desc": "Set the number of digits to keep after the decimal point when printing CPU / GPU frequency in GHz",
+            "arg": {
+                "type": "num",
+                "default": 2
+            }
+        },
         {
             "long": "temp-unit",
             "desc": "Set the unit of the temperature",
@@ -703,26 +743,9 @@
                 "type": "color",
                 "default": "light_red"
             }
-        },
-        {
-            "long": "ts-version",
-            "desc": "Whether to detect and display the version of terminal and shell",
-            "remark": "Mainly for benchmarking",
-            "arg": {
-                "type": "bool",
-                "optional": true,
-                "default": true
-            }
         }
     ],
     "Library path": [
-        {
-            "long": "lib-pci",
-            "desc": "Pciutils. Used for GPU output",
-            "arg": {
-                "type": "path"
-            }
-        },
         {
             "long": "lib-vulkan",
             "desc": "Vulkan module & fallback for GPU output",
@@ -932,7 +955,7 @@
         },
         {
             "long": "separator-string",
-            "desc": "Set the string printed by the separator module",
+            "desc": "Set the string to be printed by the separator line",
             "arg": {
                 "type": "str",
                 "default": "-"
@@ -940,12 +963,21 @@
         },
         {
             "long": "separator-output-color",
-            "desc": "Set the color of the separator module",
+            "desc": "Set the color of the separator line",
             "arg": {
                 "type": "color",
                 "default": "default"
             }
         },
+        {
+            "long": "separator-length",
+            "desc": "Set the length of the separator line",
+            "remark": "Set to 0 to automatically calculate it with the title length",
+            "arg": {
+                "type": "num",
+                "default": "0"
+            }
+        },
         {
             "long": "disk-folders",
             "desc": "A colon (semicolon on Windows) separated list of folder paths to be detected",
@@ -1154,16 +1186,17 @@
             }
         },
         {
-            "long": "cpu-freq-ndigits",
-            "desc": "Set the number of digits to keep after the decimal point when printing CPU frequency",
+            "long": "cpu-show-pe-core-count",
+            "desc": "Detect and display CPU frequency of different core types (eg. Pcore and Ecore) if supported",
             "arg": {
-                "type": "num",
-                "default": 2
+                "type": "bool",
+                "optional": true,
+                "default": false
             }
         },
         {
-            "long": "cpu-show-pe-core-count",
-            "desc": "Detect and display CPU frequency of different core types (eg. Pcore and Ecore) if supported",
+            "long": "cpucache-compact",
+            "desc": "Show all CPU caches in one line",
             "arg": {
                 "type": "bool",
                 "optional": true,
@@ -1223,7 +1256,8 @@
                 "enum": {
                     "auto": "Query platform specific graphic APIs. Requires proper GPU drivers installed. Not supported on FreeBSD",
                     "pci": "Search PCI devices, which do not requires GPU driver installed. Not supported on Windows and macOS",
-                    "vulkan": "Use Vulkan API. Slow and requires vulkan driver installed. Used for Android",
+                    "vulkan": "Use Vulkan API. Slow and requires proper vulkan driver installed. Used for Android",
+                    "opencl": "Use OpenCL API. Slow and requires proper OpenCL driver installed",
                     "opengl": "Use OpenGL API. Slow and only detects one GPU"
                 },
                 "default": "auto"
@@ -1259,6 +1293,15 @@
                 "default": 2
             }
         },
+        {
+            "long": "loadavg-compact",
+            "desc": "Show load average values in one line",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": true
+            }
+        },
         {
             "long": "localip-show-ipv4",
             "desc": "Show IPv4 addresses in local ip module",
@@ -1339,6 +1382,19 @@
                 "default": false
             }
         },
+        {
+            "long": "dns-show-type",
+            "desc": "Specify the type of DNS servers should be detected",
+            "arg": {
+                "type": "enum",
+                "enum": {
+                    "ipv4": "Show IPv4 addresses only",
+                    "ipv6": "Show IPv6 addresses only",
+                    "both": "Show both IPv4 and IPv6 addresses"
+                },
+                "default": "both"
+            }
+        },
         {
             "long": "netio-name-prefix",
             "desc": "Show interfaces with given name prefix only",
@@ -1422,6 +1478,24 @@
                 "default": false
             }
         },
+        {
+            "long": "users-compact",
+            "desc": "Show all active users in one line",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": false
+            }
+        },
+        {
+            "long": "users-myself-only",
+            "desc": "Show only current user",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": false
+            }
+        },
         {
             "long": "player-name",
             "desc": "The name of the player to use for module Media and Player",
@@ -1473,13 +1547,14 @@
                 "type": "enum",
                 "enum": {
                     "block": "\u2588\u2588\u2588",
+                    "background": "(whitespaces with background)",
                     "circle": "\u25cf",
                     "diamond": "\u25c6",
                     "triangle": "\u25b2",
                     "square": "\u25a0",
                     "star": "\u2605"
                 },
-                "default": "block"
+                "default": "background"
             }
         },
         {

src/data/help_color.txt

@@ -1,10 +1,24 @@
 Usage: fastfetch --color <color>
 
+Shortcut of `fastfetch --color-keys <color> --color-title <color>`.
+If no color is set, the main color of the logo will be used.
+
+Following information applies to all settings
+
 <color> must be a color encoding as ANSI escape sequences. It is inserted between "ESC[" and "m".
 Infos about them can be found here: https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters.
 Examples:
-   --color 35:      sets the color to magenta. `--color magenta` is also supported
-   --color 38;5;38: sets the color to 38th color of ANSI 256 colors
-   --color 4;92:    sets the color to bright Green with underline. `--color underline_green` is also supported
-   --color 5;104:   blinking text on a blue background
-If no color is set, the main color of the logo will be used.
+   35:              sets the color to magenta
+   38;5;38:         sets the color to 38th color of ANSI 256 colors
+   4;92:            sets the color to bright green with underline
+   5;104:           blinking text on a blue background
+
+ANSI named colors are also supported:
+   magenta:         equivalent to `35`
+   underline_bright_green: equivalent to `4;92`
+
+After v2.15.0, some special keys can be used:
+   keys:            use the color set by `--color-keys`
+   title:           use the color set by `--color-title`
+   output:          use the color set by `--color-output`
+   separator:       use the color set by `--color-separator`

src/data/help_format.txt

@@ -8,6 +8,11 @@ In 2.14.0 or newer, the value indices can be meaningful named tags.
 For example: "--title-format '{user-name-colored}{at-symbol-colored}{host-name-colored}'" is equivalent to "--title-format '{6}{7}{8}'"
 See "fastfetch -h title-format" for all supported tags.
 
+In 2.17.0 or newer, a truncation length can be specified using syntax '<arg>:<trunc-length>`
+For example: "--title-format '{user-name:5}'" will truncate user name into 5-length string.
+If '<trunc-length>' is negative, an ellipsis … will be appended at the end when the original string is truncated.
+Note: The string length is counted in raw bytes. Multi-byte unicode characters and ANSI escape codes are not taken into account.
+
 If the value index is missing, meaning the placeholder is "{}", an internal counter sets the value index.
 This means that the format string "Values: {1} ({2})" is equivalent to "Values: {} ({})".
 Note that this counter only counts empty placeholders, so the format string "{2} {} {}" will contain the second value, then the first, and then the second again.

src/detection/battery/battery_linux.c

@@ -33,7 +33,7 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
 
     //capacity must exist and be not empty
     ffStrbufAppendS(dir, "/capacity");
-    bool available = ffReadFileBuffer(dir->chars, &tmpBuffer);
+    bool available = ffReadFileBuffer(dir->chars, &tmpBuffer); // This is expensive in my laptop
     ffStrbufSubstrBefore(dir, dirLength);
 
     if (!available)

src/detection/battery/battery_windows.c

@@ -172,7 +172,7 @@ typedef struct FFSmbiosPortableBattery
 static_assert(offsetof(FFSmbiosPortableBattery, OEMSpecific) == 0x16,
     "FFSmbiosPortableBattery: Wrong struct alignment");
 
-const char* detectBySmbios(FFBatteryResult* battery)
+static const char* detectBySmbios(FFBatteryResult* battery)
 {
     const FFSmbiosHeaderTable* smbiosTable = ffGetSmbiosHeaderTable();
     if (!smbiosTable)

src/detection/bios/bios_nosupport.c

@@ -0,0 +1,6 @@
+#include "bios.h"
+
+const char* ffDetectBios(FFBiosResult* bios)
+{
+    return "Not supported on this platform";
+}

src/detection/bios/bios_windows.c

@@ -1,5 +1,7 @@
 #include "bios.h"
 #include "util/smbiosHelper.h"
+
+#ifdef _WIN32
 #include "util/windows/registry.h"
 
 #include <ntstatus.h>
@@ -25,7 +27,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION
         };
     };
 } SYSTEM_BOOT_ENVIRONMENT_INFORMATION;
-
+#endif
 
 typedef struct FFSmbiosBios
 {
@@ -74,6 +76,7 @@ const char* ffDetectBios(FFBiosResult* bios)
     if (data->Header.Length > offsetof(FFSmbiosBios, SystemBiosMajorRelease))
         ffStrbufSetF(&bios->release, "%u.%u", data->SystemBiosMajorRelease, data->SystemBiosMinorRelease);
 
+    #ifdef _WIN32
     // Same as GetFirmwareType, but support (?) Windows 7
     // https://ntdoc.m417z.com/system_information_class
     SYSTEM_BOOT_ENVIRONMENT_INFORMATION sbei;
@@ -86,6 +89,7 @@ const char* ffDetectBios(FFBiosResult* bios)
             default: break;
         }
     }
+    #endif
 
     return NULL;
 }

src/detection/brightness/brightness_linux.c

@@ -29,7 +29,7 @@ static const char* detectWithBacklight(FFlist* result)
             continue;
 
         ffStrbufAppendS(&backlightDir, entry->d_name);
-        ffStrbufAppendS(&backlightDir, "/actual_brightness");
+        ffStrbufAppendS(&backlightDir, "/brightness");
         if(ffReadFileBuffer(backlightDir.chars, &buffer))
         {
             double actualBrightness = ffStrbufToDouble(&buffer);

src/detection/camera/camera_nosupport.c

@@ -0,0 +1,6 @@
+#include "camera.h"
+
+const char* ffDetectCamera(FF_MAYBE_UNUSED FFlist* result)
+{
+    return "Not support on this platform";
+}

src/detection/cpu/cpu.h

@@ -19,10 +19,9 @@ typedef struct FFCPUResult
     uint16_t coresLogical;
     uint16_t coresOnline;
 
-    double frequencyBase; // GHz
-    double frequencyMax; // GHz
-    double frequencyMin; // GHz
-    double frequencyBiosLimit; // GHz
+    uint32_t frequencyBase; // GHz
+    uint32_t frequencyMax; // GHz
+    uint32_t frequencyBiosLimit; // GHz
 
     FFCPUCore coreTypes[16]; // number of P cores, E cores, etc.
 

src/detection/cpu/cpu_apple.c

@@ -43,38 +43,37 @@ static const char* detectFrequency(FFCPUResult* cpu)
     if (!IOObjectConformsTo(entryDevice, "AppleARMIODevice"))
         return "\"pmgr\" should conform to \"AppleARMIODevice\"";
 
-    FF_CFTYPE_AUTO_RELEASE CFMutableDictionaryRef properties = NULL;
-    if (IORegistryEntryCreateCFProperties(entryDevice, &properties, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess)
-        return "IORegistryEntryCreateCFProperties() failed";
-
-    uint32_t pMin, eMin, aMax, pCoreLength;
-    if (ffCfDictGetData(properties, CFSTR("voltage-states5-sram"), 0, 4, (uint8_t*) &pMin, &pCoreLength) != NULL) // pCore
+    FF_CFTYPE_AUTO_RELEASE CFDataRef freqProperty = (CFDataRef) IORegistryEntryCreateCFProperty(entryDevice, CFSTR("voltage-states5-sram"), kCFAllocatorDefault, kNilOptions);
+    if (CFGetTypeID(freqProperty) != CFDataGetTypeID())
         return "\"voltage-states5-sram\" in \"pmgr\" is not found";
-    if (ffCfDictGetData(properties, CFSTR("voltage-states1-sram"), 0, 4, (uint8_t*) &eMin, NULL) != NULL) // eCore
-        return "\"voltage-states1-sram\" in \"pmgr\" is not found";
 
-    cpu->frequencyMin = (pMin < eMin ? pMin : eMin) / (1000.0 * 1000 * 1000);
+    // voltage-states5-sram stores supported <frequency / voltage> pairs of pcores from the lowest to the highest
+    // voltage-states1-sram stores ecores'
+    CFIndex propLength = CFDataGetLength(freqProperty);
+    if (propLength == 0 || propLength % (CFIndex) sizeof(uint32_t) * 2 != 0)
+        return "Invalid \"voltage-states5-sram\" length";
 
-    if (pCoreLength >= 8)
-    {
-        ffCfDictGetData(properties, CFSTR("voltage-states5-sram"), pCoreLength - 8, 4, (uint8_t*) &aMax, NULL);
-        cpu->frequencyMax = aMax / (1000.0 * 1000 * 1000);
-    }
+    uint32_t* pStart = (uint32_t*) CFDataGetBytePtr(freqProperty);
+    uint32_t pMax = *pStart;
+    for (CFIndex i = 2; i < propLength / (CFIndex) sizeof(uint32_t) && pStart[i] > 0; i += 2 /* skip voltage */)
+        pMax = pMax > pStart[i] ? pMax : pStart[i];
+
+    if (pMax > 0)
+        cpu->frequencyMax = pMax / 1000 / 1000;
 
     return NULL;
 }
 #else
 static const char* detectFrequency(FFCPUResult* cpu)
 {
-    cpu->frequencyBase = ffSysctlGetInt64("hw.cpufrequency", 0) / 1000.0 / 1000.0 / 1000.0;
-    cpu->frequencyMin = ffSysctlGetInt64("hw.cpufrequency_min", 0) / 1000.0 / 1000.0 / 1000.0;
-    cpu->frequencyMax = ffSysctlGetInt64("hw.cpufrequency_max", 0) / 1000.0 / 1000.0 / 1000.0;
-    if(cpu->frequencyBase != cpu->frequencyBase)
+    cpu->frequencyBase = (uint32_t) (ffSysctlGetInt64("hw.cpufrequency", 0) / 1000 / 1000);
+    cpu->frequencyMax = (uint32_t) (ffSysctlGetInt64("hw.cpufrequency_max", 0) / 1000 / 1000);
+    if(cpu->frequencyBase == 0)
     {
         unsigned current = 0;
         size_t size = sizeof(current);
         if (sysctl((int[]){ CTL_HW, HW_CPU_FREQ }, 2, &current, &size, NULL, 0) == 0)
-            cpu->frequencyBase = (double) current / 1000.0 / 1000.0 / 1000.0;
+            cpu->frequencyBase = (uint32_t) (current / 1000 / 1000);
     }
     return NULL;
 }

src/detection/cpu/cpu_bsd.c

@@ -44,16 +44,13 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
         ffStrbufClear(&buffer);
         char key[32];
         snprintf(key, sizeof(key), "dev.cpu.%u.freq_levels", i);
-        if (ffSysctlGetString(key, &buffer) == NULL && buffer.length > 0)
+        if (ffSysctlGetString(key, &buffer) == NULL)
         {
+            if (buffer.length == 0) continue;
+
             // MHz/Watts pairs like: 2501/32000 2187/27125 2000/24000
             uint32_t fmax = (uint32_t) strtoul(buffer.chars, NULL, 10);
-            uint32_t fmin = fmax;
-            uint32_t i = ffStrbufLastIndexC(&buffer, ' ');
-            if (i < buffer.length)
-                fmin = (uint32_t) strtoul(buffer.chars + i + 1, NULL, 10);
-            if (!(cpu->frequencyMin <= fmin)) cpu->frequencyMin = fmin; // Counting for NaN
-            if (!(cpu->frequencyMax >= fmax)) cpu->frequencyMax = fmax;
+            if (cpu->frequencyMax < fmax) cpu->frequencyMax = fmax;
 
             if (options->showPeCoreCount)
             {
@@ -65,12 +62,11 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
                 cpu->coreTypes[ifreq].count++;
             }
         }
+        else
+            break;
     }
-    cpu->frequencyMin /= 1000;
-    cpu->frequencyMax /= 1000;
 
-    int clockRate = ffSysctlGetInt("hw.clockrate", 0);
-    cpu->frequencyBase = clockRate <= 0 ? 0.0/0.0 : clockRate / 1000.0;
+    cpu->frequencyBase = (uint32_t) ffSysctlGetInt("hw.clockrate", 0);
     cpu->temperature = FF_CPU_TEMP_UNSET;
 
     if (options->temp)

src/detection/cpu/cpu_linux.c

@@ -94,7 +94,7 @@ static uint32_t getFrequency(FFstrbuf* basePath, const char* cpuinfoFileName, co
     bool ok = ffReadFileBuffer(basePath->chars, buffer);
     ffStrbufSubstrBefore(basePath, baseLen);
     if (ok)
-        return (uint32_t) ffStrbufToUInt(buffer, 0);
+        return (uint32_t) (ffStrbufToUInt(buffer, 0) / 1000);
 
     if (scalingFileName)
     {
@@ -102,7 +102,7 @@ static uint32_t getFrequency(FFstrbuf* basePath, const char* cpuinfoFileName, co
         ok = ffReadFileBuffer(basePath->chars, buffer);
         ffStrbufSubstrBefore(basePath, baseLen);
         if (ok)
-            return (uint32_t) ffStrbufToUInt(buffer, 0);
+            return (uint32_t) (ffStrbufToUInt(buffer, 0) / 1000);
     }
 
     return 0;
@@ -115,13 +115,13 @@ static uint8_t getNumCores(FFstrbuf* basePath, FFstrbuf* buffer)
     bool ok = ffReadFileBuffer(basePath->chars, buffer);
     ffStrbufSubstrBefore(basePath, baseLen);
     if (ok)
-        return (uint8_t) ffStrbufCountC(buffer, ' ') + 1;
+        return (uint8_t) (ffStrbufCountC(buffer, ' ') + 1);
 
     ffStrbufAppendS(basePath, "/related_cpus");
     ok = ffReadFileBuffer(basePath->chars, buffer);
     ffStrbufSubstrBefore(basePath, baseLen);
     if (ok)
-        return (uint8_t) ffStrbufCountC(buffer, ' ') + 1;
+        return (uint8_t) (ffStrbufCountC(buffer, ' ') + 1);
 
     return 0;
 }
@@ -143,36 +143,15 @@ static bool detectFrequency(FFCPUResult* cpu, const FFCPUOptions* options)
             ffStrbufAppendS(&path, entry->d_name);
             uint32_t fbase = getFrequency(&path, "/base_frequency", NULL, &buffer);
             if (fbase > 0)
-            {
-                if (cpu->frequencyBase == cpu->frequencyBase)
-                    cpu->frequencyBase = cpu->frequencyBase > fbase ? cpu->frequencyBase : fbase;
-                else
-                    cpu->frequencyBase = fbase;
-            }
+                cpu->frequencyBase = cpu->frequencyBase > fbase ? cpu->frequencyBase : fbase;
+
             uint32_t fbioslimit = getFrequency(&path, "/bios_limit", NULL, &buffer);
             if (fbioslimit > 0)
-            {
-                if (cpu->frequencyBiosLimit == cpu->frequencyBiosLimit)
-                    cpu->frequencyBiosLimit = cpu->frequencyBiosLimit > fbioslimit ? cpu->frequencyBiosLimit : fbioslimit;
-                else
-                    cpu->frequencyBiosLimit = fbioslimit;
-            }
+                cpu->frequencyBiosLimit = cpu->frequencyBiosLimit > fbioslimit ? cpu->frequencyBiosLimit : fbioslimit;
+
             uint32_t fmax = getFrequency(&path, "/cpuinfo_max_freq", "/scaling_max_freq", &buffer);
             if (fmax > 0)
-            {
-                if (cpu->frequencyMax == cpu->frequencyMax)
-                    cpu->frequencyMax = cpu->frequencyMax > fmax ? cpu->frequencyMax : fmax;
-                else
-                    cpu->frequencyMax = fmax;
-            }
-            uint32_t fmin = getFrequency(&path, "/cpuinfo_min_freq", "/scaling_min_freq", &buffer);
-            if (fmin > 0)
-            {
-                if (cpu->frequencyMin == cpu->frequencyMin)
-                    cpu->frequencyMin = cpu->frequencyMin < fmin ? cpu->frequencyMin : fmin;
-                else
-                    cpu->frequencyMin = fmin;
-            }
+                cpu->frequencyMax = cpu->frequencyMax > fmax ? cpu->frequencyMax : fmax;
 
             if (options->showPeCoreCount)
             {
@@ -187,10 +166,6 @@ static bool detectFrequency(FFCPUResult* cpu, const FFCPUOptions* options)
             ffStrbufSubstrBefore(&path, baseLen);
         }
     }
-    cpu->frequencyBase /= 1e6;
-    cpu->frequencyMax /= 1e6;
-    cpu->frequencyMin /= 1e6;
-    cpu->frequencyBiosLimit /= 1e6;
     return true;
 }
 
@@ -272,8 +247,8 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     cpu->coresOnline = (uint16_t) get_nprocs();
     cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, cpu->coresLogical);
 
-    if (!detectFrequency(cpu, options) || cpu->frequencyBase != cpu->frequencyBase)
-        cpu->frequencyBase = ffStrbufToDouble(&cpuMHz) / 1000;
+    if (!detectFrequency(cpu, options) || cpu->frequencyBase == 0)
+        cpu->frequencyBase = (uint32_t) ffStrbufToUInt(&cpuMHz, 0);
 
     if(cpuUarch.length > 0)
     {

src/detection/cpu/cpu_nosupport.c

@@ -0,0 +1,6 @@
+#include "cpu.h"
+
+const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
+{
+    return "Not supported on this platform";
+}

src/detection/cpu/cpu_sunos.c

@@ -0,0 +1,45 @@
+#include "cpu.h"
+#include <kstat.h>
+
+static inline void kstatFreeWrap(kstat_ctl_t** pkc)
+{
+    assert(pkc);
+    if (*pkc)
+        kstat_close(*pkc);
+}
+
+const char* ffDetectCPUImpl(FF_MAYBE_UNUSED const FFCPUOptions* options, FFCPUResult* cpu)
+{
+    __attribute__((__cleanup__(kstatFreeWrap))) kstat_ctl_t* kc = kstat_open();
+    if (!kc)
+        return "kstat_open() failed";
+
+    kstat_t* ks = kstat_lookup(kc, "cpu_info", -1, NULL);
+    if (!ks)
+        return "kstat_lookup() failed";
+
+    if (kstat_read(kc, ks, NULL) < 0)
+        return "kstat_read() failed";
+
+    {
+        kstat_named_t* kn = kstat_data_lookup(ks, "brand");
+        ffStrbufSetNS(&cpu->name, KSTAT_NAMED_STR_BUFLEN(kn) - 1, KSTAT_NAMED_STR_PTR(kn));
+    }
+    {
+        kstat_named_t* kn = kstat_data_lookup(ks, "vendor_id");
+        ffStrbufSetNS(&cpu->vendor, KSTAT_NAMED_STR_BUFLEN(kn) - 1, KSTAT_NAMED_STR_PTR(kn));
+    }
+    {
+        kstat_named_t* kn = kstat_data_lookup(ks, "clock_MHz");
+        cpu->frequencyBase = kn->value.ui32;
+    }
+
+    ks = kstat_lookup(kc, "unix", -1, "system_misc");
+    if (ks && kstat_read(kc, ks, NULL) >= 0)
+    {
+        kstat_named_t* kn = kstat_data_lookup(ks, "ncpus");
+        cpu->coresLogical = cpu->coresPhysical = cpu->coresOnline = (uint16_t) kn->value.ui32;
+    }
+
+    return NULL;
+}

src/detection/cpu/cpu_windows.c

@@ -65,8 +65,8 @@ inline static const char* detectSpeedByCpuid(FFCPUResult* cpu)
         return "Unsupported instruction";
 
     // cpuid returns 0 MHz when hyper-v is enabled
-    if (base) cpu->frequencyBase = base / 1000.0;
-    if (max) cpu->frequencyMax = max / 1000.0;
+    if (base) cpu->frequencyBase = base;
+    if (max) cpu->frequencyMax = max;
     return NULL;
 }
 
@@ -97,7 +97,7 @@ static const char* detectMaxSpeedBySmbios(FFCPUResult* cpu)
             return "No active CPU is found in SMBIOS data";
     }
 
-    double speed = data->MaxSpeed / 1000.0;
+    uint32_t speed = data->MaxSpeed;
     // Sometimes SMBIOS reports invalid value. We assume that max speed is small than 2x of base
     if (speed < cpu->frequencyBase || speed > cpu->frequencyBase * 2)
         return "Possible invalid CPU max speed in SMBIOS data. See #800";
@@ -126,9 +126,9 @@ static const char* detectNCores(FFCPUResult* cpu)
         ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
     )
     {
-        if(ptr->Relationship == RelationProcessorCore)
+        if (ptr->Relationship == RelationProcessorCore)
             ++cpu->coresPhysical;
-        else if(ptr->Relationship == RelationGroup)
+        else if (ptr->Relationship == RelationGroup)
         {
             for (uint32_t index = 0; index < ptr->Group.ActiveGroupCount; ++index)
             {
@@ -159,7 +159,7 @@ static const char* detectByRegistry(FFCPUResult* cpu)
 
     uint32_t mhz;
     if(ffRegReadUint(hKey, L"~MHz", &mhz, NULL))
-        cpu->frequencyBase = mhz / 1000.0;
+        cpu->frequencyBase = mhz;
 
     return NULL;
 }
@@ -180,8 +180,8 @@ static const char* detectCoreTypes(FFCPUResult* cpu)
         ++cpu->coreTypes[ifreq].count;
     }
 
-    if (cpu->frequencyBase != cpu->frequencyBase)
-        cpu->frequencyBase = pinfo->MaxMhz / 1000.0;
+    if (cpu->frequencyBase == 0)
+        cpu->frequencyBase = pinfo->MaxMhz;
     return NULL;
 }
 
@@ -196,7 +196,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     detectSpeedByCpuid(cpu);
     if (options->showPeCoreCount) detectCoreTypes(cpu);
 
-    if (cpu->frequencyMax != cpu->frequencyMax)
+    if (cpu->frequencyMax == 0)
         detectMaxSpeedBySmbios(cpu);
 
     if(options->temp)

src/detection/cpucache/cpucache.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include "fastfetch.h"
+
+typedef enum FFCPUCacheType
+{
+    FF_CPU_CACHE_TYPE_UNIFIED = 0,
+    FF_CPU_CACHE_TYPE_INSTRUCTION = 1,
+    FF_CPU_CACHE_TYPE_DATA = 2,
+    FF_CPU_CACHE_TYPE_TRACE = 3,
+} FFCPUCacheType;
+
+typedef struct FFCPUCache
+{
+    uint32_t size;
+    uint32_t num;
+    uint32_t lineSize;
+    FFCPUCacheType type;
+} FFCPUCache;
+
+typedef struct FFCPUCacheResult
+{
+    FFlist caches[4]; // L1, L2, L3, L4(?)
+} FFCPUCacheResult;
+
+const char* ffDetectCPUCache(FFCPUCacheResult* result);
+
+static inline FFCPUCache* ffCPUCacheAddItem(FFCPUCacheResult* result, uint32_t level, uint32_t size, uint32_t lineSize, FFCPUCacheType type)
+{
+    FFlist* cacheLevel = &result->caches[level - 1];
+
+    FF_LIST_FOR_EACH(FFCPUCache, item, *cacheLevel)
+    {
+        if (item->type == type && item->size == size && item->lineSize == lineSize)
+        {
+            item->num++;
+            return item;
+        }
+    }
+
+    FFCPUCache* item = (FFCPUCache*)ffListAdd(cacheLevel);
+    *item = (FFCPUCache) {
+        .size = size,
+        .num = 1,
+        .lineSize = lineSize,
+        .type = type,
+    };
+    return item;
+}

src/detection/cpucache/cpucache_apple.c

@@ -0,0 +1,58 @@
+#include "cpucache.h"
+#include "common/sysctl.h"
+
+const char* ffDetectCPUCache(FFCPUCacheResult* result)
+{
+    // https://developer.apple.com/documentation/kernel/1387446-sysctlbyname/determining_system_capabilities#3901385
+    uint32_t nPerfLevels = (uint32_t) ffSysctlGetInt("hw.nperflevels", 0);
+    if (nPerfLevels <= 0) return "sysctl(hw.nperflevels) failed";
+
+    // macOS provides the global system cache line size
+    uint32_t lineSize = (uint32_t) ffSysctlGetInt("hw.cachelinesize", 0);
+
+    char sysctlKey[256] = "hw.perflevelN.";
+    char* pNum = sysctlKey + strlen("hw.perflevel");
+    char* pSubkey = sysctlKey + strlen("hw.perflevelN.");
+    const size_t lenLeft = sizeof(sysctlKey) - strlen("hw.perflevelN.");
+
+    for (uint32_t i = 0; i < nPerfLevels; ++i)
+    {
+        *pNum = (char) ('0' + i);
+
+        strncpy(pSubkey, "physicalcpu", lenLeft);
+        uint32_t ncpu = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
+        if (ncpu <= 0) continue;
+
+        strncpy(pSubkey, "l1icachesize", lenLeft);
+        uint32_t size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
+        if (size)
+            ffCPUCacheAddItem(result, 1, size, lineSize, FF_CPU_CACHE_TYPE_INSTRUCTION)->num = ncpu;
+
+        strncpy(pSubkey, "l1dcachesize", lenLeft);
+        size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
+        if (size)
+            ffCPUCacheAddItem(result, 1, size, lineSize, FF_CPU_CACHE_TYPE_DATA)->num = ncpu;
+
+        strncpy(pSubkey, "l2cachesize", lenLeft);
+        size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
+        if (size)
+        {
+            strncpy(pSubkey, "cpusperl2", lenLeft);
+            uint32_t cpuSper = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
+            if (cpuSper)
+                ffCPUCacheAddItem(result, 2, size, lineSize, FF_CPU_CACHE_TYPE_UNIFIED)->num = ncpu / cpuSper;
+        }
+
+        strncpy(pSubkey, "l3cachesize", lenLeft);
+        size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
+        if (size)
+        {
+            strncpy(pSubkey, "cpusperl3", lenLeft);
+            uint32_t cpuSper = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
+            if (cpuSper)
+                ffCPUCacheAddItem(result, 3, size, lineSize, FF_CPU_CACHE_TYPE_UNIFIED)->num = ncpu / cpuSper;
+        }
+    }
+
+    return NULL;
+}

src/detection/cpucache/cpucache_linux.c

@@ -0,0 +1,106 @@
+#include "cpucache.h"
+#include "common/io/io.h"
+#include "util/stringUtils.h"
+
+static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added)
+{
+    uint32_t baseLen = path->length;
+    ffStrbufAppendS(path, "/level");
+    if (!ffReadFileBuffer(path->chars, buffer))
+        return "ffReadFileBuffer(\"/sys/devices/system/cpu/cpuX/cache/indexX/level\") == NULL";
+
+    uint32_t level = (uint32_t) ffStrbufToUInt(buffer, 0);
+    if (level < 1 || level > 4) return "level < 1 || level > 4";
+
+    ffStrbufSubstrBefore(path, baseLen);
+    ffStrbufAppendS(path, "/size");
+    if (!ffReadFileBuffer(path->chars, buffer))
+        return "ffReadFileBuffer(\"/sys/devices/system/cpu/cpuX/cache/indexX/size\") == NULL";
+
+    uint32_t sizeKb = (uint32_t) ffStrbufToUInt(buffer, 0);
+    if (sizeKb == 0) return "size == 0";
+
+    ffStrbufSubstrBefore(path, baseLen);
+    ffStrbufAppendS(path, "/type");
+    if (!ffReadFileBuffer(path->chars, buffer))
+        return "ffReadFileBuffer(\"/sys/devices/system/cpu/cpuX/cache/indexX/type\") == NULL";
+    ffStrbufTrimRightSpace(buffer);
+
+    FFCPUCacheType cacheType = 0;
+    switch (buffer->chars[0])
+    {
+        case 'I': cacheType = FF_CPU_CACHE_TYPE_INSTRUCTION; break;
+        case 'D': cacheType = FF_CPU_CACHE_TYPE_DATA; break;
+        case 'U': cacheType = FF_CPU_CACHE_TYPE_UNIFIED; break;
+        case 'T': cacheType = FF_CPU_CACHE_TYPE_TRACE; break;
+        default: return "unknown cache type";
+    }
+
+    uint32_t lineSize = 0;
+    ffStrbufSubstrBefore(path, baseLen);
+    ffStrbufAppendS(path, "/coherency_line_size");
+    if (ffReadFileBuffer(path->chars, buffer))
+        lineSize = (uint32_t) ffStrbufToUInt(buffer, 0);
+
+    ffStrbufSubstrBefore(path, baseLen);
+    ffStrbufAppendS(path, "/shared_cpu_list");
+    if (!ffReadFileBuffer(path->chars, buffer))
+        return "ffReadFileBuffer(\"/sys/devices/system/cpu/cpuX/cache/indexX/shared_cpu_list\") == NULL";
+    ffStrbufTrimRightSpace(buffer);
+
+    // deduplicate shared caches
+    ffStrbufAppendF(buffer, "_%u_%u_%u_%u\n", level, sizeKb, lineSize, cacheType);
+    if (ffStrbufContain(added, buffer)) return NULL;
+    ffStrbufAppend(added, buffer);
+    ffCPUCacheAddItem(result, level, sizeKb * 1024, lineSize, cacheType);
+    return NULL;
+}
+
+static const char* parseCpuCache(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added)
+{
+    ffStrbufAppendS(path, "/cache/");
+    uint32_t baseLen = path->length;
+    FF_AUTO_CLOSE_DIR DIR* pathCacheDir = opendir(path->chars);
+    if (!pathCacheDir)
+        return "opendir(\"/sys/devices/system/cpu/cpuX/cache/\") == NULL";
+
+    struct dirent* pathCacheEntry;
+    while ((pathCacheEntry = readdir(pathCacheDir)) != NULL)
+    {
+        if (!ffStrStartsWith(pathCacheEntry->d_name, "index")
+            || !ffCharIsDigit(pathCacheEntry->d_name[strlen("index")])) continue;
+
+        ffStrbufAppendS(path, pathCacheEntry->d_name);
+        const char* error = parseCpuCacheIndex(path, result, buffer, added);
+        if (error) return error;
+        ffStrbufSubstrBefore(path, baseLen);
+    }
+
+    return NULL;
+}
+
+const char* ffDetectCPUCache(FFCPUCacheResult* result)
+{
+    // https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-devices-system-cpu
+    FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateS("/sys/devices/system/cpu/");
+    uint32_t baseLen = path.length;
+    FF_AUTO_CLOSE_DIR DIR* pathCpuDir = opendir(path.chars);
+    if (!pathCpuDir)
+        return "opendir(\"/sys/devices/system/cpu/\") == NULL";
+
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+    FF_STRBUF_AUTO_DESTROY added = ffStrbufCreate();
+
+    struct dirent* pathCpuEntry;
+    while ((pathCpuEntry = readdir(pathCpuDir)) != NULL)
+    {
+        if (!ffStrStartsWith(pathCpuEntry->d_name, "cpu") ||
+            !ffCharIsDigit(pathCpuEntry->d_name[strlen("cpu")])) continue;
+
+        ffStrbufAppendS(&path, pathCpuEntry->d_name);
+        const char* error = parseCpuCache(&path, result, &buffer, &added);
+        if (error) return error;
+        ffStrbufSubstrBefore(&path, baseLen);
+    }
+    return NULL;
+}

src/detection/cpucache/cpucache_nosupport.c

@@ -0,0 +1,6 @@
+#include "cpucache.h"
+
+const char* ffDetectCPUCache(FF_MAYBE_UNUSED FFCPUCacheResult* result)
+{
+    return "Not supported on this platform";
+}

src/detection/cpucache/cpucache_shared.c

@@ -0,0 +1,75 @@
+#include "cpucache.h"
+#include "util/smbiosHelper.h"
+#include "util/stringUtils.h"
+
+typedef struct FFSmbiosCacheInfo
+{
+    FFSmbiosHeader Header;
+
+    uint8_t SocketDesignation; // string
+    uint16_t CacheConfiguration; // varies
+    uint16_t MaximumCacheSize; // varies
+    uint16_t InstalledSize; // varies
+    uint16_t SupportedSramType; // bit field
+    uint16_t CurrentSramType; // bit field
+
+    // 2.1+
+    uint8_t CacheSpeed; // varies
+    uint8_t ErrorCorrectionType; // enum
+    uint8_t SystemCacheType; // enum
+    uint8_t Associativity; // enum
+
+    // 3.1+
+    uint32_t MaximumCacheSize2; // bit field
+    uint32_t InstalledCacheSize2; // bit field
+} __attribute__((__packed__)) FFSmbiosCacheInfo;
+
+static_assert(offsetof(FFSmbiosCacheInfo, InstalledCacheSize2) == 0x17,
+    "FFSmbiosCacheInfo: Wrong struct alignment");
+
+const char* ffDetectCPUCache(FFCPUCacheResult* result)
+{
+    const FFSmbiosHeaderTable* smbiosTable = ffGetSmbiosHeaderTable();
+    if (!smbiosTable)
+        return "Failed to get SMBIOS data";
+
+    const FFSmbiosCacheInfo* data = (const FFSmbiosCacheInfo*) (*smbiosTable)[FF_SMBIOS_TYPE_CACHE_INFO];
+    if (!data)
+        return "Cache information is not found in SMBIOS data";
+
+    for (; data->Header.Type == FF_SMBIOS_TYPE_CACHE_INFO;
+           data = (const FFSmbiosCacheInfo*) ffSmbiosNextEntry(&data->Header))
+    {
+        bool enabled = !!(data->CacheConfiguration & (1 << 7));
+        if (!enabled)
+            continue;
+
+        uint32_t size = data->InstalledSize;
+        if (size == 0)
+            continue;
+
+        if (data->InstalledSize != 0xFFFF)
+        {
+            size *= (size >> 15 ? 64 : 1) * 1024u;
+        }
+        else if (data->Header.Length > offsetof(FFSmbiosCacheInfo, InstalledCacheSize2))
+        {
+            size = data->InstalledCacheSize2;
+            size *= (size >> 31 ? 64 : 1) * 1024u;
+        }
+
+        uint32_t level = (data->CacheConfiguration & 0b111u) + 1;
+
+        FFCPUCacheType type;
+        switch (data->SystemCacheType)
+        {
+            case 3: type = FF_CPU_CACHE_TYPE_INSTRUCTION; break;
+            case 4: type = FF_CPU_CACHE_TYPE_DATA; break;
+            default: type = FF_CPU_CACHE_TYPE_UNIFIED; break;
+        }
+
+        ffCPUCacheAddItem(result, level, size, 0, type);
+    }
+
+    return NULL;
+}

src/detection/cpucache/cpucache_windows.c

@@ -0,0 +1,41 @@
+#include "cpucache.h"
+#include "util/mallocHelper.h"
+
+#include <windows.h>
+
+const char* ffDetectCPUCache(FFCPUCacheResult* result)
+{
+    DWORD length = 0;
+    GetLogicalProcessorInformationEx(RelationCache, NULL, &length);
+    if (length == 0)
+        return "GetLogicalProcessorInformationEx(RelationCache, NULL, &length) failed";
+
+    SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* FF_AUTO_FREE
+        pProcessorInfo = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)malloc(length);
+
+    if (!pProcessorInfo || !GetLogicalProcessorInformationEx(RelationCache, pProcessorInfo, &length))
+        return "GetLogicalProcessorInformationEx(RelationCache, pProcessorInfo, &length) failed";
+
+    for(
+        SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* ptr = pProcessorInfo;
+        (uint8_t*)ptr < ((uint8_t*)pProcessorInfo) + length;
+        ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
+    )
+    {
+        if(__builtin_expect(ptr->Relationship == RelationCache && ptr->Cache.Level > 0 && ptr->Cache.Level <= 4, true))
+        {
+            FFCPUCacheType cacheType = 0;
+            switch (ptr->Cache.Type)
+            {
+            case CacheUnified: cacheType = FF_CPU_CACHE_TYPE_UNIFIED; break;
+            case CacheInstruction: cacheType = FF_CPU_CACHE_TYPE_INSTRUCTION; break;
+            case CacheData: cacheType = FF_CPU_CACHE_TYPE_DATA; break;
+            case CacheTrace: cacheType = FF_CPU_CACHE_TYPE_TRACE; break;
+            default: __builtin_unreachable(); break;
+            }
+            ffCPUCacheAddItem(result, ptr->Cache.Level, ptr->Cache.CacheSize, ptr->Cache.LineSize, cacheType);
+        }
+    }
+
+    return NULL;
+}

src/detection/cpuusage/cpuusage_bsd.c

@@ -23,12 +23,12 @@ const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
     {
         uint64_t* cpTime = cpTimes[i];
         uint64_t inUse = cpTime[CP_USER] + cpTime[CP_NICE] + cpTime[CP_SYS];
-        uint64_t total = cpTime[CP_INTR] + cpTime[CP_IDLE];
+        uint64_t total = inUse + cpTime[CP_INTR] + cpTime[CP_IDLE];
 
         FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes);
         *info = (FFCpuUsageInfo) {
-            .inUseAll = (uint64_t)inUse,
-            .totalAll = (uint64_t)total,
+            .inUseAll = inUse,
+            .totalAll = total,
         };
     }
 

src/detection/cpuusage/cpuusage_linux.c

@@ -36,8 +36,8 @@ const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
 
             FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes);
             *info = (FFCpuUsageInfo) {
-                .inUseAll = (uint64_t)inUse,
-                .totalAll = (uint64_t)total,
+                .inUseAll = inUse,
+                .totalAll = total,
             };
         }
         else

src/detection/cpuusage/cpuusage_nosupport.c

@@ -0,0 +1,7 @@
+#include "fastfetch.h"
+#include "detection/cpuusage/cpuusage.h"
+
+const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
+{
+    return "Not support on this platform";
+}

src/detection/cpuusage/cpuusage_sunos.c

@@ -0,0 +1,38 @@
+#include "fastfetch.h"
+#include "detection/cpuusage/cpuusage.h"
+
+#include <kstat.h>
+#include <sys/sysinfo.h>
+
+static inline void kstatFreeWrap(kstat_ctl_t** pkc)
+{
+    assert(pkc);
+    if (*pkc)
+        kstat_close(*pkc);
+}
+
+const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
+{
+    __attribute__((__cleanup__(kstatFreeWrap))) kstat_ctl_t* kc = kstat_open();
+    if (!kc)
+        return "kstat_open() failed";
+
+    for (int i = 0;; ++i)
+    {
+        kstat_t* ks = kstat_lookup(kc, "cpu_stat", i, NULL);
+
+        cpu_stat_t cs;
+        if (!ks || kstat_read(kc, ks, &cs) < 0)
+            break;
+
+        uint64_t inUse = cs.cpu_sysinfo.cpu[CPU_USER] + cs.cpu_sysinfo.cpu[CPU_KERNEL];
+        uint64_t total = inUse + cs.cpu_sysinfo.cpu[CPU_IDLE] + cs.cpu_sysinfo.cpu[CPU_WAIT];
+
+        FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes);
+        *info = (FFCpuUsageInfo) {
+            .inUseAll = inUse,
+            .totalAll = total,
+        };
+    }
+    return NULL;
+}

src/detection/cpuusage/cpuusage_windows.c

@@ -31,8 +31,8 @@ const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
 
         FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes);
         *info = (FFCpuUsageInfo) {
-            .inUseAll = (uint64_t)inUse,
-            .totalAll = (uint64_t)total,
+            .inUseAll = inUse,
+            .totalAll = total,
         };
     }
 

src/detection/de/de_linux.c

@@ -74,7 +74,20 @@ static void getGnome(FFstrbuf* result, FF_MAYBE_UNUSED FFDEOptions* options)
 
 static void getCinnamon(FFstrbuf* result, FF_MAYBE_UNUSED FFDEOptions* options)
 {
-    ffParsePropFileData("applications/cinnamon.desktop", "X-GNOME-Bugzilla-Version =", result);
+    ffStrbufSetS(result, getenv("CINNAMON_VERSION"));
+
+    if (result->length == 0)
+        ffParsePropFileData("applications/cinnamon.desktop", "X-GNOME-Bugzilla-Version =", result);
+
+    if (result->length == 0 && options->slowVersionDetection)
+    {
+        if (ffProcessAppendStdOut(result, (char* const[]){
+            "cinnamon",
+            "--version",
+            NULL
+        }) == NULL) // Cinnamon 6.2.2
+            ffStrbufSubstrAfterLastC(result, ' ');
+    }
 }
 
 static void getMate(FFstrbuf* result, FFDEOptions* options)
@@ -167,6 +180,8 @@ static void getBudgie(FFstrbuf* result, FF_MAYBE_UNUSED FFDEOptions* options)
 
 const char* ffDetectDEVersion(const FFstrbuf* deName, FFstrbuf* result, FFDEOptions* options)
 {
+    if (!instance.config.general.detectVersion) return "Disabled by config";
+
     if (ffStrbufEqualS(deName, FF_DE_PRETTY_PLASMA))
         getKDE(result, options);
     else if (ffStrbufEqualS(deName, FF_DE_PRETTY_GNOME))

src/detection/disk/disk_linux.c

@@ -71,6 +71,10 @@ static bool isPhysicalDevice(const struct mntent* device)
         ffStrStartsWith(device->mnt_fsname + 5, "fd")      //Ignore fd devices
     ) return false;
 
+    // https://source.android.com/docs/core/ota/apex?hl=zh-cn
+    if(ffStrStartsWith(device->mnt_dir, "/apex/")) 
+        return false;
+
     #endif // __ANDROID__
 
     return true;

src/detection/disk/disk_nosupport.c

@@ -0,0 +1,6 @@
+#include "disk.h"
+
+const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
+{
+    return "Not supported on this platform";
+}

src/detection/disk/disk_sunos.c

@@ -0,0 +1,138 @@
+#include "disk.h"
+#include "common/io/io.h"
+#include "util/stringUtils.h"
+
+#include <sys/mntent.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <sys/mount.h>
+#include <sys/mnttab.h>
+
+static bool isPhysicalDevice(const struct mnttab* device)
+{
+    //Always show the root path
+    if(ffStrEquals(device->mnt_mountp, "/"))
+        return true;
+
+    if(ffStrEquals(device->mnt_special, "none"))
+        return false;
+
+    //ZFS pool
+    if(ffStrEquals(device->mnt_fstype, "zfs"))
+        return true;
+
+    //Pseudo filesystems don't have a device in /dev
+    if(!ffStrStartsWith(device->mnt_special, "/dev/"))
+        return false;
+
+    struct stat deviceStat;
+    if(stat(device->mnt_special, &deviceStat) != 0)
+        return false;
+
+    //Ignore all devices that are not block devices
+    if(!S_ISBLK(deviceStat.st_mode))
+        return false;
+
+    return true;
+}
+
+static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
+{
+    if(ffStrbufEqualS(&currentDisk->filesystem, "zfs"))
+    {
+        //ZFS subvolumes
+        uint32_t index = ffStrbufFirstIndexC(&currentDisk->mountFrom, '/');
+        if (index == currentDisk->mountFrom.length)
+            return false;
+
+        FF_STRBUF_AUTO_DESTROY zpoolName = ffStrbufCreateNS(index, currentDisk->mountFrom.chars);
+        for(uint32_t i = 0; i < disks->length - 1; i++)
+        {
+            const FFDisk* otherDevice = ffListGet(disks, i);
+            if(ffStrbufEqualS(&otherDevice->filesystem, "zfs") && ffStrbufStartsWith(&otherDevice->mountFrom, &zpoolName))
+                return true;
+        }
+
+        return false;
+    }
+    else
+    {
+        //Filter all disks which device was already found. This catches BTRFS subvolumes.
+        for(uint32_t i = 0; i < disks->length - 1; i++)
+        {
+            const FFDisk* otherDevice = ffListGet(disks, i);
+
+            if(ffStrbufEqual(&currentDisk->mountFrom, &otherDevice->mountFrom))
+                return true;
+        }
+    }
+
+    return false;
+}
+
+static void detectType(const FFlist* disks, FFDisk* currentDisk, struct mnttab* device)
+{
+    if(ffStrContains(device->mnt_mntopts, MNTOPT_NOBROWSE))
+        currentDisk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
+    else if(isSubvolume(disks, currentDisk))
+        currentDisk->type = FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT;
+    else
+        currentDisk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
+}
+
+static void detectStats(FFDisk* disk)
+{
+    struct statvfs fs;
+    if(statvfs(disk->mountpoint.chars, &fs) != 0)
+        memset(&fs, 0, sizeof(struct statvfs));
+
+    disk->bytesTotal = fs.f_blocks * fs.f_frsize;
+    disk->bytesFree = fs.f_bfree * fs.f_frsize;
+    disk->bytesAvailable = fs.f_bavail * fs.f_frsize;
+    disk->bytesUsed = 0; // To be filled in ./disk.c
+
+    disk->filesTotal = (uint32_t) fs.f_files;
+    disk->filesUsed = (uint32_t) (disk->filesTotal - fs.f_ffree);
+
+    if(fs.f_flag & ST_RDONLY)
+        disk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT;
+
+    ffStrbufSetS(&disk->name, fs.f_fstr);
+
+    disk->createTime = 0;
+    struct stat deviceStat;
+    if(stat(disk->mountpoint.chars, &deviceStat) == 0)
+        disk->createTime = (uint64_t) deviceStat.st_ctim.tv_sec * 1000 + (uint64_t) deviceStat.st_ctim.tv_nsec / 1000000000;
+}
+
+const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
+{
+    FF_AUTO_CLOSE_FILE FILE* mountsFile = fopen(MNTTAB, "r");
+    if(mountsFile == NULL)
+        return "fopen(\"" MNTTAB "\", \"r\") == NULL";
+
+    struct mnttab device;
+
+    while (getmntent(mountsFile, &device) == 0)
+    {
+        if (__builtin_expect(options->folders.length, 0))
+        {
+            if (!ffDiskMatchMountpoint(options, device.mnt_mountp))
+                continue;
+        }
+        else if(!isPhysicalDevice(&device))
+            continue;
+
+        //We have a valid device, add it to the list
+        FFDisk* disk = ffListAdd(disks);
+        disk->type = FF_DISK_VOLUME_TYPE_NONE;
+        ffStrbufInitS(&disk->mountFrom, device.mnt_special);
+        ffStrbufInitS(&disk->mountpoint, device.mnt_mountp);
+        ffStrbufInitS(&disk->filesystem, device.mnt_fstype);
+        ffStrbufInit(&disk->name);
+        detectType(disks, disk, &device);
+        detectStats(disk);
+    }
+
+    return NULL;
+}

src/detection/diskio/diskio_nosupport.c

@@ -0,0 +1,6 @@
+#include "diskio.h"
+
+const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
+{
+    return "Not supported on this platform";
+}

src/detection/diskio/diskio_sunos.c

@@ -0,0 +1,39 @@
+#include "diskio.h"
+#include "util/stringUtils.h"
+#include <kstat.h>
+
+static inline void kstatFreeWrap(kstat_ctl_t** pkc)
+{
+    assert(pkc);
+    if (*pkc)
+        kstat_close(*pkc);
+}
+
+const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
+{
+    __attribute__((__cleanup__(kstatFreeWrap))) kstat_ctl_t* kc = kstat_open();
+    if (!kc)
+        return "kstat_open() failed";
+
+    for (kstat_t* ks = kc->kc_chain; ks; ks = ks->ks_next)
+    {
+        if (ks->ks_type != KSTAT_TYPE_IO || !ffStrEquals(ks->ks_class, "disk")) continue;
+
+        if (options->namePrefix.length && strncmp(ks->ks_name, options->namePrefix.chars, options->namePrefix.length) != 0)
+            continue;
+
+        kstat_io_t kio;
+        if (kstat_read(kc, ks, &kio) < 0)
+            continue;
+
+        FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
+        ffStrbufInitS(&device->devPath, ks->ks_name);
+        device->bytesRead = kio.nread;
+        device->readCount = kio.reads;
+        device->bytesWritten = kio.nwritten;
+        device->writeCount = kio.writes;
+        ffStrbufInitS(&device->name, ks->ks_name);
+    }
+
+    return NULL;
+}

src/detection/displayserver/displayserver.c

@@ -1,6 +1,6 @@
 #include "displayserver.h"
 
-bool ffdsAppendDisplay(
+FFDisplayResult* ffdsAppendDisplay(
     FFDisplayServerResult* result,
     uint32_t width,
     uint32_t height,
@@ -11,10 +11,12 @@ bool ffdsAppendDisplay(
     FFstrbuf* name,
     FFDisplayType type,
     bool primary,
-    uint64_t id)
+    uint64_t id,
+    uint32_t physicalWidth,
+    uint32_t physicalHeight)
 {
     if(width == 0 || height == 0)
-        return false;
+        return NULL;
 
     FFDisplayResult* display = ffListAdd(&result->displays);
     display->width = width;
@@ -25,10 +27,16 @@ bool ffdsAppendDisplay(
     display->rotation = rotation;
     ffStrbufInitMove(&display->name, name);
     display->type = type;
-    display->primary = primary;
     display->id = id;
+    display->physicalWidth = physicalWidth;
+    display->physicalHeight = physicalHeight;
+    display->primary = primary;
 
-    return true;
+    display->bitDepth = 0;
+    display->hdrEnabled = false;
+    display->wcgEnabled = false;
+
+    return display;
 }
 
 void ffConnectDisplayServerImpl(FFDisplayServerResult* ds);

src/detection/displayserver/displayserver.h

@@ -3,13 +3,13 @@
 #include "fastfetch.h"
 
 #define FF_DE_PRETTY_PLASMA "KDE Plasma"
-#define FF_DE_PRETTY_GNOME "Gnome"
-#define FF_DE_PRETTY_GNOME_CLASSIC "Gnome Classic"
+#define FF_DE_PRETTY_GNOME "GNOME"
+#define FF_DE_PRETTY_GNOME_CLASSIC "GNOME Classic"
 #define FF_DE_PRETTY_XFCE4 "Xfce4"
 #define FF_DE_PRETTY_CINNAMON "Cinnamon"
 #define FF_DE_PRETTY_MATE "Mate"
 #define FF_DE_PRETTY_LXDE "LXDE"
-#define FF_DE_PRETTY_LXQT "LXQT"
+#define FF_DE_PRETTY_LXQT "LXQt"
 #define FF_DE_PRETTY_BUDGIE "Budgie"
 #define FF_DE_PRETTY_CDE "CDE"
 #define FF_DE_PRETTY_UNITY "Unity"
@@ -58,8 +58,13 @@ typedef struct FFDisplayResult
     FFstrbuf name;
     FFDisplayType type;
     uint32_t rotation;
-    bool primary;
     uint64_t id; // platform dependent
+    uint32_t physicalWidth;
+    uint32_t physicalHeight;
+    bool primary;
+    uint8_t bitDepth;
+    bool hdrEnabled;
+    bool wcgEnabled;
 } FFDisplayResult;
 
 typedef struct FFDisplayServerResult
@@ -74,7 +79,7 @@ typedef struct FFDisplayServerResult
 
 const FFDisplayServerResult* ffConnectDisplayServer();
 
-bool ffdsAppendDisplay(
+FFDisplayResult* ffdsAppendDisplay(
     FFDisplayServerResult* result,
     uint32_t width,
     uint32_t height,
@@ -85,4 +90,6 @@ bool ffdsAppendDisplay(
     FFstrbuf* name,
     FFDisplayType type,
     bool primary,
-    uint64_t id);
+    uint64_t id,
+    uint32_t physicalWidth,
+    uint32_t physicalHeight);

src/detection/displayserver/displayserver_android.c

@@ -1,8 +1,9 @@
 #include "displayserver.h"
 #include "common/settings.h"
-
 #include "common/processing.h"
 
+#include <math.h>
+
 static void detectWithDumpsys(FFDisplayServerResult* ds)
 {
     FF_STRBUF_AUTO_DESTROY buf = ffStrbufCreate();
@@ -63,6 +64,8 @@ static void detectWithDumpsys(FFDisplayServerResult* ds)
                 &name,
                 FF_DISPLAY_TYPE_UNKNOWN,
                 false,
+                0,
+                0,
                 0
             );
         }
@@ -83,6 +86,8 @@ static bool detectWithGetprop(FFDisplayServerResult* ds)
         uint32_t width = (uint32_t) ffStrbufToUInt(&buffer, 0);
         ffStrbufSubstrAfterFirstC(&buffer, ',');
         uint32_t height = (uint32_t) ffStrbufToUInt(&buffer, 0);
+        ffStrbufSubstrAfterFirstC(&buffer, ',');
+        uint32_t ppi = (uint32_t) ffStrbufToUInt(&buffer, 0);
         return ffdsAppendDisplay(ds,
             width,
             height,
@@ -93,7 +98,9 @@ static bool detectWithGetprop(FFDisplayServerResult* ds)
             0,
             FF_DISPLAY_TYPE_BUILTIN,
             false,
-            0
+            0,
+            (uint32_t) (width / ppi * 25.4),
+            (uint32_t) (height / ppi * 25.4)
         );
     }
 

src/detection/displayserver/displayserver_apple.c

@@ -1,5 +1,6 @@
 #include "displayserver.h"
 #include "util/apple/cf_helpers.h"
+#include "util/stringUtils.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -57,7 +58,7 @@ static void detectDisplays(FFDisplayServerResult* ds)
             if(CoreDisplay_IODisplayCreateInfoDictionary)
             {
                 io_service_t servicePort = CGDisplayIOServicePort(screen);
-                CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName); 
+                CFDictionaryRef FF_CFTYPE_AUTO_RELEASE displayInfo = CoreDisplay_IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
                 if(displayInfo)
                 {
                     CFDictionaryRef productNames;
@@ -67,7 +68,9 @@ static void detectDisplays(FFDisplayServerResult* ds)
             }
             #endif
 
-            ffdsAppendDisplay(ds,
+            CGSize size = CGDisplayScreenSize(screen);
+
+            FFDisplayResult* display = ffdsAppendDisplay(ds,
                 (uint32_t)CGDisplayModeGetPixelWidth(mode),
                 (uint32_t)CGDisplayModeGetPixelHeight(mode),
                 refreshRate,
@@ -77,8 +80,28 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 &name,
                 CGDisplayIsBuiltin(screen) ? FF_DISPLAY_TYPE_BUILTIN : FF_DISPLAY_TYPE_EXTERNAL,
                 CGDisplayIsMain(screen),
-                (uint64_t)screen
+                (uint64_t)screen,
+                (uint32_t) (size.width + 0.5),
+                (uint32_t) (size.height + 0.5)
             );
+            if (display)
+            {
+                // Shitty code
+                uint8_t bitDepth = 0;
+                FF_CFTYPE_AUTO_RELEASE CFStringRef desc = CFCopyDescription(mode);
+                CFRange start = CFStringFind(desc, CFSTR("BitsPerSample = "), 0);
+                if (start.location != kCFNotFound)
+                {
+                    for (CFIndex idx = start.location + start.length; idx < CFStringGetLength(desc); ++idx)
+                    {
+                        UniChar ch = CFStringGetCharacterAtIndex(desc, idx);
+                        if (!ffCharIsDigit((char) ch))
+                            break;
+                        bitDepth = (uint8_t) (bitDepth * 10 + (ch - '0'));
+                    }
+                }
+                display->bitDepth = bitDepth;
+            }
             CGDisplayModeRelease(mode);
         }
         CGDisplayRelease(screen);