Merge pull request #1026 from fastfetch-cli/dev

Release: v2.16.0

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,9 @@ assignees: ''
 
 ---
 
-<!-- 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 -->
+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 of an issue. Providing the following information may help us greatly. Thanks in advance! -->
 
 # General description of bug:
 
@@ -15,8 +17,8 @@ assignees: ''
 * 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:
 
@@ -25,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`:
@@ -34,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:
 
@@ -63,21 +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
 
-<!-- NOTE for zsh / p10k users:
-There are known incompatibility between fastfetch and p10k instant prompt.
-The p10k doc clearly states that you should NOT print anything to stdout after p10k-instant-prompt is initialized.
-You should either put `fastfetch` before initialization of p10k-instant-prompt (recommended), remove it or use `fastfetch --pipe false` -->
-
-* 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/ISSUE_TEMPLATE/feature_request.md

@@ -7,23 +7,7 @@ assignees: ''
 
 ---
 
-## Before requesting a new feature
-
-* A lot of features are not enabled by default. Please try `fastfetch --list-modules` and `fastfetch -c all.jsonc` to see if it has been supported
-* Fastfetch supports `Command` module, which can be used to grab output from a custom shell script. Please check if it fits your needs
-
-```jsonc
-// ~/.config/fastfetch/fastfetch.jsonc
-{
-    "modules": [
-        {
-            "type": "command",
-            "text": "/path/to/your/script",
-            "key": "Feature Title"
-        }
-    ]
-}
-```
+Be sure to read [FAQ](https://github.com/fastfetch-cli/fastfetch?tab=readme-ov-file#faq) before submitting a new issue.
 
 ## Wanted features:
 

.github/workflows/ci.yml

@@ -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
+            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
@@ -205,6 +240,8 @@ jobs:
 
       - name: setup alpine linux
         uses: jirutka/setup-alpine@master
+        with:
+          branch: v3.19
 
       - name: install dependencies
         run: |
@@ -244,6 +281,7 @@ jobs:
       - name: setup alpine linux
         uses: jirutka/setup-alpine@master
         with:
+          branch: v3.19
           arch: aarch64
 
       - name: install dependencies
@@ -330,6 +368,40 @@ jobs:
           name: fastfetch-macos-universal
           path: ./fastfetch-*.*
 
+  sunos-amd64:
+    runs-on: ubuntu-latest
+    name: SunOS-amd64
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+
+      - 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
@@ -422,7 +494,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-cppwinrt
 
       - name: print msys version
         run: uname -a
@@ -484,7 +556,7 @@ jobs:
         with:
           msystem: CLANG32
           update: true
-          install: git mingw-w64-clang-i686-7zip 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
 
       - name: print msys version
         run: uname -a
@@ -541,11 +613,13 @@ 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:

.gitignore

@@ -8,3 +8,4 @@ cscope.*
 tags
 fastfetch.kdev4
 *.user
+*.user.*

CHANGELOG.md

@@ -1,3 +1,154 @@
+# 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:
+* Support monochrome bar type (#960)
+* Support editor version detection on Windows (Editor, Windows)
+* Apply default color palettes in `--file` and `--data` (Logo)
+* 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 now equivalent to `--title-format '{6}{7}{8}'`
+* Support named color placeholders in custom module formattion string
+    * `--<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)
+* Print error reason when vulkan init fails (Vulkan)
+
+Bugfixes:
+* Don't detect `.conf` files in `--list-config-paths`
+* Don't try to detect terminals in MSYS shell with process backtracing (Windows)
+* Fix `outputColor` doesn't work if module keys are disabled
+
+Logos:
+* Add Cereus Linux
+* Re-add special handling of Loc-OS
+
+# 2.13.2
+
+Another hotfix release :(
+
+Bugfixes:
+* Remove DRM driver version detection feature, which caused a performance regression for nouveau drivers (#956, Display, Linux)
+* Fix compatibility for old python versions. Regression of `2.13.0`
+* Don't use `*-unknown` as display name for Wayland protocol (Display, Linux)
+
+Features:
+* Add new module `Editor` which prints information of the default editor, i.e. $VISUAL or $EDITOR (#430, Editor)
+
+Logos:
+* Added CuerdOS
+* Remove special handling of Loc-OS
+
+# 2.13.1
+
+Fix a regression introduced in v2.13.0
+
+Bugfixes:
+* Fix CPU frequency not displayed if `bios_limit` is not available (CPU, Linux)
+
+Features:
+* Add `--cpu-show-pe-core-count` to detect and display core count for performance / efficiency cores (CPU, FreeBSD)
+
+# 2.13.0
+
+Changes:
+* Option `--gpu-force-vulkan <?bool>` has been changed to `--gpu-detection-method <enum>`
+    * Use `--gpu-detection-method vulkan` to get the old behavior
+    * See `fastfetch -h gpu-detection-method` for detail
+* In Linux, BIOS limited CPU frequency is printed by default to match the behavior of neofetch (CPU, Linux, #947)
+
+Features:
+* Add new module `Bootmgr` which prints information of stage 2 bootloader (grub, system-boot, etc)
+    * Requires root permission to work on Windows and FreeBSD
+    * Requires booting in UEFI mode
+* Add package manager lpkg and lpkg-build support (Packages, Linux)
+* Improve macOS 10.13 compatibility (macOS)
+* Detect core count for performance / efficiency cores (CPU)
+    * Test it with `fastfetch -s cpu --cpu-format '{9}'`
+* Support min / max frequency and physical core count detection in FreeBSD, if kernel supports it (CPU, FreeBSD)
+* Detect DRM driver version if DRM detection method is used (GPU, Linux)
+
+Bugfixes:
+* Don't detect `clifm` and `valgrind` as a terminal (Terminal, Linux)
+* Improve stability (PhysicalMemory, FreeBSD)
+* Fix bssid & status detection (Wifi, FreeBSD)
+* Ensure createTime is correctly initialized (Disk, FreeBSD / macOS)
+* Fix `--cpu-freq-ndigits` not working if `--cpu-format` is used
+* Fix `nix-user` package count detection (Packages, Linux)
+* Fix some memory leaks
+
+Logos:
+* Fix Manjaro logo not displayed
+* Add SpoinkOS
+* Add Loc-OS
+* Add Furreto Linux
+* Fix TorizonCore logo colors
+* Fix KDE neon logo not displayed
+
 # 2.12.0
 
 Changes:
@@ -20,6 +171,7 @@ Features:
 * Add option `--localip-show-all-ips` to show all IPs assigned to the same interface (LocalIP)
     * Default to `false`
 * Improve compatibility with `(*term)` (#909, Terminal, macOS)
+* Support GPU core count and frequency detection for Asahi Linux (GPU, Linux)
 
 Bugfixes:
 * Rename option `--temperature-unit` to `--temp-unit` as documented in help messages
@@ -162,7 +314,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
@@ -869,7 +1021,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)
@@ -895,7 +1047,7 @@ 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:

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.12.0
+    VERSION 2.16.0
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -14,10 +14,12 @@ set(PROJECT_LICENSE "MIT license")
 ###################
 if(ANDROID)
     set(LINUX FALSE)
-elseif("${CMAKE_SYSTEM_NAME}" MATCHES ".*[Ll]inux.*")
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(LINUX TRUE CACHE BOOL "..." FORCE) # LINUX means GNU/Linux, not just the kernel
-elseif("${CMAKE_SYSTEM_NAME}" MATCHES ".*[Bb][Ss][Dd].*")
+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,30 +44,30 @@ 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 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 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)
@@ -76,6 +78,14 @@ option(ENABLE_PROPRIETARY_GPU_DRIVER_API "Enable proprietary GPU driver API (NVM
 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")
+set_property(CACHE BINARY_LINK_TYPE PROPERTY STRINGS ${BINARY_LINK_TYPE_OPTIONS})
+if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS)
+    message(FATAL_ERROR "BINARY_LINK_TYPE must be one of ${BINARY_LINK_TYPE_OPTIONS}")
+endif()
 
 if (LINUX)
     set(CUSTOM_PCI_IDS_PATH "" CACHE STRING "Custom path to file pci.ids, defaults to `/usr/share/hwdata/pci.ids`")
@@ -110,12 +120,12 @@ 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)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--tsaware -Wl,--build-id -Wl,--subsystem,console:6.1,--major-os-version,6,--minor-os-version,1")
-elseif(APPLE)
+elseif(APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-arc")
 endif()
 
@@ -284,12 +294,14 @@ set(LIBFASTFETCH_SRC
     src/common/properties.c
     src/common/settings.c
     src/common/temps.c
+    src/detection/bootmgr/bootmgr.c
     src/detection/chassis/chassis.c
     src/detection/cpu/cpu.c
     src/detection/cpuusage/cpuusage.c
     src/detection/disk/disk.c
     src/detection/diskio/diskio.c
     src/detection/displayserver/displayserver.c
+    src/detection/editor/editor.c
     src/detection/font/font.c
     src/detection/gpu/gpu.c
     src/detection/media/media.c
@@ -314,12 +326,14 @@ set(LIBFASTFETCH_SRC
     src/modules/bios/bios.c
     src/modules/bluetooth/bluetooth.c
     src/modules/board/board.c
+    src/modules/bootmgr/bootmgr.c
     src/modules/brightness/brightness.c
     src/modules/break/break.c
     src/modules/camera/camera.c
     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
@@ -328,10 +342,13 @@ 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
     src/modules/host/host.c
     src/modules/icons/icons.c
+    src/modules/initsystem/initsystem.c
     src/modules/gamepad/gamepad.c
     src/modules/kernel/kernel.c
     src/modules/lm/lm.c
@@ -394,13 +411,16 @@ if(LINUX)
         src/detection/battery/battery_linux.c
         src/detection/bios/bios_linux.c
         src/detection/board/board_linux.c
+        src/detection/bootmgr/bootmgr_linux.c
         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
@@ -419,6 +439,7 @@ if(LINUX)
         src/detection/gtk_qt/gtk.c
         src/detection/host/host_linux.c
         src/detection/icons/icons_linux.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_linux.c
         src/detection/lm/lm_linux.c
         src/detection/loadavg/loadavg_linux.c
@@ -462,12 +483,15 @@ elseif(ANDROID)
         src/detection/bios/bios_android.c
         src/detection/bluetooth/bluetooth_nosupport.c
         src/detection/board/board_android.c
+        src/detection/bootmgr/bootmgr_nosupport.c
         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
@@ -476,6 +500,7 @@ elseif(ANDROID)
         src/detection/gpu/gpu_nosupport.c
         src/detection/host/host_android.c
         src/detection/icons/icons_nosupport.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_android.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_linux.c
@@ -520,12 +545,15 @@ elseif(BSD)
         src/detection/bios/bios_bsd.c
         src/detection/bluetooth/bluetooth_linux.c
         src/detection/board/board_bsd.c
+        src/detection/bootmgr/bootmgr_bsd.c
         src/detection/brightness/brightness_bsd.c
         src/detection/chassis/chassis_bsd.c
         src/detection/cpu/cpu_bsd.c
+        src/detection/cpucache/cpucache_nosupport.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
@@ -545,6 +573,7 @@ elseif(BSD)
         src/detection/host/host_bsd.c
         src/detection/lm/lm_linux.c
         src/detection/icons/icons_linux.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_bsd.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/locale/locale_linux.c
@@ -588,12 +617,15 @@ elseif(APPLE)
         src/detection/bios/bios_apple.c
         src/detection/bluetooth/bluetooth_apple.m
         src/detection/board/board_apple.c
+        src/detection/bootmgr/bootmgr_apple.c
         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
@@ -603,6 +635,7 @@ elseif(APPLE)
         src/detection/gpu/gpu_apple.m
         src/detection/host/host_apple.c
         src/detection/icons/icons_nosupport.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/libc/libc_apple.c
@@ -647,26 +680,30 @@ elseif(WIN32)
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_windows.c
         src/detection/board/board_windows.c
+        src/detection/bootmgr/bootmgr_windows.c
         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
         src/detection/icons/icons_windows.c
+        src/detection/initsystem/initsystem_nosupport.c
         src/detection/libc/libc_windows.cpp
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_nosupport.c
         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
@@ -698,6 +735,77 @@ 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_nosupport.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/wlr-output-management-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_nosupport.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)
@@ -785,6 +893,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)
@@ -808,6 +918,11 @@ if(NOT "${CUSTOM_OS_RELEASE_PATH}" STREQUAL "")
     target_compile_definitions(libfastfetch PRIVATE FF_CUSTOM_OS_RELEASE_PATH=${CUSTOM_OS_RELEASE_PATH})
 endif()
 
+if(NOT BINARY_LINK_TYPE STREQUAL "dlopen")
+    message(STATUS "Enabling custom link type: ${BINARY_LINK_TYPE}")
+    target_compile_definitions(libfastfetch PRIVATE FF_DISABLE_DLOPEN=1)
+endif()
+
 function(ff_lib_enable VARNAME PKGCONFIG_NAMES CMAKE_NAME)
     if(NOT ENABLE_${VARNAME})
         return()
@@ -836,6 +951,11 @@ function(ff_lib_enable VARNAME PKGCONFIG_NAMES CMAKE_NAME)
     target_compile_definitions(libfastfetch PRIVATE FF_HAVE_${VARNAME}=1)
     target_include_directories(libfastfetch PRIVATE ${${VARNAME}_INCLUDE_DIRS})
 
+    if(NOT BINARY_LINK_TYPE STREQUAL "dlopen")
+        target_link_directories(libfastfetch PUBLIC ${${VARNAME}_LIBRARY_DIRS})
+        target_link_libraries(libfastfetch PRIVATE ${${VARNAME}_LIBRARIES})
+    endif()
+
     foreach(FLAG ${${VARNAME}_CFLAGS_OTHER})
         if(FLAG MATCHES "-D.*")
             string(SUBSTRING ${FLAG} 2 -1 FLAG)
@@ -962,6 +1082,7 @@ if(LINUX)
     )
 elseif(APPLE)
     target_link_libraries(libfastfetch
+        PRIVATE "resolv"
         PRIVATE "-framework AVFoundation"
         PRIVATE "-framework Cocoa"
         PRIVATE "-framework CoreFoundation"
@@ -1003,6 +1124,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)
@@ -1028,6 +1156,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 SHARED 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 #
 ######################
@@ -1066,12 +1212,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
     )
@@ -1084,6 +1227,11 @@ elseif(APPLE)
     )
 endif()
 
+if(BINARY_LINK_TYPE STREQUAL "static")
+    target_link_options(fastfetch PRIVATE "-static")
+    target_link_options(flashfetch PRIVATE "-static")
+endif()
+
 ###################
 # Testing targets #
 ###################
@@ -1120,13 +1268,13 @@ install(
 )
 
 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"
 )
@@ -1136,10 +1284,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"

README.md

@@ -43,31 +43,28 @@ Replace sudo with doas depending on what you use.
 
 [See also if fastfetch has been packaged for your favorite Linux distro](#Packaging).
 
-If fastfetch is not packaged for your distro or an outdated version is packaged, [linuxbrew](https://brew.sh/) is a good alternate: `brew install fastfetch`
+If fastfetch is not packaged for your distro or an outdated version is packaged, [linuxbrew](https://brew.sh/) is a good alternative: `brew install fastfetch`
 
 ### macOS
 
-...via [HomeBrew](https://brew.sh):
-
-`brew install fastfetch`
-
-...via [MacPorts](https://www.macports.org):
-
-`sudo port install fastfetch`
+* [HomeBrew](https://formulae.brew.sh/formula/fastfetch#default): `brew install fastfetch`
+* [MacPorts](https://ports.macports.org/port/fastfetch/): `sudo port install fastfetch`
 
 ### Windows
 
-`scoop install fastfetch`
+* [scoop](https://scoop.sh/#/apps?q=fastfetch): `scoop install fastfetch`
+* [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.
 
 ### FreeBSD
 
-`pkg install fastfetch`
+* `pkg install fastfetch`
 
 ### Android (Termux)
 
-`pkg install fastfetch`
+* `pkg install fastfetch`
 
 ## Build from source
 
@@ -101,11 +98,99 @@ Logos can be heavily customized too; see the [logo documentation](https://github
 
 ## FAQ
 
-Q: Why do you need a very performant version of neofetch?
-> I like putting neofetch in my ~/.bashrc to have a system overview whenever I use the terminal, but the slow speed annoyed me, so I created this. Also neofetch didn't output everything correctly (e.g Font is displayed as "[Plasma], Noto Sans, 10 [GTK2/3]") and writing my own tool gave me the possibility to fine tune it to run perfectly on at least my configuration.
+### Q: Neofetch is good enough. Why do I need fastfetch?
 
-Q: It does not display [*] correctly for me, what can I do?
-> This is most likely because your system is not implemented (yet). At the moment I am focusing more on making the core app better, than adding more configurations. Feel free to open a pull request if you want to add support for your configuration
+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).
+
+### Q: Fastfetch shows my local IP address. It leaks my privacy!
+
+A local IP (10.x.x.x, 172.x.x.x, 192.168.x.x) has nothing to do with privacy. It only makes sense if you are on the same network, for example, if you connect to the same Wi-Fi network.
+
+Actually the `Local IP` module is the most useful module for me personally. I (@CarterLi) have several VMs installed to test fastfetch and often need to SSH into them. I have fastfetch running on shell startup and I never need to type `ip addr` manually.
+
+If you really don't like it, you can disable the `Local IP` module in `config.jsonc`.
+
+### 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).
+
+### Q: The configuration is so complex. Where is the documentation?
+
+Fastfetch uses JSON (with comments) for configuration. I suggest you use an IDE with JSON schema support (like VSCode) to edit it.
+
+Alternatively, you can refer to the presets in [`presets` directory](https://github.com/fastfetch-cli/fastfetch/tree/dev/presets).
+
+### 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
+
+```jsonc
+{
+    "modules": [
+        {
+            "type": "gpu",
+            "format": "{2}" // See `fastfetch -h gpu-format` for detail
+        }
+    ]
+}
+```
+
+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`
+
+### 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)
+
+```bash
+# install pyfiglet and jq first
+pyfiglet -s -f small_slant $(fastfetch -s os --format json | jq -r '.[0].result.name') && fastfetch -l none
+```
+
+![image](https://github.com/fastfetch-cli/fastfetch/assets/6134068/6466524e-ab8c-484f-848d-eec7ddeb7df2)
+
+### Q: Fastfetch runs in white and black on shell startup. Why?
+
+This issue usually happens when using fastfetch with `p10k`. There are known incompatibility between fastfetch and p10k instant prompt.
+The p10k doc clearly states that you should NOT print anything to stdout after `p10k-instant-prompt` is initialized. You should either put `fastfetch` before initialization of `p10k-instant-prompt` (recommended)
+
+You can always use `fastfetch --pipe false` to force fastfetch running in colorful mode.
+
+### 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:
+
+```jsonc
+// This module shows the default editor
+{
+    "modules": [
+        {
+            "type": "command",
+            "text": "$EDITOR --version | head -1",
+            "key": "Editor"
+        }
+    ]
+}
+```
+
+Otherwise, open a feature request in [GitHub Issues](https://github.com/fastfetch-cli/fastfetch/issues).
+
+### Q: I have questions. Where can I get help?
+
+* For usage questions, please start a discussion in [GitHub Discussions](https://github.com/fastfetch-cli/fastfetch/discussions).
+* For possible bugs, please open an issue in [GitHub Issues](https://github.com/fastfetch-cli/fastfetch/issues). Be sure to fill the bug-report template carefully for developers to investigate.
 
 ## Star History
 

completions/fastfetch.bash

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 __fastfetch_complete_help()
 {
     local __ff_helps=(
@@ -197,7 +195,7 @@ __fastfetch_completion()
         "--disk-show-subvolumes"
         "--gpu-hide-integrated"
         "--gpu-hide-discrete"
-        "--gpu-force-vulkan"
+        "--gpu-force-method"
         "--disk-show-unknown"
         "--bluetooth-show-disconnected"
     )

completions/fastfetch.fish

@@ -1,5 +1,3 @@
-#!/usr/bin/env fish
-
 if not type -q fastfetch
     exit
 end
@@ -85,7 +83,7 @@ string match -r -a -g "^###> ?(.*)" < (status -f) | string collect | python3 | s
 ###>                 elif type == 'config':
 ###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_config)"')
 ###>                 elif type == 'enum':
-###>                     temp: str = ' '.join(map(lambda x: f"{x[0]}\\t{x[1]}", flag["arg"]["enum"].items()))
+###>                     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)"')

debian/changelog

@@ -1,3 +1,57 @@
+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
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 24 May 2024 13:48:59 +0800
+
+fastfetch (2.13.1) jammy; urgency=medium
+
+  * Update to 2.13.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 21 May 2024 15:10:37 +0800
+
+fastfetch (2.12.0) jammy; urgency=medium
+
+  * Update to 2.12.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 14 May 2024 16:33:33 +0800
+
+fastfetch (2.11.5) jammy; urgency=medium
+
+  * Update to 2.11.5
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 07 May 2024 09:30:05 +0800
+
+fastfetch (2.11.3) jammy; urgency=medium
+
+  * Update to 2.11.3
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 06 May 2024 08:46:45 +0800
+
+fastfetch (2.10.2) jammy; urgency=medium
+
+  * Update to 2.10.2
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 23 Apr 2024 15:18:23 +0800
+
+fastfetch (2.10.1) jammy; urgency=medium
+
+  * Update to 2.10.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 23 Apr 2024 09:55:02 +0800
+
 fastfetch (2.9.2) jammy; urgency=medium
 
   * Update to 2.9.2

debian/files

@@ -1 +1 @@
-fastfetch_2.9.2_source.buildinfo universe/utils optional
+fastfetch_2.15.0_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 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

@@ -387,6 +387,10 @@
                                 "output": {
                                     "description": "Set the color of the module output",
                                     "$ref": "#/$defs/colors"
+                                },
+                                "separator": {
+                                    "description": "Set the color of the key-value separator",
+                                    "$ref": "#/$defs/colors"
                                 }
                             }
                         }
@@ -495,10 +499,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",
@@ -515,7 +524,7 @@
                     "properties": {
                         "type": {
                             "type": "number",
-                            "description": "Set the percentage output type. 1 for percentage number, 2 for bar, 3 for both, 6 for bar only, 9 for colored number",
+                            "description": "Set the percentage output type. 1 for percentage number, 2 for multi-color bar, 3 for both, 6 for bar only, 9 for colored number, 10 for monochrome bar",
                             "minimum": 0,
                             "maximum": 255,
                             "default": 9
@@ -680,11 +689,13 @@
                             "bios",
                             "bluetooth",
                             "board",
+                            "bootmgr",
                             "break",
                             "brightness",
                             "camera",
                             "chassis",
                             "cpu",
+                            "cpucache",
                             "cpuusage",
                             "command",
                             "colors",
@@ -694,11 +705,14 @@
                             "disk",
                             "diskio",
                             "de",
+                            "dns",
+                            "editor",
                             "font",
                             "gamepad",
                             "gpu",
                             "host",
                             "icons",
+                            "initsystem",
                             "kernel",
                             "lm",
                             "loadavg",
@@ -713,6 +727,7 @@
                             "os",
                             "packages",
                             "physicaldisk",
+                            "physicalmemory",
                             "player",
                             "poweradapter",
                             "processes",
@@ -771,16 +786,24 @@
                                         "anyOf": [
                                             {
                                                 "const": "bios",
-                                                "description": "Print BIOS name, version, release date, etc"
+                                                "description": "Print information of 1st-stage bootloader (name, version, release date, etc)"
                                             },
                                             {
                                                 "const": "board",
-                                                "description": "Print mather board name and other info"
+                                                "description": "Print motherboard name and other info"
+                                            },
+                                            {
+                                                "const": "bootmgr",
+                                                "description": "Print information of 2nd-stage bootloader (name, firmware, etc)"
                                             },
                                             {
                                                 "const": "camera",
                                                 "description": "Print available cameras"
                                             },
+                                            {
+                                                "const": "cpucache",
+                                                "description": "Print CPU cache sizes"
+                                            },
                                             {
                                                 "const": "cursor",
                                                 "description": "Print cursor style name"
@@ -789,6 +812,10 @@
                                                 "const": "datetime",
                                                 "description": "Print current date and time"
                                             },
+                                            {
+                                                "const": "editor",
+                                                "description": "Print information of the default editor ($VISUAL or $EDITOR)"
+                                            },
                                             {
                                                 "const": "font",
                                                 "description": "Print system font name"
@@ -801,6 +828,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"
@@ -829,6 +860,10 @@
                                                 "const": "os",
                                                 "description": "Print operating system name and version"
                                             },
+                                            {
+                                                "const": "physicalmemory",
+                                                "description": "Print system physical memory devices"
+                                            },
                                             {
                                                 "const": "player",
                                                 "description": "Print music player name"
@@ -869,10 +904,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"
@@ -1064,6 +1095,11 @@
                                         "maximum": 9,
                                         "default": 2
                                     },
+                                    "showPeCoreCount": {
+                                        "description": "Detect and display CPU frequency of different core types (eg. Pcore and Ecore) if supported",
+                                        "type": "boolean",
+                                        "default": false
+                                    },
                                     "key": {
                                         "$ref": "#/$defs/key"
                                     },
@@ -1399,6 +1435,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",
@@ -1445,10 +1516,16 @@
                                         "type": "boolean",
                                         "default": false
                                     },
-                                    "forceVulkan": {
-                                        "description": "Force using vulkan to detect GPUs, which support video memory usage detection with `--allow-slow-operations`",
-                                        "type": "boolean",
-                                        "default": false
+                                    "detectionMethod": {
+                                        "description": "Force using a specified method to detect GPUs",
+                                        "type": "string",
+                                        "enum": [
+                                            "auto",
+                                            "pci",
+                                            "vulkan",
+                                            "opengl"
+                                        ],
+                                        "default": "auto"
                                     },
                                     "hideType": {
                                         "description": "Specify the type of GPUs should not be printed",
@@ -1591,6 +1668,14 @@
                                         "maximum": 9,
                                         "default": 2
                                     },
+                                    "compact": {
+                                        "type": "boolean",
+                                        "description": "Show values in one line",
+                                        "default": true
+                                    },
+                                    "percent": {
+                                        "$ref": "#/$defs/percent"
+                                    },
                                     "key": {
                                         "$ref": "#/$defs/key"
                                     },
@@ -1954,6 +2039,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,19 +1,27 @@
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "padding": {
+            "top": 2
+        }
+    },
     "modules": [
         "title",
         "separator",
         "os",
         "host",
         "bios",
+        "bootmgr",
         "board",
         "chassis",
         "kernel",
+        "initsystem",
         "uptime",
         "loadavg",
         "processes",
         "packages",
         "shell",
+        "editor",
         "display",
         "brightness",
         "monitor",
@@ -30,9 +38,17 @@
         "terminalfont",
         "terminalsize",
         "terminaltheme",
-        "cpu",
+        {
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "temp": true
+        },
+        "cpucache",
         "cpuusage",
-        "gpu",
+        {
+            "type": "gpu",
+            "temp": true
+        },
         "memory",
         "physicalmemory",
         "swap",
@@ -42,7 +58,11 @@
         "player",
         "media",
         "publicip",
-        "localip",
+        {
+            "type": "localip",
+            "showIpv6": true,
+            "showMac": true
+        },
         "wifi",
         "datetime",
         "locale",
@@ -54,10 +74,16 @@
         "sound",
         "camera",
         "gamepad",
-        "weather",
+        {
+          "type": "weather",
+          "timeout": 1000
+        },
         "netio",
         "diskio",
-        "physicaldisk",
+        {
+            "type": "physicaldisk",
+            "temp": true
+        },
         "version",
         "break",
         "colors"

presets/archey.jsonc

@@ -40,7 +40,7 @@
         },
         {
             "type": "terminal",
-            "format": "{5} {6} \u001b[37m█\u001b[97m█ \u001b[36m█\u001b[96m█ \u001b[35m█\u001b[95m█ \u001b[34m█\u001b[94m█ \u001b[33m█\u001b[93m█ \u001b[32m█\u001b[92m█ \u001b[31m█\u001b[91m█ \u001b[30m█\u001b[90m█"
+            "format": "{5} {6} {#37}█{#97}█ {#36}█{#96}█ {#35}█{#95}█ {#34}█{#94}█ {#33}█{#93}█ {#32}█{#92}█ {#31}█{#91}█ {#30}█{#90}█"
         },
         {
             "type": "packages",

presets/ci.jsonc

@@ -13,14 +13,17 @@
     "os",
     "host",
     "bios",
+    "bootmgr",
     "board",
     "chassis",
     "kernel",
+    "initsystem",
     "uptime",
     "loadavg",
     "processes",
     "packages",
     "shell",
+    "editor",
     "display",
     "brightness",
     "monitor",
@@ -37,9 +40,17 @@
     "terminalfont",
     "terminalsize",
     "terminaltheme",
-    "cpu",
+    {
+        "type": "cpu",
+        "showPeCoreCount": true,
+        "temp": true
+    },
+    "cpucache",
     "cpuusage",
-    "gpu",
+    {
+        "type": "gpu",
+        "temp": true
+    },
     "memory",
     "physicalmemory",
     "swap",
@@ -49,7 +60,11 @@
     "player",
     "media",
     "publicip",
-    "localip",
+    {
+        "type": "localip",
+        "showIpv6": true,
+        "showMac": true
+    },
     "wifi",
     "datetime",
     "locale",
@@ -67,7 +82,10 @@
     },
     "netio",
     "diskio",
-    "physicaldisk",
+    {
+        "type": "physicaldisk",
+        "temp": true
+    },
     "version",
     "break",
     "colors"

presets/examples/10.jsonc

@@ -14,7 +14,8 @@
     "modules": [
         {
             "type": "custom",
-            "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"
+            "format": "┌────────────────────────────────────────────────────────────┐",
+            "outputColor": "90"
         },
         {
             "type": "title",
@@ -22,15 +23,17 @@
         },
         {
             "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"
+            "format": "└────────────────────────────────────────────────────────────┘",
+            "outputColor": "90"
         },
         {
             "type": "custom",
-            "format": " \u001b[90m  \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[38m  \u001b[39m       \u001b[38m  \u001b[37m  \u001b[36m  \u001b[35m  \u001b[34m  \u001b[33m  \u001b[32m  \u001b[31m  \u001b[90m"
+            "format": " {#90}  {#31}  {#32}  {#33}  {#34}  {#35}  {#36}  {#37}  {#38}  {#39}       {#38}  {#37}  {#36}  {#35}  {#34}  {#33}  {#32}  {#31}  {#90}"
         },
         {
             "type": "custom",
-            "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐"
+            "format": "┌────────────────────────────────────────────────────────────┐",
+            "outputColor": "90"
         },
         {
             "type": "os",
@@ -139,12 +142,13 @@
         },
         {
             "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────────────┘"
+            "format": "└────────────────────────────────────────────────────────────┘",
+            "outputColor": "90"
         },
         "break",
         {
             "type": "custom",
-            "format": " \u001b[90m  \u001b[31m  \u001b[32m  \u001b[33m  \u001b[34m  \u001b[35m  \u001b[36m  \u001b[37m  \u001b[38m  \u001b[39m       \u001b[38m  \u001b[37m  \u001b[36m  \u001b[35m  \u001b[34m  \u001b[33m  \u001b[32m  \u001b[31m  \u001b[90m"
+            "format": " {#90}  {#31}  {#32}  {#33}  {#34}  {#35}  {#36}  {#37}  {#38}  {#39}       {#38}  {#37}  {#36}  {#35}  {#34}  {#33}  {#32}  {#31}  {#90}"
         }
     ]
 }

presets/examples/11.jsonc

@@ -4,7 +4,10 @@
         "type": "small"
     },
     "display": {
-        "separator": "\u001b[31m->   "
+        "separator": "->   ",
+        "color": {
+            "separator": "red"
+        }
     },
     "modules": [
         {

presets/examples/12.jsonc

@@ -4,7 +4,10 @@
         "type": "none"
     },
     "display": {
-        "separator": "->   "
+        "separator": "->   ",
+        "color": {
+            "separator": "1"
+        }
     },
     "modules": [
         {
@@ -14,7 +17,7 @@
         "break",
         {
             "type": "custom",
-            "format": "┌───────────────────────────── \u001b[1mSystem Information\u001b[0m ─────────────────────────────┐" // `\u001b` is `\033`, or `\e`
+            "format": "┌───────────────────────────── {#1}System Information{#} ─────────────────────────────┐"
         },
         "break",
         {
@@ -92,7 +95,7 @@
         "break",
         {
             "type": "custom",
-            "format": "└──────────────────────────────────────────────────────────────────────────────┘" // `\u001b` is `\033`, or `\e`
+            "format": "└──────────────────────────────────────────────────────────────────────────────┘"
         },
         "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": {
@@ -17,54 +18,55 @@
         },
         {
             // draw borders first to make colors of left and right border consistant
-            "key": "│           │\u001b[11D\u001b[31m user",
+            "key": "│           │\u001b[11D{#31} user",
             "type": "title",
             "format": "{1}"
         },
         {
-            "key": "│           │\u001b[11D\u001b[32m󰇅 hname",
+            "key": "│           │\u001b[11D{#32}󰇅 hname",
             "type": "title",
             "format": "{2}"
         },
         {
-            "key": "│           │\u001b[11D\u001b[33m󰅐 uptime",
+            "key": "│           │\u001b[11D{#33}󰅐 uptime",
             "type": "uptime"
         },
         {
-            "key": "│           │\u001b[11D\u001b[34m󰟾 distro",
+            "key": "│           │\u001b[11D{#34}󰟾 distro",
             "type": "os"
         },
         {
-            "key": "│           │\u001b[11D\u001b[35m kernel",
+            "key": "│           │\u001b[11D{#35} kernel",
             "type": "kernel"
         },
         {
-            "key": "│           │\u001b[11D\u001b[36m󰇄 desktop",
+            "key": "│           │\u001b[11D{#36}󰇄 desktop",
             "type": "de"
         },
         {
-            "key": "│           │\u001b[11D\u001b[31m term",
+            "key": "│           │\u001b[11D{#31} term",
             "type": "terminal"
         },
         {
-            "key": "│           │\u001b[11D\u001b[32m shell",
+            "key": "│           │\u001b[11D{#32} shell",
             "type": "shell"
         },
         {
-            "key": "│           │\u001b[11D\u001b[33m󰍛 cpu",
-            "type": "cpu"
+            "key": "│           │\u001b[11D{#33}󰍛 cpu",
+            "type": "cpu",
+            "showPeCoreCount": true
         },
         {
-            "key": "│           │\u001b[11D\u001b[34m󰉉 disk",
+            "key": "│           │\u001b[11D{#34}󰉉 disk",
             "type": "disk",
             "folders": "/"
         },
         {
-            "key": "│           │\u001b[11D\u001b[35m memory",
+            "key": "│           │\u001b[11D{#35} memory",
             "type": "memory"
         },
         {
-            "key": "│           │\u001b[11D\u001b[36m󰩟 network",
+            "key": "│           │\u001b[11D{#36}󰩟 network",
             "type": "localip",
             "format": "{1} ({4})"
         },
@@ -73,7 +75,7 @@
             "type": "custom"
         },
         {
-            "key": "│           │\u001b[11D\u001b[m colors",
+            "key": "│           │\u001b[11D{#39} colors",
             "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,87 @@
+// 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"
+        },
+        {
+            // draw borders first to make colors of left and right border consistant
+            "key": "•           •\u001b[11D{#31} user",
+            "type": "title",
+            "format": "{1}"
+        },
+        {
+            "key": "•           •\u001b[11D{#32}󰇅 hname",
+            "type": "title",
+            "format": "{2}"
+        },
+        {
+            "key": "•           •\u001b[11D{#33}󰅐 uptime",
+            "type": "uptime"
+        },
+        {
+            "key": "•           •\u001b[11D{#34}󰟾 distro",
+            "type": "os"
+        },
+        {
+            "key": "•           •\u001b[11D{#35} kernel",
+            "type": "kernel"
+        },
+        {
+            "key": "•           •\u001b[11D{#36}󰇄 desktop",
+            "type": "de"
+        },
+        {
+            "key": "•           •\u001b[11D{#31} term",
+            "type": "terminal"
+        },
+        {
+            "key": "•           •\u001b[11D{#32} shell",
+            "type": "shell"
+        },
+        {
+            "key": "•           •\u001b[11D{#33}󰍛 cpu",
+            "type": "cpu",
+            "showPeCoreCount": true
+        },
+        {
+            "key": "•           •\u001b[11D{#34}󰉉 disk",
+            "type": "disk",
+            "folders": "/"
+        },
+        {
+            "key": "•           •\u001b[11D{#35} memory",
+            "type": "memory"
+        },
+        {
+            "key": "•           •\u001b[11D{#36}󰩟 network",
+            "type": "localip",
+            "format": "{1} ({4})"
+        },
+        {
+            "key": "•••••••••••••",
+            "type": "custom"
+        },
+        {
+            "key": "•           •\u001b[11D{#39} colors",
+            "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,83 @@
+{
+    "$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"
+        }
+    },
+    "modules": [
+        {
+            "format": "{#1}{#keys}╭───────────────────────────────────────────────────────────────────────────╮\u001b[76D {6}{7}{8} 🖥  ",
+            "type": "title"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#31} kernel   ",
+            "type": "kernel"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#32}󰅐 uptime   ",
+            "type": "uptime"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#33}󰟾 distro   ",
+            "type": "os"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#34}󰇄 desktop  ",
+            "type": "de"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#35} term     ",
+            "type": "terminal"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#36} shell    ",
+            "type": "shell"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#35}󰍛 cpu      ",
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "temp": true
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#34}󰍛 gpu      ",
+            "type": "gpu"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#33}󰉉 disk     ",
+            "type": "disk",
+            "folders": "/"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#32} memory   ",
+            "type": "memory"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#31}󰩟 network  ",
+            "type": "localip",
+            "format": "{1} ({4})"
+        },
+        {
+            "format": "{#1}{#keys}├───────────────────────────────────────────────────────────────────────────┤",
+            "type": "custom"
+        },
+        {
+            "key": "│\u001b[75C│\u001b[75D{#39} colors   ",
+            "type": "colors",
+            "symbol": "circle"
+        },
+        {
+            "format": "{#1}{#keys}╰───────────────────────────────────────────────────────────────────────────╯",
+            "type": "custom"
+        }
+    ]
+}

presets/examples/18.jsonc

@@ -0,0 +1,83 @@
+{
+    "$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"
+        }
+    },
+    "modules": [
+        {
+            "format": "{#1}{#keys}╔═══════════════════════════════════════════════════════════════════════════╗\u001b[76D {6}{7}{8} 💻 ",
+            "type": "title"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#31} kernel   ",
+            "type": "kernel"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#32}󰅐 uptime   ",
+            "type": "uptime"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#33}󰟾 distro   ",
+            "type": "os"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#34}󰇄 desktop  ",
+            "type": "de"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#35} term     ",
+            "type": "terminal"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#36} shell    ",
+            "type": "shell"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#35}󰍛 cpu      ",
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "temp": true
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#34}󰍛 gpu      ",
+            "type": "gpu"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#33}󰉉 disk     ",
+            "type": "disk",
+            "folders": "/"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#32} memory   ",
+            "type": "memory"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#31}󰩟 network  ",
+            "type": "localip",
+            "format": "{1} ({4})"
+        },
+        {
+            "format": "{#1}{#keys}╠═══════════════════════════════════════════════════════════════════════════╣",
+            "type": "custom"
+        },
+        {
+            "key": "║\u001b[75C║\u001b[75D{#39} colors   ",
+            "type": "colors",
+            "symbol": "circle"
+        },
+        {
+            "format": "{#1}{#keys}╚═══════════════════════════════════════════════════════════════════════════╝",
+            "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",
+        "separate": true,
+        "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,7 +5,7 @@
     "$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
     // },
@@ -15,7 +15,8 @@
     "modules": [
         {
             "type": "custom", // HardwareStart
-            "format": "┌─────────── \u001b[1mHardware Information\u001b[0m ───────────┐" // `\u001b` is `\033`, or `\e`
+            // {#1} is equivalent to `\u001b[1m`. {#} is equivalent to `\u001b[m`
+            "format": "┌─────────── {#1}Hardware Information{#} ───────────┐"
         },
         {
             "type": "host",
@@ -71,7 +72,7 @@
         },
         {
             "type": "custom", // SoftwareStart
-            "format": "├─────────── \u001b[1mSoftware Information\u001b[0m ───────────┤"
+            "format": "├─────────── {#1}Software Information{#} ───────────┤"
         },
         {
             "type": "title",

presets/examples/20.jsonc

@@ -0,0 +1,160 @@
+// 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
+        }
+    },
+    "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         │\u001b[42C"
+        },
+        {
+            "type": "kernel",
+            "key": "│ KERNEL     │\u001b[42C"
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "title",
+            "key": "│ HOSTNAME   │\u001b[42C",
+            "format": "{host-name}"
+        },
+        {
+            "type": "localip",
+            "key": "│ CLIENT IP  │\u001b[42C",
+            "format": "{ipv4}"
+        },
+        {
+            "type": "localip",
+            "key": "│ MAC ADDR   │\u001b[42C",
+            "format": "{mac} ({ifname})",
+            "showIPv4": false,
+            "showMac": true
+        },
+        {
+            "type": "dns",
+            "key": "│ DNS        │\u001b[42C",
+            "showType": "ipv4"
+        },
+        {
+            "type": "title",
+            "key": "│ USER       │\u001b[42C",
+            "format": "{user-name}"
+        },
+        {
+            "type": "host",
+            "key": "│ MACHINE    │\u001b[42C",
+            "format": "{name}"
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "cpu",
+            "key": "│ PROCESSOR  │\u001b[42C",
+            "format": "{name}"
+        },
+        {
+            "type": "cpu",
+            "key": "│ CORES      │\u001b[42C",
+            "format": "{cores-physical} PHYSICAL CORES / {cores-logical} THREADS",
+            "showPeCoreCount": false
+        },
+        {
+            "type": "cpu",
+            "key": "│ CPU FREQ   │\u001b[42C",
+            "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│\u001b[42C"
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "memory",
+            "key": "│ MEMORY     │\u001b[42C",
+            "format": "{used} / {total} [{percentage}]"
+        },
+        {
+            "type": "memory",
+            "key": "│ USAGE      │\u001b[42C",
+            "format": ""
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "disk",
+            "key": "│ VOLUME     │\u001b[42C",
+            "format": "{size-used} / {size-total} [{size-percentage}]",
+            "folders": "/"
+        },
+        {
+            "type": "disk",
+            "key": "│ DISK USAGE │\u001b[42C",
+            "format": ""
+        },
+        {
+            "type": "custom",
+            "format": "├────────────┼──────────────────────────────────────────┤"
+        },
+        {
+            "type": "users",
+            "key": "│ LAST LOGIN │\u001b[42C",
+            "format": "{login-time}{?client-ip} ({client-ip})",
+            "myselfOnly": true
+        },
+        {
+            "type": "uptime",
+            "key": "│ UPTIME     │\u001b[42C"
+        },
+        {
+            "type": "custom",
+            "format": "└────────────┴──────────────────────────────────────────┘"
+        }
+    ]
+  }

presets/examples/21.jsonc

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

presets/examples/22.jsonc

@@ -0,0 +1,109 @@
+// 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": " | "
+    },
+    "modules": [
+        {
+            "type": "kernel",
+            "key": " /\\rch Linux",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "custom",
+            "format": ">-----------<+>------------------------------------------<",
+            "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": ">-----------<+>------------------------------------------<",
+            "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": ">-----------<+>------------------------------------------<",
+            "outputColor": "separator"
+        },
+        "break",
+        {
+            "type": "colors",
+            "paddingLeft": 15
+        }
+    ]
+}

presets/examples/7.jsonc

@@ -24,7 +24,7 @@
             "type": "os",
             "key": "├", // Just get your distro's logo off nerdfonts.com
             "keyColor": "yellow",
-            "format": "{6}{?6} {?}{10} {8}"
+            "format": "{6}{?6} {?}{10}{?10} {?}{8}{?8} {?}{11}"
         },
         {
             "type": "kernel",

presets/examples/8.jsonc

@@ -24,29 +24,29 @@
         },
         {
             "type": "os",
-            "key": "",
+            "key": "",
             "format": "{2} {8}"
         },
         {
             "type": "kernel",
-            "key": ""
+            "key": ""
         },
         {
             "type": "memory",
-            "key": "󰻠"
+            "key": ""
         },
         {
             "type": "packages",
-            "key": ""
+            "key": "󰏖"
         },
         {
             "type": "uptime",
-            "key": ""
+            "key": "󰅐"
         },
         {
             "type": "custom",
             "key": "",
-            "format": "\u001b[31m███\u001b[32m███\u001b[33m███\u001b[34m███\u001b[35m███\u001b[36m███"
+            "format": "{#31}███{#32}███{#33}███{#34}███{#35}███{#36}███"
         }
     ]
 }

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/nvml/repo.json

@@ -1,6 +0,0 @@
-{
-    "home": "https://github.com/NVIDIA/nvidia-settings/blob/main/src/nvml.h",
-    "license": "Embed in source",
-    "version": "550.54.14",
-    "author": "NVIDIA Corporation"
-}

src/common/format.c

@@ -52,14 +52,29 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
  * @param placeholderValue the string to parse
  * @return uint32_t the parsed value
  */
-static inline uint32_t getArgumentIndex(const FFstrbuf* placeholderValue)
+static uint32_t getArgumentIndex(const FFstrbuf* placeholderValue, uint32_t numArgs, const FFformatarg* arguments)
 {
-    uint32_t result = UINT32_MAX;
+    char firstChar = placeholderValue->chars[0];
 
-    if(placeholderValue->chars[0] != '-')
-        sscanf(placeholderValue->chars, "%" PRIu32, &result);
+    if(firstChar >= '1' && firstChar <= '9')
+    {
+        char* pEnd = NULL;
+        unsigned long result = strtoul(placeholderValue->chars, &pEnd, 10);
+        if (pEnd != placeholderValue->chars + placeholderValue->length || result > numArgs)
+            return UINT32_MAX;
+        return (uint32_t) 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))
+                return i + 1;
+        }
+    }
 
-    return result == 0 ? UINT32_MAX : result;
+    return UINT32_MAX;
 }
 
 static inline void appendInvalidPlaceholder(FFstrbuf* buffer, const char* start, const FFstrbuf* placeholderValue, uint32_t index, uint32_t formatStringLength)
@@ -101,7 +116,8 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
 
     uint32_t numOpenIfs = 0;
     uint32_t numOpenNotIfs = 0;
-    uint32_t numOpenColors = 0;
+
+    FF_STRBUF_AUTO_DESTROY placeholderValue = ffStrbufCreate();
 
     for(uint32_t i = 0; i < formatstr->length; ++i)
     {
@@ -136,67 +152,70 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
             continue;
         }
 
-        FF_STRBUF_AUTO_DESTROY placeholderValue = ffStrbufCreate();
+        ffStrbufClear(&placeholderValue);
 
-        while(i < formatstr->length && formatstr->chars[i] != '}')
-            ffStrbufAppendC(&placeholderValue, formatstr->chars[i++]);
-
-         // test if for stop, if so break the loop
-        if(placeholderValue.length == 1 && placeholderValue.chars[0] == '-')
-            break;
-
-        // test for end of an if, if so do nothing
-        if(placeholderValue.length == 1 && placeholderValue.chars[0] == '?')
         {
-            if(numOpenIfs == 0)
-                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-            else
-                --numOpenIfs;
-
-            continue;
+            uint32_t iEnd = ffStrbufNextIndexC(formatstr, i, '}');
+            ffStrbufAppendNS(&placeholderValue, iEnd - i, &formatstr->chars[i]);
+            i = iEnd;
         }
 
-        // test for end of a not if, if so do nothing
-        if(placeholderValue.length == 1 && placeholderValue.chars[0] == '/')
-        {
-            if(numOpenNotIfs == 0)
-                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-            else
-                --numOpenNotIfs;
+        char firstChar = placeholderValue.chars[0];
 
-            continue;
-        }
-
-        // test for end of a color, if so do nothing
-        if(placeholderValue.length == 1 && placeholderValue.chars[0] == '#')
+        if (placeholderValue.length == 1)
         {
-            if(numOpenColors == 0)
-                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-            else
+            // test if for stop, if so break the loop
+            if (firstChar == '-')
+                break;
+
+            // test for end of an if, if so do nothing
+            if (firstChar == '?')
             {
-                ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
-                --numOpenColors;
+                if(numOpenIfs == 0)
+                    appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
+                else
+                    --numOpenIfs;
+
+                continue;
             }
 
-            continue;
+            // test for end of a not if, if so do nothing
+            if (firstChar == '/')
+            {
+                if(numOpenNotIfs == 0)
+                    appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
+                else
+                    --numOpenNotIfs;
+
+                continue;
+            }
+
+            // test for end of a color, if so do nothing
+            if (firstChar == '#')
+            {
+                if (!instance.config.display.pipe)
+                    ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
+
+                continue;
+            }
         }
 
         // test for if, if so evaluate it
-        if(placeholderValue.chars[0] == '?')
+        if (firstChar == '?')
         {
             ffStrbufSubstrAfter(&placeholderValue, 0);
 
-            uint32_t index = getArgumentIndex(&placeholderValue);
+            uint32_t index = getArgumentIndex(&placeholderValue, numArgs, arguments);
 
             // testing for an invalid index
-            if(index > numArgs)
+            if (index > numArgs)
             {
                 appendInvalidPlaceholder(buffer, "{?", &placeholderValue, i, formatstr->length);
                 continue;
             }
 
             // continue normally if an format arg is set and the value is > 0
-            if(formatArgSet(&arguments[index - 1]))
+            if (formatArgSet(&arguments[index - 1]))
             {
                 ++numOpenIfs;
                 continue;
@@ -208,21 +227,21 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
         }
 
         // test for not if, if so evaluate it
-        if(placeholderValue.chars[0] == '/')
+        if (firstChar == '/')
         {
             ffStrbufSubstrAfter(&placeholderValue, 0);
 
-            uint32_t index = getArgumentIndex(&placeholderValue);
+            uint32_t index = getArgumentIndex(&placeholderValue, numArgs, arguments);
 
             // testing for an invalid index
-            if(index > numArgs)
+            if (index > numArgs)
             {
                 appendInvalidPlaceholder(buffer, "{/", &placeholderValue, i, formatstr->length);
                 continue;
             }
 
             //continue normally if an format arg is not set or the value is 0
-            if(!formatArgSet(&arguments[index - 1]))
+            if (!formatArgSet(&arguments[index - 1]))
             {
                 ++numOpenNotIfs;
                 continue;
@@ -234,20 +253,21 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
         }
 
         //test for color, if so evaluate it
-        if(placeholderValue.chars[0] == '#')
+        if (firstChar == '#')
         {
-            ++numOpenColors;
-            ffStrbufSubstrAfter(&placeholderValue, 0);
-            ffStrbufAppendS(buffer, "\033[");
-            ffStrbufAppend(buffer, &placeholderValue);
-            ffStrbufAppendC(buffer, 'm');
+            if (!instance.config.display.pipe)
+            {
+                ffStrbufAppendS(buffer, "\e[");
+                ffOptionParseColorNoClear(placeholderValue.chars + 1, buffer);
+                ffStrbufAppendC(buffer, 'm');
+            }
             continue;
         }
 
-        uint32_t index = getArgumentIndex(&placeholderValue);
+        uint32_t index = getArgumentIndex(&placeholderValue, numArgs, arguments);
 
         // test for invalid index
-        if(index > numArgs)
+        if (index > numArgs)
         {
             appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
             continue;
@@ -256,5 +276,6 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
         ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
     }
 
-    ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
+    if (!instance.config.display.pipe)
+        ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
 }

src/common/format.h

@@ -20,6 +20,7 @@ typedef struct FFformatarg
 {
     FFformatargtype type;
     const void* value;
+    const char* name; // argument name, must start with an alphabet
 } FFformatarg;
 
 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);

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);

src/common/io/io_unix.c

@@ -204,7 +204,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 +225,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/library.c

@@ -1,6 +1,8 @@
 #include "fastfetch.h"
 #include "common/library.h"
 
+#ifndef FF_DISABLE_DLOPEN
+
 #include <stdarg.h>
 
 //Clang doesn't define __SANITIZE_ADDRESS__ but defines __has_feature(address_sanitizer)
@@ -77,3 +79,5 @@ void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...)
 
     return result;
 }
+
+#endif

src/common/library.h

@@ -3,6 +3,8 @@
 #include "fastfetch.h"
 #include "util/FFcheckmacros.h"
 
+#ifndef FF_DISABLE_DLOPEN
+
 #if defined(_WIN32)
     #include <libloaderapi.h>
     #define FF_DLOPEN_FLAGS 0
@@ -71,3 +73,45 @@ static inline void ffLibraryUnload(void** handle)
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);
 
 void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);
+
+#else
+
+#define FF_LIBRARY_EXTENSION ""
+
+#define FF_LIBRARY_SYMBOL(symbolName) \
+    __typeof__(&symbolName) ff ## symbolName;
+
+#define FF_LIBRARY_LOAD(libraryObjectName, userLibraryName, returnValue, ...) \
+    FF_MAYBE_UNUSED void* libraryObjectName = NULL; // Placeholder
+
+#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \
+    symbolMapping = (__typeof__(&symbolName)) &symbolName
+
+#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, symbolMapping, symbolName, alternateName, returnValue) \
+    symbolMapping = (__typeof__(&symbolName)) &symbolName
+
+#define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
+    FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
+
+#define FF_LIBRARY_LOAD_SYMBOL_LAZY(library, symbolName) \
+    FF_MAYBE_UNUSED __typeof__(&symbolName) ff ## symbolName = (__typeof__(&symbolName)) &symbolName;
+
+#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
+    FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
+
+#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE2(library, symbolName, alternateName) \
+    FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
+
+#define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, returnValue);
+
+#define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(library, varName, symbolName) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
+
+#define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE2(library, varName, symbolName, alternateName) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, (varName).ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
+
+#define FF_LIBRARY_LOAD_SYMBOL_PTR(library, varName, symbolName, returnValue) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);
+
+#endif

src/common/modules.c

@@ -9,6 +9,7 @@ static FFModuleBaseInfo* B[] = {
     (void*) &instance.config.modules.bios,
     (void*) &instance.config.modules.bluetooth,
     (void*) &instance.config.modules.board,
+    (void*) &instance.config.modules.bootmgr,
     (void*) &instance.config.modules.break_,
     (void*) &instance.config.modules.brightness,
     NULL,
@@ -20,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,
@@ -32,10 +34,12 @@ static FFModuleBaseInfo* D[] = {
     (void*) &instance.config.modules.display,
     (void*) &instance.config.modules.disk,
     (void*) &instance.config.modules.diskIo,
+    (void*) &instance.config.modules.dns,
     NULL,
 };
 
 static FFModuleBaseInfo* E[] = {
+    (void*) &instance.config.modules.editor,
     NULL,
 };
 
@@ -57,6 +61,7 @@ static FFModuleBaseInfo* H[] = {
 
 static FFModuleBaseInfo* I[] = {
     (void*) &instance.config.modules.icons,
+    (void*) &instance.config.modules.initSystem,
     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"
@@ -145,49 +146,55 @@ bool ffOptionParseBoolean(const char* str)
     );
 }
 
-void ffOptionParseColor(const char* value, FFstrbuf* buffer)
+void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
 {
-    ffStrbufClear(buffer);
     ffStrbufEnsureFree(buffer, 63);
 
     while(*value != '\0')
     {
         #define FF_APPEND_COLOR_CODE_COND(prefix, code) \
-            if(ffStrStartsWithIgnCase(value, #prefix)) { ffStrbufAppendS(buffer, code); value += strlen(#prefix); }
+            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; }
 
-        FF_APPEND_COLOR_CODE_COND(reset_, FF_COLOR_MODE_RESET)
-        else FF_APPEND_COLOR_CODE_COND(bright_, FF_COLOR_MODE_BOLD)
-        else FF_APPEND_COLOR_CODE_COND(dim_, FF_COLOR_MODE_DIM)
-        else FF_APPEND_COLOR_CODE_COND(italic_, FF_COLOR_MODE_ITALIC)
-        else FF_APPEND_COLOR_CODE_COND(underline_, FF_COLOR_MODE_UNDERLINE)
-        else FF_APPEND_COLOR_CODE_COND(blink_, FF_COLOR_MODE_BLINK)
-        else FF_APPEND_COLOR_CODE_COND(inverse_, FF_COLOR_MODE_INVERSE)
-        else FF_APPEND_COLOR_CODE_COND(hidden_, FF_COLOR_MODE_HIDDEN)
-        else FF_APPEND_COLOR_CODE_COND(strike_, FF_COLOR_MODE_STRIKETHROUGH)
-        else FF_APPEND_COLOR_CODE_COND(black, FF_COLOR_FG_BLACK)
-        else FF_APPEND_COLOR_CODE_COND(red, FF_COLOR_FG_RED)
-        else FF_APPEND_COLOR_CODE_COND(green, FF_COLOR_FG_GREEN)
-        else FF_APPEND_COLOR_CODE_COND(yellow, FF_COLOR_FG_YELLOW)
-        else FF_APPEND_COLOR_CODE_COND(blue, FF_COLOR_FG_BLUE)
-        else FF_APPEND_COLOR_CODE_COND(magenta, FF_COLOR_FG_MAGENTA)
-        else FF_APPEND_COLOR_CODE_COND(cyan, FF_COLOR_FG_CYAN)
-        else FF_APPEND_COLOR_CODE_COND(white, FF_COLOR_FG_WHITE)
-        else FF_APPEND_COLOR_CODE_COND(default, FF_COLOR_FG_DEFAULT)
-        else FF_APPEND_COLOR_CODE_COND(light_black, FF_COLOR_FG_LIGHT_BLACK)
-        else FF_APPEND_COLOR_CODE_COND(light_red, FF_COLOR_FG_LIGHT_RED)
-        else FF_APPEND_COLOR_CODE_COND(light_green, FF_COLOR_FG_LIGHT_GREEN)
-        else FF_APPEND_COLOR_CODE_COND(light_yellow, FF_COLOR_FG_LIGHT_YELLOW)
-        else FF_APPEND_COLOR_CODE_COND(light_blue, FF_COLOR_FG_LIGHT_BLUE)
-        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
+        if (ffCharIsEnglishAlphabet(value[0]))
         {
-            ffStrbufAppendC(buffer, *value);
-            ++value;
+            FF_APPEND_COLOR_CODE_COND(reset_, FF_COLOR_MODE_RESET)
+            else FF_APPEND_COLOR_CODE_COND(bright_, FF_COLOR_MODE_BOLD)
+            else FF_APPEND_COLOR_CODE_COND(dim_, FF_COLOR_MODE_DIM)
+            else FF_APPEND_COLOR_CODE_COND(italic_, FF_COLOR_MODE_ITALIC)
+            else FF_APPEND_COLOR_CODE_COND(underline_, FF_COLOR_MODE_UNDERLINE)
+            else FF_APPEND_COLOR_CODE_COND(blink_, FF_COLOR_MODE_BLINK)
+            else FF_APPEND_COLOR_CODE_COND(inverse_, FF_COLOR_MODE_INVERSE)
+            else FF_APPEND_COLOR_CODE_COND(hidden_, FF_COLOR_MODE_HIDDEN)
+            else FF_APPEND_COLOR_CODE_COND(strike_, FF_COLOR_MODE_STRIKETHROUGH)
+            else FF_APPEND_COLOR_CODE_COND(black, FF_COLOR_FG_BLACK)
+            else FF_APPEND_COLOR_CODE_COND(red, FF_COLOR_FG_RED)
+            else FF_APPEND_COLOR_CODE_COND(green, FF_COLOR_FG_GREEN)
+            else FF_APPEND_COLOR_CODE_COND(yellow, FF_COLOR_FG_YELLOW)
+            else FF_APPEND_COLOR_CODE_COND(blue, FF_COLOR_FG_BLUE)
+            else FF_APPEND_COLOR_CODE_COND(magenta, FF_COLOR_FG_MAGENTA)
+            else FF_APPEND_COLOR_CODE_COND(cyan, FF_COLOR_FG_CYAN)
+            else FF_APPEND_COLOR_CODE_COND(white, FF_COLOR_FG_WHITE)
+            else FF_APPEND_COLOR_CODE_COND(default, FF_COLOR_FG_DEFAULT)
+            else FF_APPEND_COLOR_CODE_COND(light_black, FF_COLOR_FG_LIGHT_BLACK)
+            else FF_APPEND_COLOR_CODE_COND(light_red, FF_COLOR_FG_LIGHT_RED)
+            else FF_APPEND_COLOR_CODE_COND(light_green, FF_COLOR_FG_LIGHT_GREEN)
+            else FF_APPEND_COLOR_CODE_COND(light_yellow, FF_COLOR_FG_LIGHT_YELLOW)
+            else FF_APPEND_COLOR_CODE_COND(light_blue, FF_COLOR_FG_LIGHT_BLUE)
+            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/option.h

@@ -67,6 +67,11 @@ FF_C_NODISCARD uint32_t ffOptionParseUInt32(const char* argumentKey, const char*
 FF_C_NODISCARD int32_t ffOptionParseInt32(const char* argumentKey, const char* value);
 FF_C_NODISCARD int ffOptionParseEnum(const char* argumentKey, const char* requestedKey, FFKeyValuePair pairs[]);
 FF_C_NODISCARD bool ffOptionParseBoolean(const char* str);
-void ffOptionParseColor(const char* value, FFstrbuf* buffer);
+void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer);
+static inline void ffOptionParseColor(const char* value, FFstrbuf* buffer)
+{
+    ffStrbufClear(buffer);
+    ffOptionParseColorNoClear(value, buffer);
+}
 void ffOptionInitModuleArg(FFModuleArgs* args);
 void ffOptionDestroyModuleArg(FFModuleArgs* args);

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)
@@ -50,14 +49,34 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig con
         {
             if(!options->pipe)
             {
-                uint32_t section1Begin = (uint32_t) ((green <= yellow ? green : yellow) / 100.0 * options->barWidth + 0.5);
-                uint32_t section2Begin = (uint32_t) ((green > yellow ? green : yellow) / 100.0 * options->barWidth + 0.5);
-                if (i == section2Begin)
-                    ffStrbufAppendF(buffer, "\e[%sm", (green > yellow ? colorGreen : colorRed));
-                else if (i == section1Begin)
-                    ffStrbufAppendF(buffer, "\e[%sm", colorYellow);
-                else if (i == 0)
-                    ffStrbufAppendF(buffer, "\e[%sm", (green <= yellow ? colorGreen : colorRed));
+                if (options->percentType & FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT)
+                {
+                    const char* color = NULL;
+                    if (green <= yellow)
+                    {
+                        if (percent < green) color = colorGreen;
+                        else if (percent < yellow) color = colorYellow;
+                        else color = colorRed;
+                    }
+                    else
+                    {
+                        if (percent < yellow) color = colorRed;
+                        else if (percent < green) color = colorYellow;
+                        else color = colorGreen;
+                    }
+                    ffStrbufAppendF(buffer, "\e[%sm", color);
+                }
+                else
+                {
+                    uint32_t section1Begin = (uint32_t) ((green <= yellow ? green : yellow) / 100.0 * options->barWidth + 0.5);
+                    uint32_t section2Begin = (uint32_t) ((green > yellow ? green : yellow) / 100.0 * options->barWidth + 0.5);
+                    if (i == section2Begin)
+                        ffStrbufAppendF(buffer, "\e[%sm", (green > yellow ? colorGreen : colorRed));
+                    else if (i == section1Begin)
+                        ffStrbufAppendF(buffer, "\e[%sm", colorYellow);
+                    else if (i == 0)
+                        ffStrbufAppendF(buffer, "\e[%sm", (green <= yellow ? colorGreen : colorRed));
+                }
             }
             ffStrbufAppend(buffer, &options->barCharElapsed);
         }
@@ -71,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/percent.h

@@ -4,12 +4,13 @@
 #include "common/parsing.h"
 #include "common/option.h"
 
-enum
+enum FFPercentageTypeFlags
 {
     FF_PERCENTAGE_TYPE_NUM_BIT = 1 << 0,
     FF_PERCENTAGE_TYPE_BAR_BIT = 1 << 1,
     FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT = 1 << 2,
     FF_PERCENTAGE_TYPE_NUM_COLOR_BIT = 1 << 3,
+    FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT = FF_PERCENTAGE_TYPE_NUM_COLOR_BIT,
 };
 
 // if (green <= yellow)

src/common/printing.c

@@ -11,43 +11,56 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
         return;
 
     //This is used as a magic value for hiding keys
-    if(moduleArgs && ffStrbufEqualS(&moduleArgs->key, " "))
-        return;
-
-    if(!instance.config.display.pipe)
+    if (!(moduleArgs && ffStrbufEqualS(&moduleArgs->key, " ")))
     {
-        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
-        if (instance.config.display.brightColor)
-            fputs(FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
+        if(!instance.config.display.pipe)
+        {
+            fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+            if (instance.config.display.brightColor)
+                fputs(FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
 
-        if(moduleArgs && !(printType & FF_PRINT_TYPE_NO_CUSTOM_KEY_COLOR) && moduleArgs->keyColor.length > 0)
-            ffPrintColor(&moduleArgs->keyColor);
+            if(moduleArgs && !(printType & FF_PRINT_TYPE_NO_CUSTOM_KEY_COLOR) && moduleArgs->keyColor.length > 0)
+                ffPrintColor(&moduleArgs->keyColor);
+            else
+                ffPrintColor(&instance.config.display.colorKeys);
+        }
+
+        //NULL check is required for modules with custom keys, e.g. disk with the folder path
+        if((printType & FF_PRINT_TYPE_NO_CUSTOM_KEY) || !moduleArgs || moduleArgs->key.length == 0)
+        {
+            fputs(moduleName, stdout);
+
+            if(moduleIndex > 0)
+                printf(" %hhu", moduleIndex);
+        }
         else
-            ffPrintColor(&instance.config.display.colorKeys);
+        {
+            FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
+            FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, 1, ((FFformatarg[]){
+                {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex, "index"},
+            }));
+            ffStrbufWriteTo(&key, stdout);
+        }
+
+        if(!instance.config.display.pipe)
+        {
+            fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+            ffPrintColor(&instance.config.display.colorSeparator);
+        }
+
+        ffStrbufWriteTo(&instance.config.display.keyValueSeparator, stdout);
+
+        if(!instance.config.display.pipe && instance.config.display.colorSeparator.length)
+            fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
+
+        if (!(printType & FF_PRINT_TYPE_NO_CUSTOM_KEY_WIDTH))
+        {
+            uint32_t keyWidth = moduleArgs && moduleArgs->keyWidth > 0 ? moduleArgs->keyWidth : instance.config.display.keyWidth;
+            if (keyWidth > 0)
+                printf("\e[%uG", (unsigned) (keyWidth + instance.state.logoWidth));
+        }
     }
 
-    //NULL check is required for modules with custom keys, e.g. disk with the folder path
-    if((printType & FF_PRINT_TYPE_NO_CUSTOM_KEY) || !moduleArgs || moduleArgs->key.length == 0)
-    {
-        fputs(moduleName, stdout);
-
-        if(moduleIndex > 0)
-            printf(" %hhu", moduleIndex);
-    }
-    else
-    {
-        FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
-        FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, 1, ((FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex}
-        }));
-        ffStrbufWriteTo(&key, stdout);
-    }
-
-    if(!instance.config.display.pipe)
-        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
-
-    ffStrbufWriteTo(&instance.config.display.keyValueSeparator, stdout);
-
     if(!instance.config.display.pipe)
     {
         fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
@@ -56,13 +69,6 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
         else if (instance.config.display.colorOutput.length)
             ffPrintColor(&instance.config.display.colorOutput);
     }
-
-    if (!instance.config.display.pipe && !(printType & FF_PRINT_TYPE_NO_CUSTOM_KEY_WIDTH))
-    {
-        uint32_t keyWidth = moduleArgs && moduleArgs->keyWidth > 0 ? moduleArgs->keyWidth : instance.config.display.keyWidth;
-        if (keyWidth > 0)
-            printf("\e[%uG", (unsigned) (keyWidth + instance.state.logoWidth));
-    }
 }
 
 void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments)
@@ -73,11 +79,8 @@ void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleAr
     else
         ffStrbufAppendS(&buffer, "unknown");
 
-    if(buffer.length > 0)
-    {
-        ffPrintLogoAndKey(moduleName, moduleIndex, moduleArgs, printType);
-        ffStrbufPutTo(&buffer, stdout);
-    }
+    ffPrintLogoAndKey(moduleName, moduleIndex, moduleArgs, printType);
+    ffStrbufPutTo(&buffer, stdout);
 }
 
 static void printError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, va_list arguments)

src/common/processing.h

@@ -2,6 +2,8 @@
 
 #include "util/FFstrbuf.h"
 
+#include <sys/types.h>
+
 const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr);
 
 static inline const char* ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[])
@@ -19,3 +21,10 @@ static inline const char* ffProcessAppendStdErr(FFstrbuf* buffer, char* const ar
         ffStrbufTrimRightSpace(buffer);
     return error;
 }
+
+#ifdef _WIN32
+bool ffProcessGetInfoWindows(uint32_t pid, uint32_t* ppid, FFstrbuf* pname, FFstrbuf* exe, const char** exeName, FFstrbuf* exePath, bool* gui);
+#else
+void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, const char** exeName, FFstrbuf* exePath);
+const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, int32_t* tty);
+#endif

src/common/processing_linux.c

@@ -2,6 +2,8 @@
 #include "common/processing.h"
 #include "common/io/io.h"
 #include "common/time.h"
+#include "util/stringUtils.h"
+#include "util/mallocHelper.h"
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -11,6 +13,17 @@
 #include <errno.h>
 #include <sys/wait.h>
 
+#if defined(__FreeBSD__) || defined(__APPLE__)
+    #include <sys/types.h>
+    #include <sys/user.h>
+    #include <sys/sysctl.h>
+#endif
+#if defined(__APPLE__)
+    #include <libproc.h>
+#elif defined(__sun)
+    #include <procfs.h>
+#endif
+
 enum { FF_PIPE_BUFSIZ = 8192 };
 
 static inline int ffPipe2(int *fds, int flags)
@@ -101,3 +114,270 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
 
     return "read(childPipeFd, str, FF_PIPE_BUFSIZ) failed";
 }
+
+void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, const char** exeName, FFstrbuf* exePath)
+{
+    assert(processName->length > 0);
+    ffStrbufClear(exe);
+
+    #ifdef __linux__
+
+    char filePath[64];
+    snprintf(filePath, sizeof(filePath), "/proc/%d/cmdline", (int)pid);
+
+    if(ffReadFileBuffer(filePath, exe))
+    {
+        ffStrbufRecalculateLength(exe); //Trim the arguments
+        ffStrbufTrimRightSpace(exe);
+        ffStrbufTrimLeft(exe, '-'); //Login shells start with a dash
+    }
+
+    if (exePath)
+    {
+        snprintf(filePath, sizeof(filePath), "/proc/%d/exe", (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;
+        }
+    }
+
+    #elif defined(__APPLE__)
+
+    size_t len = 0;
+    int mibs[] = { CTL_KERN, KERN_PROCARGS2, pid };
+    if (sysctl(mibs, sizeof(mibs) / sizeof(*mibs), NULL, &len, NULL, 0) == 0)
+    {// try get arg0
+        #ifndef MAC_OS_X_VERSION_10_15
+        //don't know why if don't let len longer, proArgs2 and len will change during the following sysctl() in old MacOS version.
+        len++;
+        #endif
+        FF_AUTO_FREE char* const procArgs2 = malloc(len);
+        if (sysctl(mibs, sizeof(mibs) / sizeof(*mibs), procArgs2, &len, NULL, 0) == 0)
+        {
+            // https://gist.github.com/nonowarn/770696#file-getargv-c-L46
+            uint32_t argc = *(uint32_t*) procArgs2;
+            const char* realExePath = procArgs2 + sizeof(argc);
+
+            const char* arg0 = memchr(realExePath, '\0', len - (size_t) (realExePath - procArgs2));
+            if (exePath)
+                ffStrbufSetNS(exePath, (uint32_t) (arg0 - realExePath), realExePath);
+
+            do arg0++; while (*arg0 == '\0');
+            assert(arg0 < procArgs2 + len);
+
+            if (argc > 1)
+            {
+                // #977
+                const char* p = strrchr(arg0, '/');
+                if (p)
+                    p++;
+                else
+                    p = arg0;
+                if (ffStrStartsWithIgnCase(p, "python")) // /opt/homebrew/Cellar/python@3.12/3.12.3/Frameworks/Python.framework/Versions/3.12/Resources/Python.app/Contents/MacOS/Python /Users/carter/.local/bin/xonsh
+                    arg0 = p + strlen(p) + 1;
+            }
+
+            if (*arg0 == '-') arg0++; // Login shells
+
+            ffStrbufSetS(exe, arg0);
+        }
+    }
+    else
+    {
+        ffStrbufEnsureFixedLengthFree(exe, PATH_MAX);
+        int length = proc_pidpath(pid, exe->chars, exe->allocated);
+        if (length > 0)
+        {
+            exe->length = (uint32_t) length;
+            if (exePath)
+                ffStrbufSet(exePath, exe);
+        }
+    }
+
+    #elif defined(__FreeBSD__)
+
+    size_t size = ARG_MAX;
+    FF_AUTO_FREE char* args = malloc(size);
+
+    static_assert(ARG_MAX > PATH_MAX, "");
+
+    if(exePath && sysctl(
+        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid}, 4,
+        args, &size,
+        NULL, 0
+    ) == 0)
+        ffStrbufSetNS(exePath, (uint32_t) (size - 1), args);
+
+    size = ARG_MAX;
+    if(sysctl(
+        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_ARGS, pid}, 4,
+        args, &size,
+        NULL, 0
+    ) == 0)
+    {
+        char* arg0 = args;
+        size_t arg0Len = strlen(args);
+        if (size > arg0Len + 1)
+        {
+            char* p = (char*) memrchr(args, '/', arg0Len);
+            if (p)
+                p++;
+            else
+                p = arg0;
+            if (ffStrStartsWith(p, "python")) // /usr/local/bin/python3.9 /home/carter/.local/bin/xonsh
+            {
+                arg0 += arg0Len + 1;
+            }
+        }
+        if (arg0[0] == '-') arg0++;
+        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)
+        ffStrbufSet(exe, processName);
+
+    assert(exe->length > 0);
+    uint32_t lastSlashIndex = ffStrbufLastIndexC(exe, '/');
+    if(lastSlashIndex < exe->length)
+        *exeName = exe->chars + lastSlashIndex + 1;
+}
+
+const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, int32_t* tty)
+{
+    if (pid <= 0)
+        return "Invalid pid";
+
+    #ifdef __linux__
+
+    char procFilePath[64];
+    if (ppid)
+    {
+        snprintf(procFilePath, sizeof(procFilePath), "/proc/%d/stat", (int)pid);
+        char buf[PROC_FILE_BUFFSIZ];
+        ssize_t nRead = ffReadFileData(procFilePath, sizeof(buf) - 1, buf);
+        if(nRead <= 8)
+            return "ffReadFileData(/proc/pid/stat, PROC_FILE_BUFFSIZ-1, buf) failed";
+        buf[nRead] = '\0';
+
+        *ppid = 0;
+        static_assert(sizeof(*ppid) == sizeof(int), "");
+
+        ffStrbufEnsureFixedLengthFree(name, 255);
+        int tty_;
+        if(
+            sscanf(buf, "%*s (%255[^)]) %*c %d %*d %*d %d", name->chars, ppid, &tty_) < 2 || //stat (comm) state ppid pgrp session tty
+            name->chars[0] == '\0'
+        )
+            return "sscanf(stat) failed";
+
+        ffStrbufRecalculateLength(name);
+        if (tty)
+            *tty = tty_ & 0xFF;
+    }
+    else
+    {
+        snprintf(procFilePath, sizeof(procFilePath), "/proc/%d/comm", (int)pid);
+        ssize_t nRead = ffReadFileBuffer(procFilePath, name);
+        if(nRead <= 0)
+            return "ffReadFileBuffer(/proc/pid/comm, name) failed";
+        ffStrbufTrimRightSpace(name);
+    }
+
+    #elif defined(__APPLE__)
+
+    struct kinfo_proc proc;
+    size_t size = sizeof(proc);
+    if(sysctl(
+        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PID, pid}, 4,
+        &proc, &size,
+        NULL, 0
+    ))
+        return "sysctl(KERN_PROC_PID) failed";
+
+    ffStrbufSetS(name, proc.kp_proc.p_comm); //trancated to 16 chars
+    if (ppid)
+        *ppid = (pid_t)proc.kp_eproc.e_ppid;
+    if (tty)
+    {
+        *tty = ((proc.kp_eproc.e_tdev >> 24) & 0xFF) == 0x10
+            ? proc.kp_eproc.e_tdev & 0xFFFFFF
+            : -1;
+    }
+
+    #elif defined(__FreeBSD__)
+
+    struct kinfo_proc proc;
+    size_t size = sizeof(proc);
+    if(sysctl(
+        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PID, pid}, 4,
+        &proc, &size,
+        NULL, 0
+    ))
+        return "sysctl(KERN_PROC_PID) failed";
+
+    ffStrbufSetS(name, proc.ki_comm);
+    if (ppid)
+        *ppid = (pid_t)proc.ki_ppid;
+    if (tty)
+    {
+        if (proc.ki_tdev != NODEV && proc.ki_flag & P_CONTROLT)
+        {
+            const char* ttyName = devname(proc.ki_tdev, S_IFCHR);
+            if (ffStrStartsWith(ttyName, "pts/"))
+                *tty = (int32_t) strtol(ttyName + strlen("pts/"), NULL, 10);
+            else
+                *tty = -1;
+        }
+        else
+            *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";
+
+    #endif
+
+    return NULL;
+}

src/common/processing_windows.c

@@ -3,6 +3,8 @@
 #include "common/io/io.h"
 
 #include <Windows.h>
+#include <ntstatus.h>
+#include <winternl.h>
 
 enum { FF_PIPE_BUFSIZ = 8192 };
 
@@ -124,3 +126,46 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
 
     return NULL;
 }
+
+bool ffProcessGetInfoWindows(uint32_t pid, uint32_t* ppid, FFstrbuf* pname, FFstrbuf* exe, const char** exeName, FFstrbuf* exePath, bool* gui)
+{
+    FF_AUTO_CLOSE_FD HANDLE hProcess = pid == 0
+        ? GetCurrentProcess()
+        : OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, pid);
+
+    if (gui)
+        *gui = GetGuiResources(hProcess, GR_GDIOBJECTS) > 0;
+
+    if(ppid)
+    {
+        PROCESS_BASIC_INFORMATION info = {};
+        ULONG size;
+        if(NT_SUCCESS(NtQueryInformationProcess(hProcess, ProcessBasicInformation, &info, sizeof(info), &size)))
+        {
+            assert(size == sizeof(info));
+            *ppid = (uint32_t)info.InheritedFromUniqueProcessId;
+        }
+        else
+            return false;
+    }
+    if(exe)
+    {
+        DWORD bufSize = exe->allocated;
+        if(QueryFullProcessImageNameA(hProcess, 0, exe->chars, &bufSize))
+        {
+            // We use full path here
+            // Querying command line of remote processes in Windows requires either WMI or ReadProcessMemory
+            exe->length = bufSize;
+            if (exePath) ffStrbufSet(exePath, exe);
+        }
+        else
+            return false;
+    }
+    if(pname && exeName)
+    {
+        *exeName = exe->chars + ffStrbufLastIndexC(exe, '\\') + 1;
+        ffStrbufSetS(pname, *exeName);
+    }
+
+    return true;
+}

src/common/settings.c

@@ -6,45 +6,6 @@
 
 #include <string.h>
 
-typedef enum FFInitState
-{
-    FF_INITSTATE_UNINITIALIZED = 0,
-    FF_INITSTATE_SUCCESSFUL = 1,
-    FF_INITSTATE_FAILED = 2
-} FFInitState;
-
-#define FF_LIBRARY_DATA_LOAD_INIT(dataObject, userLibraryName, ...) \
-    static dataObject data; \
-    static FFInitState initState = FF_INITSTATE_UNINITIALIZED; \
-    if(initState != FF_INITSTATE_UNINITIALIZED) {\
-        return initState == FF_INITSTATE_SUCCESSFUL ? &data : NULL; \
-    } \
-    initState = FF_INITSTATE_SUCCESSFUL; \
-    void* libraryHandle = ffLibraryLoad(&userLibraryName, __VA_ARGS__, NULL); \
-    if(libraryHandle == NULL) { \
-        initState = FF_INITSTATE_FAILED; \
-        return NULL; \
-    } \
-
-#define FF_LIBRARY_DATA_LOAD_SYMBOL(symbolName) \
-    data.ff ## symbolName = dlsym(libraryHandle, #symbolName); \
-    if(data.ff ## symbolName == NULL) { \
-        dlclose(libraryHandle); \
-        initState = FF_INITSTATE_FAILED; \
-        return NULL; \
-    }
-
-#define FF_LIBRARY_DATA_LOAD_RETURN \
-    initState = FF_INITSTATE_SUCCESSFUL; \
-    return &data;
-
-#define FF_LIBRARY_DATA_LOAD_ERROR \
-    { \
-        dlclose(libraryHandle); \
-        initState = FF_INITSTATE_FAILED; \
-        return NULL; \
-    }
-
 #ifdef FF_HAVE_GIO
 #include <gio/gio.h>
 
@@ -88,32 +49,39 @@ typedef struct GSettingsData
     FF_LIBRARY_SYMBOL(g_settings_schema_source_get_default)
     GSettingsSchemaSource* schemaSource;
     GVariantGetters variantGetters;
+
+    bool inited;
 } GSettingsData;
 
 static const GSettingsData* getGSettingsData(void)
 {
-    FF_LIBRARY_DATA_LOAD_INIT(GSettingsData, instance.config.library.libGIO, "libgio-2.0" FF_LIBRARY_EXTENSION, 1);
+    static GSettingsData data;
 
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_schema_source_lookup)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_schema_has_key)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_new_full)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_get_value)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_get_user_value)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_get_default_value)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_settings_schema_source_get_default)
+    if (!data.inited)
+    {
+        data.inited = true;
+        FF_LIBRARY_LOAD(libgsettings, &instance.config.library.libGIO, NULL, "libgio-2.0" FF_LIBRARY_EXTENSION, 1);
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_schema_source_lookup, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_schema_has_key, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_new_full, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_get_value, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_get_user_value, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_get_default_value, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_schema_source_get_default, NULL)
 
-    #define data data.variantGetters
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_dup_string)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_boolean)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_int32)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_unref);
-    #undef data
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data.variantGetters, g_variant_dup_string, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data.variantGetters, g_variant_get_boolean, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data.variantGetters, g_variant_get_int32, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data.variantGetters, g_variant_unref, NULL);
 
-    data.schemaSource = data.ffg_settings_schema_source_get_default();
-    if(data.schemaSource == NULL)
-        FF_LIBRARY_DATA_LOAD_ERROR
+        data.schemaSource = data.ffg_settings_schema_source_get_default();
+        if (data.schemaSource)
+            libgsettings = NULL;
+    }
+    if(!data.schemaSource)
+        return NULL;
 
-    FF_LIBRARY_DATA_LOAD_RETURN
+    return &data;
 }
 
 FFvariant ffSettingsGetGSettings(const char* schemaName, const char* path, const char* key, FFvarianttype type)
@@ -161,27 +129,34 @@ typedef struct DConfData
     FF_LIBRARY_SYMBOL(dconf_client_new)
     GVariantGetters variantGetters;
     DConfClient* client;
+
+    bool inited;
 } DConfData;
 
 static const DConfData* getDConfData(void)
 {
-    FF_LIBRARY_DATA_LOAD_INIT(DConfData, instance.config.library.libDConf, "libdconf" FF_LIBRARY_EXTENSION, 2);
+    static DConfData data;
 
-    FF_LIBRARY_DATA_LOAD_SYMBOL(dconf_client_read_full)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(dconf_client_new)
+    if (!data.inited)
+    {
+        data.inited = true;
 
-    #define data data.variantGetters
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_dup_string)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_boolean)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_get_int32)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(g_variant_unref)
-    #undef data
+        FF_LIBRARY_LOAD(libdconf, &instance.config.library.libDConf, NULL, "libdconf" FF_LIBRARY_EXTENSION, 2);
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data, dconf_client_read_full, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data, dconf_client_new, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data.variantGetters, g_variant_dup_string, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data.variantGetters, g_variant_get_boolean, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data.variantGetters, g_variant_get_int32, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data.variantGetters, g_variant_unref, NULL)
 
-    data.client = data.ffdconf_client_new();
-    if(data.client == NULL)
-        FF_LIBRARY_DATA_LOAD_ERROR
+        data.client = data.ffdconf_client_new();
+        if (data.client)
+            libdconf = NULL;
+    }
+    if(!data.client)
+        return NULL;
 
-    FF_LIBRARY_DATA_LOAD_RETURN
+    return &data;
 }
 
 FFvariant ffSettingsGetDConf(const char* key, FFvarianttype type)
@@ -232,23 +207,35 @@ typedef struct XFConfData
     FF_LIBRARY_SYMBOL(xfconf_channel_get_bool)
     FF_LIBRARY_SYMBOL(xfconf_channel_get_int)
     FF_LIBRARY_SYMBOL(xfconf_init)
+
+    bool inited;
 } XFConfData;
 
 static const XFConfData* getXFConfData(void)
 {
-    FF_LIBRARY_DATA_LOAD_INIT(XFConfData, instance.config.library.libXFConf, "libxfconf-0" FF_LIBRARY_EXTENSION, 4);
+    static XFConfData data;
 
-    FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_channel_get)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_channel_has_property)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_channel_get_string)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_channel_get_bool)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_channel_get_int)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(xfconf_init)
+    if (!data.inited)
+    {
+        data.inited = true;
+        FF_LIBRARY_LOAD(libxfconf, &instance.config.library.libXFConf, NULL, "libxfconf-0" FF_LIBRARY_EXTENSION, 4);
 
-    if(data.ffxfconf_init(NULL) == false)
-        FF_LIBRARY_DATA_LOAD_ERROR
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_get, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_has_property, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_get_string, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_get_bool, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_get_int, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_init, NULL)
+        if(!data.ffxfconf_init(NULL))
+            data.ffxfconf_init = NULL;
+        else
+            libxfconf = NULL;
+    }
 
-    FF_LIBRARY_DATA_LOAD_RETURN
+    if(!data.ffxfconf_init)
+        return NULL;
+
+    return &data;
 }
 
 FFvariant ffSettingsGetXFConf(const char* channelName, const char* propertyName, FFvarianttype type)
@@ -294,22 +281,33 @@ typedef struct SQLiteData
     FF_LIBRARY_SYMBOL(sqlite3_column_text)
     FF_LIBRARY_SYMBOL(sqlite3_finalize)
     FF_LIBRARY_SYMBOL(sqlite3_close)
+
+    bool inited;
 } SQLiteData;
 
 static const SQLiteData* getSQLiteData(void)
 {
-    FF_LIBRARY_DATA_LOAD_INIT(SQLiteData, instance.config.library.libSQLite3, "libsqlite3" FF_LIBRARY_EXTENSION, 1);
+    static SQLiteData data;
 
-    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_open_v2)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_prepare_v2)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_step)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_data_count)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_column_int)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_column_text)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_finalize)
-    FF_LIBRARY_DATA_LOAD_SYMBOL(sqlite3_close)
+    if (!data.inited)
+    {
+        data.inited = true;
+        FF_LIBRARY_LOAD(libsqlite, &instance.config.library.libSQLite3, NULL, "libsqlite3" FF_LIBRARY_EXTENSION, 1);
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_open_v2, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_prepare_v2, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_step, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_data_count, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_column_int, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_column_text, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_finalize, NULL)
+        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_close, NULL)
+        libsqlite = NULL;
+    }
 
-    FF_LIBRARY_DATA_LOAD_RETURN
+    if (!data.ffsqlite3_close)
+        return NULL;
+
+    return &data;
 }
 
 int ffSettingsGetSQLite3Int(const char* dbPath, const char* query)

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": [
@@ -457,6 +469,14 @@
                 "type": "color"
             }
         },
+        {
+            "long": "color-separator",
+            "desc": "Set the color of the key-value separator",
+            "remark": "See `-h color` for the list of available colors",
+            "arg": {
+                "type": "color"
+            }
+        },
         {
             "long": "color",
             "desc": "Set the color of both the keys and title",
@@ -534,10 +554,11 @@
             "desc": "Set the percentage output type",
             "remark": [
                 "1 for percentage number",
-                "2 for bar",
+                "2 for multi-color bar",
                 "3 for both",
                 "6 for bar only",
-                "9 for colored number"
+                "9 for colored number",
+                "10 for monochrome bar"
             ],
             "arg": {
                 "type": "num",
@@ -595,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",
@@ -603,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",
@@ -1152,6 +1180,24 @@
                 "default": 2
             }
         },
+        {
+            "long": "cpu-show-pe-core-count",
+            "desc": "Detect and display CPU frequency of different core types (eg. Pcore and Ecore) if supported",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": false
+            }
+        },
+        {
+            "long": "cpucache-compact",
+            "desc": "Show all CPU caches in one line",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": false
+            }
+        },
         {
             "long": "cpuusage-separate",
             "desc": "Display CPU usage per CPU logical core, instead of an average result",
@@ -1197,13 +1243,18 @@
             }
         },
         {
-            "long": "gpu-force-vulkan",
-            "desc": "Force using vulkan to detect GPUs",
-            "remark": "Vulkan supports video memory usage detection",
+            "long": "gpu-detection-method",
+            "desc": "Force using a specified method to detect GPUs",
+            "remark": "Will fall back to next methods if the specified method fails",
             "arg": {
-                "type": "bool",
-                "optional": true,
-                "default": false
+                "type": "enum",
+                "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",
+                    "opengl": "Use OpenGL API. Slow and only detects one GPU"
+                },
+                "default": "auto"
             }
         },
         {
@@ -1236,6 +1287,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",
@@ -1316,6 +1376,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",
@@ -1399,6 +1472,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",

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

@@ -4,6 +4,10 @@ For example the format string "Values: {1} ({2})", with the values "First" and "
 The format string can contain placeholders in any order and have multiple occurrences.
 To include spaces when setting from the command line, surround the whole string with double quotes (").
 
+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.
+
 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.
@@ -16,7 +20,7 @@ To only print something if a variable is set, use "{?<index>} ... {?}".
 For example, to only print a second value if it is set, use "{?2} Second value: {2}{?}".
 If a "{?}" is found without an opener, it is printed as is.
 
-To only print something if a variable is not set, do the same as with if, just replace every '?' with a '!'.
+To only print something if a variable is not set, do the same as with if, just replace every '?' with a '/'.
 For example to print a fallback for a second value if it is not set, use "{?2}{2}{?}{/2}Second value fallback{/}".
 
 To stop formatting at any point in the format string, use "{-}".
@@ -24,7 +28,7 @@ To stop formatting at any point in the format string, use "{-}".
 To print something with color, start a placeholder with a '#' and then the linux terminal color encoding.
 "\033[" at the start, and an 'm' at the end is automatically added, so don't do that.
 A "{#}" is equivalent to a "{#0}" and resets everything to normal.
-For example to print something pink and underline, use "{#4;35}...{#}".
+For example to print something pink and underline, use "{#4;35}...{#}". "{#underline_magenta}" is also supported. See `fastfetch -h color` for detail.
 Information about what the numbers mean can be found here: https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters.
 Which escape codes are supported and how they look is defined by your terminal.
 

src/detection/battery/battery_windows.c

@@ -1,6 +1,7 @@
 #include "battery.h"
 
 #include "common/io/io.h"
+#include "util/windows/nt.h"
 #include "util/windows/unicode.h"
 #include "util/mallocHelper.h"
 #include "util/smbiosHelper.h"
@@ -12,16 +13,6 @@
 #include <devguid.h>
 #include <winternl.h>
 
-NTSYSCALLAPI
-NTSTATUS
-NTAPI
-NtPowerInformation(
-    IN POWER_INFORMATION_LEVEL InformationLevel,
-    IN PVOID InputBuffer OPTIONAL,
-    IN ULONG InputBufferLength,
-    OUT PVOID OutputBuffer OPTIONAL,
-    IN ULONG OutputBufferLength);
-
 static inline void wrapSetupDiDestroyDeviceInfoList(HDEVINFO* hdev)
 {
     if(*hdev)

src/detection/bios/bios_linux.c

@@ -4,7 +4,7 @@
 
 #include <stdlib.h>
 
-const char* ffDetectBios(FFBiosResult* bios)
+const char *ffDetectBios(FFBiosResult *bios)
 {
     ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_date", "/sys/class/dmi/id/bios_date", &bios->date);
     ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->release);

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,6 +1,9 @@
 #include "bios.h"
 #include "util/smbiosHelper.h"
 
+#ifdef _WIN32
+#include "util/windows/registry.h"
+
 #include <ntstatus.h>
 #include <winternl.h>
 
@@ -24,7 +27,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION
         };
     };
 } SYSTEM_BOOT_ENVIRONMENT_INFORMATION;
-
+#endif
 
 typedef struct FFSmbiosBios
 {
@@ -73,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;
@@ -85,6 +89,7 @@ const char* ffDetectBios(FFBiosResult* bios)
             default: break;
         }
     }
+    #endif
 
     return NULL;
 }

src/detection/bootmgr/bootmgr.c

@@ -0,0 +1,50 @@
+#include "efi_helper.h"
+
+static inline uint8_t evBits(uint16_t val, uint8_t mask, uint8_t shift)
+{
+    return (uint8_t) ((val & (mask << shift)) >> shift);
+}
+
+static void ffEfiUcs2ToUtf8(const uint16_t *const chars, FFstrbuf* result)
+{
+    for (uint32_t i = 0; chars[i]; i++)
+    {
+        if (chars[i] <= 0x007f)
+            ffStrbufAppendC(result, (char) chars[i]);
+        else if (chars[i] > 0x007f && chars[i] <= 0x07ff)
+        {
+            ffStrbufAppendC(result, (char) (0xc0 | evBits(chars[i], 0x1f, 6)));
+            ffStrbufAppendC(result, (char) (0x80 | evBits(chars[i], 0x3f, 0)));
+        }
+        else
+        {
+            ffStrbufAppendC(result, (char) (0xe0 | evBits(chars[i], 0xf, 12)));
+            ffStrbufAppendC(result, (char) (0x80 | evBits(chars[i], 0x3f, 6)));
+            ffStrbufAppendC(result, (char) (0x80 | evBits(chars[i], 0x3f, 0)));
+        }
+    }
+}
+
+bool ffEfiFillLoadOption(const FFEfiLoadOption* efiOption, FFBootmgrResult* result)
+{
+    uint32_t descLen = 0;
+    while (efiOption->Description[descLen]) ++descLen;
+
+    if (descLen)
+        ffEfiUcs2ToUtf8(efiOption->Description, &result->name);
+
+    for (
+        ffEfiDevicePathProtocol* filePathList = (void*) &efiOption->Description[descLen + 1];
+        filePathList->Type != 0x7F; // End of Hardware Device Path
+        filePathList = (void*) ((uint8_t*) filePathList + filePathList->Length))
+    {
+        if (filePathList->Type == 4 && filePathList->SubType == 4)
+        {
+            // https://uefi.org/specs/UEFI/2.10/10_Protocols_Device_Path_Protocol.html#file-path-media-device-path
+            ffEfiUcs2ToUtf8((uint16_t*) filePathList->SpecificDevicePathData, &result->firmware);
+            return true;
+        }
+    }
+
+    return false;
+}

src/detection/bootmgr/bootmgr.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "fastfetch.h"
+
+typedef struct FFBootmgrResult
+{
+    FFstrbuf name;
+    FFstrbuf firmware;
+    bool secureBoot;
+} FFBootmgrResult;
+
+const char* ffDetectBootmgr(FFBootmgrResult* bios);

src/detection/bootmgr/bootmgr_apple.c

@@ -0,0 +1,12 @@
+#include "bootmgr.h"
+#include "common/io/io.h"
+
+const char* ffDetectBootmgr(FFBootmgrResult* result)
+{
+    if (ffPathExists("/System/Library/CoreServices/boot.efi", FF_PATHTYPE_FILE))
+        ffStrbufSetStatic(&result->firmware, "/System/Library/CoreServices/boot.efi");
+
+    ffStrbufSetStatic(&result->name, "iBoot");
+
+    return NULL;
+}

src/detection/bootmgr/bootmgr_bsd.c

@@ -0,0 +1,43 @@
+#include "bootmgr.h"
+#include "efi_helper.h"
+#include "common/io/io.h"
+
+#include <sys/efiio.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+
+const char* ffDetectBootmgr(FFBootmgrResult* result)
+{
+    FF_AUTO_CLOSE_FD int efifd = open("/dev/efi", O_RDWR);
+    if (efifd < 0) return "open(/dev/efi) failed";
+
+    uint8_t buffer[2048];
+    struct efi_var_ioc ioc = {
+        .vendor = { 0x8be4df61, 0x93ca, 0x11d2, 0xaa, 0x0d, { 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c } },
+        .data = buffer,
+    };
+
+    ioc.datasize = sizeof(buffer);
+    ioc.name = (efi_char[]){ 'B', 'o', 'o', 't', 'C', 'u', 'r', 'r', 'e', 'n', 't', '\0' };
+    ioc.namesize = sizeof("BootCurrent") * 2;
+    if (ioctl(efifd, EFIIOC_VAR_GET, &ioc) < 0 || ioc.datasize != 2)
+        return "ioctl(EFIIOC_VAR_GET, BootCurrent) failed";
+
+    unsigned char hex[5];
+    snprintf((char*) hex, sizeof(hex), "%04X", *(uint16_t*)buffer);
+    ioc.datasize = sizeof(buffer);
+    ioc.name = (efi_char[]){ 'B', 'o', 'o', 't', hex[0], hex[1], hex[2], hex[3], '\0' };
+    ioc.namesize = sizeof("Boot####") * 2;
+    if (ioctl(efifd, EFIIOC_VAR_GET, &ioc) < 0 || ioc.datasize == sizeof(buffer))
+        return "ioctl(EFIIOC_VAR_GET, Boot####) failed";
+
+    ffEfiFillLoadOption((FFEfiLoadOption *)buffer, result);
+
+    ioc.name = (efi_char[]){ 'S', 'e', 'c', 'u', 'r', 'e', 'B', 'o', 'o', 't', '\0' };
+    ioc.namesize = sizeof("SecureBoot") * 2;
+    ioc.datasize = sizeof(buffer);
+    if (ioctl(efifd, EFIIOC_VAR_GET, &ioc) == 0 && ioc.datasize == 1)
+        result->secureBoot = !!buffer[0];
+
+    return NULL;
+}

src/detection/bootmgr/bootmgr_linux.c

@@ -0,0 +1,27 @@
+#include "bootmgr.h"
+#include "common/io/io.h"
+#include "efi_helper.h"
+
+#define FF_EFIVARS_PATH_PREFIX "/sys/firmware/efi/efivars/"
+
+const char* ffDetectBootmgr(FFBootmgrResult* result)
+{
+    uint8_t buffer[2048];
+
+    if (ffReadFileData(FF_EFIVARS_PATH_PREFIX "BootCurrent-" FF_EFI_GLOBAL_GUID, sizeof(buffer), buffer) != 6)
+        return "Failed to read efivar: BootCurrent";
+
+    uint16_t value = *(uint16_t *)&buffer[4];
+    snprintf((char*) buffer, sizeof(buffer), FF_EFIVARS_PATH_PREFIX "Boot%04X-" FF_EFI_GLOBAL_GUID, value);
+
+    ssize_t size = ffReadFileData((const char*) buffer, sizeof(buffer), buffer);
+    if (size < 5 + (int) sizeof(FFEfiLoadOption) || size == (ssize_t) sizeof(buffer))
+        return "Failed to read efivar: Boot####";
+
+    ffEfiFillLoadOption((FFEfiLoadOption *)&buffer[4], result);
+
+    if (ffReadFileData(FF_EFIVARS_PATH_PREFIX "SecureBoot-" FF_EFI_GLOBAL_GUID, sizeof(buffer), buffer) == 6)
+        result->secureBoot = buffer[4] == 1;
+
+    return NULL;
+}

src/detection/bootmgr/bootmgr_nosupport.c

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

src/detection/bootmgr/bootmgr_windows.c

@@ -0,0 +1,53 @@
+#include "bootmgr.h"
+#include "efi_helper.h"
+
+#include <windows.h>
+
+const char* enablePrivilege(const wchar_t* privilege)
+{
+    HANDLE token;
+    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &token))
+        return "OpenProcessToken() failed";
+
+    TOKEN_PRIVILEGES tp = {
+        .PrivilegeCount = 1,
+        .Privileges = {
+            (LUID_AND_ATTRIBUTES) { .Attributes = SE_PRIVILEGE_ENABLED }
+        },
+    };
+    if (!LookupPrivilegeValueW(NULL, privilege, &tp.Privileges[0].Luid))
+        return "LookupPrivilegeValue() failed";
+
+    if (!AdjustTokenPrivileges(token, false, &tp, sizeof(tp), NULL, NULL))
+        return "AdjustTokenPrivileges() failed";
+
+    if (GetLastError() == ERROR_NOT_ALL_ASSIGNED)
+        return "The token does not have the specified privilege";
+
+    return NULL;
+}
+
+const char* ffDetectBootmgr(FFBootmgrResult* result)
+{
+    if (enablePrivilege(L"SeSystemEnvironmentPrivilege") != NULL)
+        return "Failed to enable SeSystemEnvironmentPrivilege";
+
+    uint16_t value;
+    if (GetFirmwareEnvironmentVariableW(L"BootCurrent", L"{" FF_EFI_GLOBAL_GUID L"}", &value, sizeof(value)) != 2)
+        return "GetFirmwareEnvironmentVariableW(BootCurrent) failed";
+
+    uint8_t buffer[2048];
+    wchar_t key[16];
+    wsprintfW(key, L"Boot%04X", value);
+    uint32_t size = GetFirmwareEnvironmentVariableW(key, L"{" FF_EFI_GLOBAL_GUID L"}", buffer, sizeof(buffer));
+    if (size < sizeof(FFEfiLoadOption) || size == sizeof(buffer))
+        return "GetFirmwareEnvironmentVariableW(Boot####) failed";
+
+    ffEfiFillLoadOption((FFEfiLoadOption *)buffer, result);
+
+    DWORD uefiSecureBootEnabled = 0, bufSize = 0;
+    if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SYSTEM\\ControlSet001\\Control\\SecureBoot\\State", L"UEFISecureBootEnabled", RRF_RT_REG_DWORD, NULL, &uefiSecureBootEnabled, &bufSize) == ERROR_SUCCESS)
+        result->secureBoot = !!uefiSecureBootEnabled;
+
+    return NULL;
+}

src/detection/bootmgr/efi_helper.h

@@ -0,0 +1,24 @@
+#include "bootmgr.h"
+
+// https://uefi.org/specs/UEFI/2.10/10_Protocols_Device_Path_Protocol.html#generic-device-path-structures
+typedef struct ffEfiDevicePathProtocol
+{
+    uint8_t Type;
+    uint8_t SubType;
+    uint16_t Length;
+    uint8_t SpecificDevicePathData[];
+} ffEfiDevicePathProtocol;
+
+// https://uefi.org/specs/UEFI/2.10/03_Boot_Manager.html#load-options
+typedef struct FFEfiLoadOption
+{
+    uint32_t Attributes;
+    uint16_t FilePathListLength;
+    uint16_t Description[];
+    // ffEfiDevicePathProtocol FilePathList[];
+    // uint8_t OptionalData[];
+} FFEfiLoadOption;
+
+bool ffEfiFillLoadOption(const FFEfiLoadOption* efiOption, FFBootmgrResult* result);
+
+#define FF_EFI_GLOBAL_GUID "8be4df61-93ca-11d2-aa0d-00e098032b8c"

src/detection/brightness/brightness_linux.c

@@ -4,7 +4,6 @@
 #include "util/stringUtils.h"
 
 #include <dirent.h>
-#include <ctype.h>
 #include <limits.h>
 
 static const char* detectWithBacklight(FFlist* result)
@@ -58,14 +57,14 @@ static const char* detectWithBacklight(FFlist* result)
                     {
                         ffStrbufSubstrBeforeLastC(&brightness->name, '/'); // remove "/edid"
                         ffStrbufSubstrAfterLastC(&brightness->name, '/'); // try getting DRM connector name
-                        if(isdigit(brightness->name.chars[0]))
+                        if(ffCharIsDigit(brightness->name.chars[0]))
                         {
                             // PCI address or some unknown path, give up
                             ffStrbufSetS(&brightness->name, entry->d_name);
                         }
                         else
                         {
-                            if(ffStrbufStartsWithS(&brightness->name, "card") && isdigit(brightness->name.chars[4]))
+                            if(ffStrbufStartsWithS(&brightness->name, "card") && ffCharIsDigit(brightness->name.chars[4]))
                                 ffStrbufSubstrAfterFirstC(&brightness->name, '-');
                         }
                     }
@@ -109,14 +108,19 @@ static const char* detectWithDdcci(FFBrightnessOptions* options, FFlist* result)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_free_any_vcp_value)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_close_display)
 
+    #ifndef FF_DISABLE_DLOPEN
     __typeof__(&ddca_init) ffddca_init = dlsym(libddcutil, "ddca_init");
     if (ffddca_init)
+    #else
+    __typeof__(&ddca_init) ffddca_init = ddca_init;
+    #endif
     {
         FF_SUPPRESS_IO();
         // Ref: https://github.com/rockowitz/ddcutil/issues/344
         if (ffddca_init(NULL, -1 /*DDCA_SYSLOG_NOT_SET*/, 1 /*DDCA_INIT_OPTIONS_DISABLE_CONFIG_FILE*/) < 0)
             return "ddca_init() failed";
     }
+    #ifndef FF_DISABLE_DLOPEN
     else
     {
         __typeof__(&ddca_set_default_sleep_multiplier) ffddca_set_default_sleep_multiplier = dlsym(libddcutil, "ddca_set_default_sleep_multiplier");
@@ -125,6 +129,7 @@ static const char* detectWithDdcci(FFBrightnessOptions* options, FFlist* result)
 
         libddcutil = NULL; // Don't dlclose libddcutil. See https://github.com/rockowitz/ddcutil/issues/330
     }
+    #endif
 
     FF_AUTO_FREE DDCA_Display_Info_List* infoList = NULL;
     if (ffddca_get_display_info_list2(false, &infoList) < 0)

src/detection/camera/camera_apple.m

@@ -8,6 +8,7 @@
 
 const char* ffDetectCamera(FFlist* result)
 {
+    #ifdef MAC_OS_X_VERSION_10_15
     FF_SUPPRESS_IO(); // #822
 
     AVCaptureDeviceType deviceType;
@@ -47,6 +48,8 @@ const char* ffDetectCamera(FFlist* result)
         camera->width = size.width < 0 ? 0 : (uint32_t) size.width;
         camera->height = size.height < 0 ? 0 : (uint32_t) size.height;
     }
-
     return NULL;
+    #else
+    return "No support for old MacOS version";
+    #endif
 }

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

@@ -4,6 +4,12 @@
 
 #define FF_CPU_TEMP_UNSET (0/0.0)
 
+typedef struct FFCPUCore
+{
+    uint32_t freq;
+    uint32_t count;
+} FFCPUCore;
+
 typedef struct FFCPUResult
 {
     FFstrbuf name;
@@ -16,10 +22,12 @@ typedef struct FFCPUResult
     double frequencyBase; // GHz
     double frequencyMax; // GHz
     double frequencyMin; // GHz
+    double frequencyBiosLimit; // GHz
+
+    FFCPUCore coreTypes[16]; // number of P cores, E cores, etc.
 
     double temperature;
 } FFCPUResult;
 
-const char* ffCPUDetectByCpuid(FFCPUResult* cpu);
 const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu);
 const char* ffCPUAppleCodeToName(uint32_t code);

src/detection/cpu/cpu_apple.c

@@ -68,20 +68,37 @@ 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);
-    if(cpu->frequencyMax > 0.0)
-        cpu->frequencyMax /= 1000.0 * 1000.0 * 1000.0;
-    else
+    cpu->frequencyMax = ffSysctlGetInt64("hw.cpufrequency_max", 0) / 1000.0 / 1000.0 / 1000.0;
+    if(cpu->frequencyBase != cpu->frequencyBase)
     {
         unsigned current = 0;
         size_t size = sizeof(current);
         if (sysctl((int[]){ CTL_HW, HW_CPU_FREQ }, 2, &current, &size, NULL, 0) == 0)
-            cpu->frequencyMax = (double) current / 1000.0 / 1000.0 / 1000.0;
+            cpu->frequencyBase = (double) current / 1000.0 / 1000.0 / 1000.0;
     }
     return NULL;
 }
 #endif
 
+static const char* detectCoreCount(FFCPUResult* cpu)
+{
+    uint32_t nPerfLevels = (uint32_t) ffSysctlGetInt("hw.nperflevels", 0);
+    if (nPerfLevels <= 0) return "sysctl(hw.nperflevels) failed";
+
+    char sysctlKey[] = "hw.perflevelN.logicalcpu";
+    if (nPerfLevels > sizeof(cpu->coreTypes) / sizeof(cpu->coreTypes[0]))
+        nPerfLevels = sizeof(cpu->coreTypes) / sizeof(cpu->coreTypes[0]);
+    for (uint32_t i = 0; i < nPerfLevels; ++i)
+    {
+        sysctlKey[strlen("hw.perflevel")] = (char) ('0' + i);
+        cpu->coreTypes[i] = (FFCPUCore) {
+            .freq = nPerfLevels - i,
+            .count = (uint32_t) ffSysctlGetInt(sysctlKey, 0),
+        };
+    }
+    return NULL;
+}
+
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
     if (ffSysctlGetString("machdep.cpu.brand_string", &cpu->name) != NULL)
@@ -104,6 +121,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
         cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.activecpu", 1);
 
     detectFrequency(cpu);
+    if (options->showPeCoreCount) detectCoreCount(cpu);
 
     cpu->temperature = options->temp ? detectCpuTemp(&cpu->name) : FF_CPU_TEMP_UNSET;
 

src/detection/cpu/cpu_bsd.c

@@ -11,6 +11,64 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     cpu->coresLogical = cpu->coresPhysical;
     cpu->coresOnline = cpu->coresPhysical;
 
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+    if (ffSysctlGetString("kern.sched.topology_spec", &buffer) == NULL && buffer.length > 0)
+    {
+        // <groups>
+        // <group level="1" cache-level="3">
+        // <cpu count="4" mask="f,0,0,0">0, 1, 2, 3</cpu>
+        // <children>
+        // <group level="2" cache-level="2">
+        // <cpu count="2" mask="3,0,0,0">0, 1</cpu>
+        // <flags><flag name="THREAD">THREAD group</flag><flag name="SMT">SMT group</flag></flags>
+        // </group>
+        // <group level="2" cache-level="2">
+        // <cpu count="2" mask="c,0,0,0">2, 3</cpu>
+        // <flags><flag name="THREAD">THREAD group</flag><flag name="SMT">SMT group</flag></flags>
+        // </group>
+        // </children>
+        // </group>
+        // </groups>
+        uint32_t i = 0;
+        while (true)
+        {
+            i = ffStrbufNextIndexS(&buffer, i, "<flag name=\"THREAD\">THREAD group</flag>"); // Find physical core with hyper-threading enabled
+            if (i >= buffer.length) break;
+            cpu->coresPhysical--;
+            i += (uint32_t) strlen("<flag name=\"THREAD\">THREAD group</flag>");
+        }
+    }
+
+    for (uint16_t i = 0; i < cpu->coresLogical; ++i)
+    {
+        ffStrbufClear(&buffer);
+        char key[32];
+        snprintf(key, sizeof(key), "dev.cpu.%u.freq_levels", i);
+        if (ffSysctlGetString(key, &buffer) == NULL && buffer.length > 0)
+        {
+            // 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 (options->showPeCoreCount)
+            {
+                uint32_t ifreq = 0;
+                while (cpu->coreTypes[ifreq].freq != fmax && cpu->coreTypes[ifreq].freq > 0)
+                    ++ifreq;
+                if (cpu->coreTypes[ifreq].freq == 0)
+                    cpu->coreTypes[ifreq].freq = fmax;
+                cpu->coreTypes[ifreq].count++;
+            }
+        }
+    }
+    cpu->frequencyMin /= 1000;
+    cpu->frequencyMax /= 1000;
+
     int clockRate = ffSysctlGetInt("hw.clockrate", 0);
     cpu->frequencyBase = clockRate <= 0 ? 0.0/0.0 : clockRate / 1000.0;
     cpu->temperature = FF_CPU_TEMP_UNSET;

src/detection/cpu/cpu_linux.c

@@ -9,7 +9,6 @@
 #include <sys/sysinfo.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <ctype.h>
 
 #ifdef __ANDROID__
 #include "common/settings.h"
@@ -88,14 +87,14 @@ static const char* parseCpuInfo(FFCPUResult* cpu, FFstrbuf* physicalCoresBuffer,
     return NULL;
 }
 
-static double getFrequency(FFstrbuf* basePath, const char* cpuinfoFileName, const char* scalingFileName, FFstrbuf* buffer)
+static uint32_t getFrequency(FFstrbuf* basePath, const char* cpuinfoFileName, const char* scalingFileName, FFstrbuf* buffer)
 {
     uint32_t baseLen = basePath->length;
     ffStrbufAppendS(basePath, cpuinfoFileName);
     bool ok = ffReadFileBuffer(basePath->chars, buffer);
     ffStrbufSubstrBefore(basePath, baseLen);
     if (ok)
-        return ffStrbufToDouble(buffer) / 1e6;
+        return (uint32_t) ffStrbufToUInt(buffer, 0);
 
     if (scalingFileName)
     {
@@ -103,13 +102,31 @@ static double getFrequency(FFstrbuf* basePath, const char* cpuinfoFileName, cons
         ok = ffReadFileBuffer(basePath->chars, buffer);
         ffStrbufSubstrBefore(basePath, baseLen);
         if (ok)
-            return ffStrbufToDouble(buffer) / 1e6;
+            return (uint32_t) ffStrbufToUInt(buffer, 0);
     }
 
-    return 0.0/0.0;
+    return 0;
 }
 
-static bool detectFrequency(FFCPUResult* cpu)
+static uint8_t getNumCores(FFstrbuf* basePath, FFstrbuf* buffer)
+{
+    uint32_t baseLen = basePath->length;
+    ffStrbufAppendS(basePath, "/affected_cpus");
+    bool ok = ffReadFileBuffer(basePath->chars, buffer);
+    ffStrbufSubstrBefore(basePath, baseLen);
+    if (ok)
+        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 0;
+}
+
+static bool detectFrequency(FFCPUResult* cpu, const FFCPUOptions* options)
 {
     FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateS("/sys/devices/system/cpu/cpufreq/");
     FF_AUTO_CLOSE_DIR DIR* dir = opendir(path.chars);
@@ -119,38 +136,61 @@ static bool detectFrequency(FFCPUResult* cpu)
     uint32_t baseLen = path.length;
 
     struct dirent* entry;
-    while((entry = readdir(dir)) != NULL)
+    while ((entry = readdir(dir)) != NULL)
     {
-        if (ffStrStartsWith(entry->d_name, "policy") && isdigit(entry->d_name[strlen("policy")]))
+        if (ffStrStartsWith(entry->d_name, "policy") && ffCharIsDigit(entry->d_name[strlen("policy")]))
         {
             ffStrbufAppendS(&path, entry->d_name);
-            double fbase = getFrequency(&path, "/base_frequency", NULL, &buffer);
-            if (fbase == fbase)
+            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;
             }
-            double fmax = getFrequency(&path, "/cpuinfo_max_freq", "/scaling_max_freq", &buffer);
-            if (fmax == fmax)
+            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;
+            }
+            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;
             }
-            double fmin = getFrequency(&path, "/cpuinfo_min_freq", "/scaling_min_freq", &buffer);
-            if (fmin == fmin)
+            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;
             }
+
+            if (options->showPeCoreCount)
+            {
+                uint32_t freq = fbase == 0 ? fmax : fbase; // seems base frequencies are more stable
+                uint32_t ifreq = 0;
+                while (cpu->coreTypes[ifreq].freq != freq && cpu->coreTypes[ifreq].freq > 0)
+                    ++ifreq;
+                if (cpu->coreTypes[ifreq].freq == 0)
+                    cpu->coreTypes[ifreq].freq = freq;
+                cpu->coreTypes[ifreq].count += getNumCores(&path, &buffer);
+            }
             ffStrbufSubstrBefore(&path, baseLen);
         }
     }
+    cpu->frequencyBase /= 1e6;
+    cpu->frequencyMax /= 1e6;
+    cpu->frequencyMin /= 1e6;
+    cpu->frequencyBiosLimit /= 1e6;
     return true;
 }
 
@@ -232,7 +272,7 @@ 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) || cpu->frequencyBase != cpu->frequencyBase)
+    if (!detectFrequency(cpu, options) || cpu->frequencyBase != cpu->frequencyBase)
         cpu->frequencyBase = ffStrbufToDouble(&cpuMHz) / 1000;
 
     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 / 1000.;
+    }
+
+    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

@@ -1,6 +1,7 @@
 #include "cpu.h"
 #include "detection/temps/temps_windows.h"
 #include "util/windows/registry.h"
+#include "util/windows/nt.h"
 #include "util/mallocHelper.h"
 #include "util/smbiosHelper.h"
 
@@ -125,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)
             {
@@ -146,13 +147,6 @@ static const char* detectByRegistry(FFCPUResult* cpu)
     if(!ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", &hKey, NULL))
         return "ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L\"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0\", &hKey, NULL) failed";
 
-    if (detectSpeedByCpuid(cpu) != NULL || cpu->frequencyBase != cpu->frequencyBase)
-    {
-        uint32_t mhz;
-        if(ffRegReadUint(hKey, L"~MHz", &mhz, NULL))
-            cpu->frequencyBase = mhz / 1000.0;
-    }
-
     ffRegReadStrbuf(hKey, L"ProcessorNameString", &cpu->name, NULL);
     ffRegReadStrbuf(hKey, L"VendorIdentifier", &cpu->vendor, NULL);
 
@@ -163,6 +157,31 @@ static const char* detectByRegistry(FFCPUResult* cpu)
             cpu->coresOnline = cpu->coresPhysical = cpu->coresLogical = (uint16_t) cores;
     }
 
+    uint32_t mhz;
+    if(ffRegReadUint(hKey, L"~MHz", &mhz, NULL))
+        cpu->frequencyBase = mhz / 1000.0;
+
+    return NULL;
+}
+
+static const char* detectCoreTypes(FFCPUResult* cpu)
+{
+    FF_AUTO_FREE PROCESSOR_POWER_INFORMATION* pinfo = calloc(cpu->coresLogical, sizeof(PROCESSOR_POWER_INFORMATION));
+    if (!NT_SUCCESS(NtPowerInformation(ProcessorInformation, NULL, 0, pinfo, (ULONG) sizeof(PROCESSOR_POWER_INFORMATION) * cpu->coresLogical)))
+        return "NtPowerInformation(ProcessorInformation, NULL, 0, pinfo, size) failed";
+
+    for (uint32_t icore = 0; icore < cpu->coresLogical && pinfo[icore].MhzLimit; ++icore)
+    {
+        uint32_t ifreq = 0;
+        while (cpu->coreTypes[ifreq].freq != pinfo[icore].MhzLimit && cpu->coreTypes[ifreq].freq > 0)
+            ++ifreq;
+        if (cpu->coreTypes[ifreq].freq == 0)
+            cpu->coreTypes[ifreq].freq = pinfo[icore].MhzLimit;
+        ++cpu->coreTypes[ifreq].count;
+    }
+
+    if (cpu->frequencyBase != cpu->frequencyBase)
+        cpu->frequencyBase = pinfo->MaxMhz / 1000.0;
     return NULL;
 }
 
@@ -174,6 +193,9 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     if (error)
         return error;
 
+    detectSpeedByCpuid(cpu);
+    if (options->showPeCoreCount) detectCoreTypes(cpu);
+
     if (cpu->frequencyMax != cpu->frequencyMax)
         detectMaxSpeedBySmbios(cpu);
 

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_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

@@ -106,11 +106,16 @@ static void getMate(FFstrbuf* result, FFDEOptions* options)
 
 static const char* getXfce4ByLib(FFstrbuf* result)
 {
+#ifndef FF_DISABLE_DLOPEN
     const char* xfce_version_string(void); // from `xfce4/libxfce4util/xfce-misutils.h
     FF_LIBRARY_LOAD(xfce4util, NULL, "dlopen libxfce4util" FF_LIBRARY_EXTENSION "failed", "libxfce4util" FF_LIBRARY_EXTENSION, 7);
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xfce4util, xfce_version_string);
     ffStrbufSetS(result, ffxfce_version_string());
     return NULL;
+#else
+    FF_UNUSED(result);
+    return "dlopen is disabled";
+#endif
 }
 
 static void getXFCE4(FFstrbuf* result, FFDEOptions* options)

src/detection/disk/disk_bsd.c

@@ -66,6 +66,10 @@ static void detectFsInfo(struct statfs* fs, FFDisk* disk)
 #include <sys/attr.h>
 #include <unistd.h>
 
+#ifndef MAC_OS_X_VERSION_10_15
+    #define MNT_REMOVABLE 0x00000200
+#endif
+
 struct CmnAttrBuf {
     uint32_t       length;
     attrreference_t nameRef;
@@ -132,13 +136,15 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
         ffStrbufInitS(&disk->filesystem, fs->f_fstypename);
         ffStrbufInit(&disk->name);
         disk->type = 0;
+        disk->createTime = 0;
+
         detectFsInfo(fs, disk);
 
         if(fs->f_flags & MNT_RDONLY)
             disk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT;
 
         struct stat st;
-        if(stat(fs->f_mntonname, &st) == 0)
+        if(stat(fs->f_mntonname, &st) == 0 && st.st_birthtimespec.tv_sec > 0)
             disk->createTime = (uint64_t)((st.st_birthtimespec.tv_sec * 1000) + (st.st_birthtimespec.tv_nsec / 1000000));
     }
 

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";
+}