Merge pull request #1302 from fastfetch-cli/dev

Release: v2.26.1

.codespellrc

@@ -2,4 +2,4 @@
 check-filenames =
 builtin = clear,rare,usage,informal
 skip = */.git,*/cmake-build-*,*/.idea,*/completions,*/presets,*/screenshots,*/tests,*/3rdparty,*/logo/ascii
-ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,sur,doas
+ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,sur,doas,conexant

.editorconfig

@@ -7,10 +7,10 @@ tab_width = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{md,fflogo}]
+[*.md]
 trim_trailing_whitespace = false
 
-[*.{fflogo}]
+[*.txt]
 insert_final_newline = false
 
 [*.yml]

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: [LinusDierheimer, CarterLi]

.github/ISSUE_TEMPLATE/logo_request.md

@@ -15,6 +15,9 @@ Paste content of /etc/os-release and /etc/lsb-release here. If none of these fil
 ```
 
 # Ascii
+
+An ASCII logo should not take up too much space (smaller than 50x20 characters). Please also include the color codes if not available in `os-release` 
+
 ```
 Paste ascii art here.
 ```

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
         run: uname -a
 
       - name: configure project
-        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_XFCONF=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OSMESA=OFF -DENABLE_OPENCL=OFF -DENABLE_LIBNM=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_DRM_AMDGPU=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_XFCONF=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OSMESA=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
 
       - name: build project
         run: cmake --build . --target package --verbose -j4
@@ -44,7 +44,7 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -74,7 +74,7 @@ jobs:
         run: uname -a
 
       - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y 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 directx-headers-dev
+        run: sudo apt-get update && sudo apt-get install -y 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 libpulse-dev libdrm-dev libelf-dev directx-headers-dev python3-requests
 
       - name: install linuxbrew packages
         run: |
@@ -87,7 +87,7 @@ jobs:
           languages: c
 
       - name: configure project
-        run: PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+        run: PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
 
       - name: build project
         run: cmake --build . --target package --verbose -j4
@@ -99,7 +99,7 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -138,15 +138,15 @@ jobs:
         id: runcmd
         with:
           arch: aarch64
-          distro: ubuntu22.04
+          distro: ubuntu20.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
+            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 libpulse-dev libdrm-dev libelf-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 --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -181,11 +181,11 @@ jobs:
             # CMake installed by apt has bug `list sub-command REMOVE_ITEM requires two or more arguments`
             wget --no-check-certificate https://apt.kitware.com/ubuntu/pool/main/c/cmake/{cmake_3.29.2-0kitware1ubuntu20.04.1_armhf.deb,cmake-data_3.29.2-0kitware1ubuntu20.04.1_all.deb}
             dpkg -i *.deb
-            apt-get install -y 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 directx-headers-dev rpm
+            apt-get install -y 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 libpulse-dev libdrm-dev libelf-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 --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -216,11 +216,11 @@ jobs:
           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
+            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 libpulse-dev libdrm-dev libddcutil-dev libchafa-dev libelf-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 --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -247,19 +247,19 @@ jobs:
         run: |
           cat /etc/alpine-release
           uname -a
-          apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev gcc g++
+          apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev py3-requests gcc g++
         shell: alpine.sh --root {0}
 
       - name: build
         run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -GNinja .
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -DENABLE_EMBEDDED_PCIIDS=On -GNinja .
             cmake --build . --target package --verbose -j4
         shell: alpine.sh {0}
 
       - name: run
         run: |
             ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -288,7 +288,7 @@ jobs:
         run: |
           cat /etc/alpine-release
           uname -a
-          apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev gcc g++
+          apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev gcc g++
         shell: alpine.sh --root {0}
 
       - name: build
@@ -300,7 +300,7 @@ jobs:
       - name: run
         run: |
             ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
             time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
@@ -348,7 +348,7 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -388,8 +388,8 @@ jobs:
             cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
             cmake --build . --target package --verbose -j4
             ./fastfetch --list-features
-            time ./fastfetch
-            time ./fastfetch --format json
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
             ctest
@@ -416,18 +416,18 @@ jobs:
         with:
           operating_system: freebsd
           architecture: x86-64
-          cpu_count: 3
+          cpu_count: 4
           shell: bash
-          version: '13.2'
+          version: '14.1'
           run: |
             uname -a
             sudo pkg update
-            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd v4l_compat
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm libelf glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat py311-requests
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On .
             cmake --build . --target package --verbose -j4
             ./fastfetch --list-features
-            time ./fastfetch
-            time ./fastfetch --format json
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
             time ./flashfetch
             ldd fastfetch
             ctest
@@ -456,7 +456,7 @@ jobs:
         with:
           msystem: CLANG64
           update: true
-          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-vulkan-headers mingw-w64-clang-x86_64-opencl-icd mingw-w64-clang-x86_64-opencl-headers mingw-w64-clang-x86_64-cppwinrt
+          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-vulkan-headers mingw-w64-clang-x86_64-opencl-icd mingw-w64-clang-x86_64-opencl-headers mingw-w64-clang-x86_64-cppwinrt mingw-w64-clang-x86_64-imagemagick
 
       - name: print msys version
         run: uname -a
@@ -477,7 +477,7 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -547,7 +547,7 @@ jobs:
         run: curl -LO https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/raw/master/ags_lib/lib/amd_ags_x86.dll
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
 
       - name: run fastfetch --format json
         run: time ./fastfetch -c presets/ci.jsonc --format json

CHANGELOG.md

@@ -1,3 +1,350 @@
+# 2.26.1
+
+Features:
+* Allow to disable pacstall packager detection in CMake
+
+Bugfixes:
+* Fix uninitialized variables (GPU, Windows)
+
+# 2.26.0
+
+Changes:
+* To be consistent to other platforms, CPU frequency detection on Linux no longer checks `bios_limit`
+
+Features:
+* Detect GPU index (#1267, GPU)
+* Count Flatpak runtime packages (#1085, Packages, Linux)
+* Support pacstall package manager (Packages, Linux)
+* Support CU core count, max frequency, VMEM usage detection for AMD cards on Linux (GPU, Linux)
+    * Requires `--gpu-driver-specific`
+* Support EU core count, VMEM size detection Intel cards on Linux (GPU, Linux)
+    * Requires `--gpu-driver-specific`. VMEM usage detection requires root permissions.
+* Add new module `TPM` to print TPM (Trusted Platform Module) version if available (TPM)
+* Support GPU driver version detection (GPU, macOS)
+* Add new CMake option `-DENABLE_EMBEDDED_PCIIDS=ON`.
+    * If enabled, fastfetch will download the newest [`pci.ids`](https://pci-ids.ucw.cz/) file, [transform it into C code](https://github.com/fastfetch-cli/fastfetch/blob/dev/scripts/gen-pciids.py) and compile it into fastfetch binaries.
+
+Bugfixes:
+* Fix font size detecton of foot terminal (#1276, TerminalFont, Linux)
+* Ignore `su` and `sudo` when detecting terminal (#1283, Terminal, Linux)
+* Always print inches in integer (Display)
+* Fix Wifi connection protocol detection on macOS Sequoia (Wifi, macOS)
+* Fix hanging when font name is long when detecting kitty term font (#1289, TerminalFont)
+* Detect all enabled or connected connectors (#1301, Display, Linux)
+
+Logos:
+* Add FoxOS
+* Add GXDE OS
+
+# 2.25.0
+
+Features:
+* Moore Threads GPU add support to query number of cores (#1259, GPU)
+* Cache detection result based on last modification time (Packages)
+* Add cmake options to disable certain package managers at compile time
+    * Package managers are encouraged to disable some package managers by passing `-DPACKAGES_DISABLE_` when running `cmake`. For example, when building for Arch Linux, `-DPACKAGES_DISABLE_APK=ON -DPACKAGES_DISABLE_DPKG=ON -DPACKAGES_DISABLE_RPM=ON ...` should be specified.
+    * See all available options by [running `cmake -L | grep PACKAGES_DISABLE_`](https://github.com/fastfetch-cli/fastfetch/blob/dev/CMakeLists.txt#L91)
+    * This option does NOT remove the detection code. It just disables the detection at runtime. One can still use `--packages-disabled ""` to enable all package managers.
+* Add new option `--show-localip-{speed,mtu}` (LocalIP)
+* Add new module `Btrfs`, which prints all mounted Btrfs volumes, like `Zpool` module (#1262, Linux)
+* Improve Wifi module support for macOS Sequoia (Wifi, macOS)
+    * Currently it uses `system_profiler` which costs about 2 seconds on my MBP. I suggest disabling it for now until a better solution is found.
+
+Bugfixes:
+* Fix invalid CPU temperature detection on FreeBSD (#1260, CPU, FreeBSD)
+* Remove `showPeCoreCount` support on FreeBSD (#1260, CPU, FreeBSD)
+* Don't use Wifi speed as Ethernet speed (LocalIP, FreeBSD)
+* Fix compiling with old linux headers (Camera, Linux)
+* Fix detecting public ipv6 address (PublicIP, Windows)
+
+Logo:
+* Fix parrot logo detection
+* Rename TorizonCore to Torizon OS
+
+# 2.24.0
+
+Changes:
+* Support of `--lib-XXX` is removed
+    * If fastfetch fails to load some `.so` `.dylib` libraries, `LD_LIBRARY_PATH` should be used.
+
+Features:
+* Support sixel image protocol on Windows (Logo, Windows)
+    * Requires imagemagick7 to be installed. MSYS2 is recommended.
+* Improve terminal query on Windows (Windows)
+    * TerminalSize, TerminalTheme
+* Detect more ARM microarchitectures and SOC names (CPU, Linux)
+* Detect the number of online cores (CPU, FreeBSD)
+* Support board name detection for Asahi Linux (Board, Linux)
+* Add new option `--command-param` to customize the parameters when running shell
+* Support syntax of sub string in `--<module>-format`: `{variable~startIndex,endIndex}`
+    * See `fastfetch -h format` for detail
+
+Bugfixes:
+* Fix tests building when system yyjson is used (#1244)
+* Fix dinit detection; support dinit version detection (#1245, InitSystem, Linux)
+* Fix signal quality, refresh rate and maybe others in custom format (#1241)
+* Fix boot time calculation (#1249, Uptime, Linux)
+* Fix custom format for boolean values
+    * `{?false-value}This should not print{?}{?true-value}This should print{?}` will print `This should print`
+* Fix possible hanging when running fastfetch in screen 5.0 (TerminalTheme, macOS)
+
+Logos:
+* Add Lliurex
+
+# 2.23.0
+
+Features:
+* Support unity version detection (DE, Linux)
+* Print model name in Battery keys if available (Battery)
+* Add module `Zpool`
+* Improve performance (Shell / Terminal, Linux)
+* Support syntax of padded strings in `--<module>-format`. `{variable<padlength}` and `{variable>padlength}` are supported.
+    * If pad length is greater than the length of the variable, the variable will be padded with spaces.
+        * `fastfetch -l none -s command --command-text 'echo 12345' --command-format 'output({1<20})'` prints `Command: output(12345               )`
+        * `fastfetch -l none -s command --command-text 'echo 12345' --command-format 'output({1>20})'` prints `Command: output(               12345)`
+    * If pad length is less than the length of the variable, the variable will be truncated.
+
+Bugfixes:
+* Fix broken `--list-presets`
+* Update zsh completion script
+* Don't print `*` if `defaultRouteOnly` is set (NetIO)
+* Fix Camera module incorrectly disabled on FreeBSD (Camera, FreeBSD)
+* Fix hanging on screen 5.0 (Terminal)
+* Improve image logo support on Windows (Logo, Windows)
+
+Logos:
+* Update AmogOS
+* Add Magix
+* Make ubuntu logo colorable
+* Add Steam Deck Logo
+* add Huawei Cloud EulerOS
+
+# 2.22.0
+
+Features:
+* Small performance improvements (Terminal, Editor)
+* Improve arm32 and loongarch support (CPU, Linux)
+* Ignore the parent process if env `$FFTS_IGNORE_PARENT` is set to `1` (Shell)
+* Add code name of Apple M4 (CPU, Linux)
+* Add ethernet speed rate detection support (LocalIP)
+* Add zsh completion script
+* Add Linglong package manager detection support (Packages, Linux)
+
+Bugfixes:
+* Fix building on macOS 10.14
+* Fix tmux in linux TTY (Colors)
+* Fix hang in WSL when custom format is used (Disk, Linux)
+* Fix `/proc/loadavg` parsing (Loadavg, Linux)
+* Disable use of `LC_NUMERIC` locale settings to fix parsing of decimal numbers
+* Fix possible segfault (DiskIO, Linux)
+* Honor `preciseRefreshRate` in custom format (Display)
+
+Logos:
+* Add Lingmo OS
+* Add Sleeper OS
+
+# 2.21.3
+
+Bugfixes:
+* Fix bad Intel Arc GPU name detection, which was supposed to be fixed in the last version but the change was reverted accidentally (#1177, GPU, Linux)
+* Fix arm32 CPU name detection no longer work. Regression of 2.21.2 (CPU, Linux)
+
+# 2.21.2
+
+Features:
+* Support `--stat <num_in_ms>` to display long running modules in yellow or red
+
+Bugfixes:
+* Fix bad Intel Arc GPU name and type detection (GPU, Linux)
+* Fix uninited struct fields (GPU, Linux)
+* Skip cpu model smbios detection on ARM platforms (CPU, Linux)
+* Always use `CurrentControlSet` instead of `ControlSet001` when querying registry (Windows)
+* Fix NVIDIA GPUs are missing in GPU detection sometimes (GPU, Windows)
+* Fixing detection of `pthread_timedjoin_np` (Linux)
+
+Logos:
+* Add HyprOS
+* Add GoldenDog Linux
+
+# 2.21.1
+
+Hotfix for a regression that breaks WM detection when running `startx` from TTY (Regression from 2.21.0, #1172 / #1162)
+
+Changes:
+* On Linux, FreeBSD and SunOS, a new recommended dependency `libelf` is introduced to extract strings in ELF binary, used for
+    * st term font detection when the term font is compiled directly into the binary
+    * fast path of systemd version detection
+
+Features:
+* Improve performance of
+    * kitty version detection (Terminal, Linux)
+    * st term font detection (TerminalFont, Linux)
+    * systemd version detection (InitSystem, Linux)
+
+Bugfixes:
+* Fix building error without `linux/wireless.h` (Wifi, Linux)
+* Fix wrong GPU max frequency on Asahi Linux (GPU, Linux)
+* Don't rely `$XDG_SESSION_TYPE` for detecting wm protocol (#1172 / #1162, WM, Linux)
+* Fix light color doesn't work on Linux console (Colors, Linux)
+* `LC_ALL`, if set, overrides every other locale-related environment variable (Locale)
+* Increase timeout of DBus calls (Linux)
+
+Logos:
+* Add vanilla_small and vanilla2
+* Add LFS (Linux From Scratch)
+
+# 2.21.0
+
+Changes:
+* We no longer use `libnm` for Wifi detection on Linux. Instead, we use `libdbus` to communicate with NetworkManager directly
+    * To package managers: libnm dependency should be removed
+
+Features:
+* Add module `BluetoothRadio` that prints bluetooth radios installed on the system
+    * Don't confuse with module `Bluetooth` which lists connected bluetooth devices
+* Detect more information when `--gpu-driver-specific` is used (GPU)
+* Detect which type of nvidia driver (open source or proprietary) is used (GPU, Linux)
+* `--gpu-driver-specific` adds supports for Moore Threads GPU (#1142, GPU, Linux / Windows)
+* Use SetupAPI for detecting GPUs to support GPU detection when running fastfetch as a Windows Service (GPU, Windows)
+    * See https://github.com/gpustack/gpustack/pull/97#issuecomment-2264699787 for detail
+* Detect playback status (Media, Linux)
+
+Bugfixes:
+* Don't try to connect display server in tty mode (Linux, #1110)
+* Improve ssh detection
+* Fix max frequency printing in custom format (CPU)
+* Fix displaying random characters when detecting kitty term font (#1136 / #1145, TerminalFont, Linux)
+* Make sure to detect all physical memory devices (#1137)
+* Don't detect `wl-restart` as WM (#1135, WM, Linux)
+* Use PCI bus ID to match Nvidia cards; fix multi-GPU detection (GPU)
+* Ignore invalid GPU (#1066, GPU, macOS)
+* Print error when invalid color code is found (#1138)
+* Fix invalid refresh rate detection on old macOS versions (Display, macOS)
+* Fix disk size detection on 32-bit systems (Disk, BSD)
+* Don't ignore disabled GPUs (#1140, GPU, Linux)
+* Fix GPU type detection on FreeBSD (GPU, FreeBSD)
+* Remove shell version detection for unknown shells (#1144, Shell)
+* Don't detect hyfetch as shell on NixOS (Shell, NixOS)
+
+Logos:
+* Update EndeavourOS_small
+* Add QTS
+
+# 2.20.0
+
+This release fixes regression of `2.19.0` on M1 MacBook Air. It also introduces a new option `--key-type icon` to display predefined icons in keys (requires newest nerd font). See `fastfetch -h key-type` for detail.
+
+Changes:
+* JSON option `display.keyWidth` has been renamed to `display.key.width`
+    * Previously: `{ "display": { "keyWidth": 3 } }`
+    * Now: `{ "display": { "key": { "width": 3 } } }`
+* Windows Terminal font detection **in WSL** has been removed due to [issue #1113](https://github.com/fastfetch-cli/fastfetch/issues/1113)
+
+Features:
+* Add option `display.key.type: <enum>` to print icons in keys
+    * Supported value `string`, `icon` and `both`. Default to `string` (don't display icons)
+    * Example: `{ "display": { "key": { "type": "icon" } } }`
+* Add option `display.key.paddingLeft: <num>` to print left padding (whitespaces) in keys
+    * Example: `{ "display": { "key": { "paddingLeft": 2 } } }`
+* Add option `modules.keyIcon` to set icon for specified module
+    * Example: `{ "modules": { "type": "command", "keyIcon": "🔑" } }`
+* Report system mono font name for Terminator if used (TerminalFont, Linux)
+* Don't require logo height to be set when using `--logo-position right`
+* Report Snapdragon SOC marketing name for newer Android phones (CPU, Android)
+* Detect MTK SOC part name (CPU, Android)
+
+Bugfixes:
+* Don't wake up suspended GPUs when using `--ds-force-drm` (Display, Linux)
+* Fix printing editor type in JSON result (Editor)
+* Fix `--logo-padding-*` not working correctly (#1121, Logo)
+* Fix possible segfault when detecting GPU frequency (#1121, macOS, GPU)
+
+# 2.19.1
+
+Bugfixes
+* Fix frequency value printing when using custom format (#1111, CPU / GPU)
+* Fix display detection for XiaoMi Android phone (Display, Android)
+
+Features:
+* Display if HDR mode is enabled for screens (Display)
+    * Supported in Windows and Linux (KDE) correctly
+
+# 2.19.0
+
+Changes:
+* JSON option `modules.cpu.freqNdigits` has been renamed and moved to `display.freq.ndigits`
+    * Previously: `{ "modules": { "type": "cpu", "freqNdigits": 2 } }`
+    * Now: `{ "display": { "freq": { "ndigits": 2 } } }`
+    * This option now affects GPU frequency too
+    * By default, frequencies are displayed in *GHz*. Set `display.freq.ndigits` to `-1` to display them in *MHz*
+* JSON option `display.binaryPrefix` has been moved to `display.size.binaryPrefix`
+    * Previously: `{ "display": { "binaryPrefix": "IEC" } }`
+    * Now: `{ "display": { "size": { "binaryPrefix": "IEC" } } }`
+
+Features:
+* Print physical diagonal length if supported (Display)
+* Detect display type in X11 mode (Display)
+* Assume displays connected via DisplayPort are external monitors (Display, Linux)
+* Support GPU frequency detection for Intel XE driver (GPU, Linux)
+* Detect init system on Android (InitSystem, Android)
+* Use background to display color blocks (Colors)
+    * To fix weird vertical black lines in some terminals and match the behavior of neofetch (#1094)
+    * Can be reverted to old behavior with `--colors-symbol block`
+* Support Zed terminal version detection (Terminal)
+* Improve wezterm font detection (TerminalFont)
+* Add option `--separator-length`
+* Support GPU frequency detection for Apple Silicon (GPU, macOS)
+* Detect maximum refresh rate (#1101, Monitor)
+* Detect if HDR mode is supported and enabled (Windows, Display / Monitor)
+* Support physical monitor info detection for FreeBSD and SunOS (Monitor)
+* Support defining constant strings in JSON config file, which can be used to dedupe formattion strings
+```jsonc
+{
+    "display": {
+        "constants": [
+            "Hello", // {$1}
+            "world"  // {$2}
+        ]
+    },
+    "modules": [
+        {
+            "type": "custom",
+            "format": "{$1} {$2}!" // print "Hello world!"
+        },
+        {
+            "type": "custom",
+            "format": "{$2} {$1}" // print "world Hello"
+        }
+    ]
+}
+```
+
+Bugfixes:
+* Fix some presets
+* Better detection for XTerm terminal fonts (#1095, TerminalFont, Linux)
+* Remove debug output (#1097, Windows)
+* Fix command line option `--gpu-hide-type` doesn't work (#1098, GPU)
+* Fix wrong date on Raspbian 10 (#1108, DateTime, Linux)
+* Use `brightness` instead of `actuall_brightness` when detecting current brightness level (Brightness, Linux)
+    * Ref: https://bugzilla.kernel.org/show_bug.cgi?id=203905
+* Fix buffer overflow with long font family names when detecting kitty term font (TerminalFont)
+* Fix some typos
+
+Logos:
+* Update void_small
+* Add ALT Linux
+
+# 2.18.1
+
+Fix a regression introduced in v2.18.0
+
+Changes:
+* `--ts-version` has been renamed to `--detect-version`
+    * `general.detectVersion` in JSON config file
+
+Bugfixes:
+* Fix and improve GPU driver detection (#1084, GPU, Linux)
+
 # 2.18.0
 
 Changes:

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.18.0
+    VERSION 2.26.1
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -17,7 +17,7 @@ if(ANDROID)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(LINUX TRUE CACHE BOOL "..." FORCE) # LINUX means GNU/Linux, not just the kernel
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
-    set(BSD TRUE CACHE BOOL "..." FORCE)
+    set(FreeBSD TRUE CACHE BOOL "..." FORCE)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
     set(SunOS TRUE CACHE BOOL "..." FORCE)
 elseif(NOT APPLE AND NOT WIN32)
@@ -44,33 +44,35 @@ include(CheckIncludeFile)
 
 include(CMakeDependentOption)
 
-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 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_VULKAN "Enable vulkan" ON "LINUX OR APPLE OR FreeBSD OR WIN32 OR ANDROID OR SunOS" OFF)
+cmake_dependent_option(ENABLE_WAYLAND "Enable wayland-client" ON "LINUX OR FreeBSD" OFF)
+cmake_dependent_option(ENABLE_XCB_RANDR "Enable xcb-randr" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_XCB "Enable xcb" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_X11 "Enable x11" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DRM "Enable libdrm" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DRM_AMDGPU "Enable libdrm_amdgpu" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DCONF "Enable dconf" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DBUS "Enable dbus-1" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_XFCONF "Enable libxfconf-0" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_SQLITE3 "Enable sqlite3" ON "LINUX OR FreeBSD 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 OR SunOS" OFF)
-cmake_dependent_option(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON "LINUX OR BSD OR APPLE OR SunOS" OFF)
+cmake_dependent_option(ENABLE_IMAGEMAGICK7 "Enable imagemagick 7" ON "LINUX OR FreeBSD OR APPLE OR WIN32 OR SunOS" OFF)
+cmake_dependent_option(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON "LINUX OR FreeBSD 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 OR WIN32 OR SunOS" OFF)
-cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR BSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR BSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR BSD OR WIN32 OR ANDROID OR SunOS" OFF)
-cmake_dependent_option(ENABLE_LIBNM "Enable libnm" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX OR FreeBSD OR WIN32 OR SunOS" OFF)
+cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR FreeBSD OR WIN32 OR ANDROID OR SunOS" OFF)
 cmake_dependent_option(ENABLE_FREETYPE "Enable freetype" ON "ANDROID" 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_ELF "Enable libelf" ON "LINUX OR ANDROID" OFF)
 cmake_dependent_option(ENABLE_THREADS "Enable multithreading" ON "Threads_FOUND" OFF)
+cmake_dependent_option(ENABLE_LIBZFS "Enable libzfs" ON "LINUX OR FreeBSD OR SunOS" OFF)
 
 option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded) yyjson library" OFF)
 option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF)
@@ -79,6 +81,7 @@ 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)
+option(ENABLE_EMBEDDED_PCIIDS "Embed pci.ids into fastfetch, requires `python`" OFF)
 
 set(BINARY_LINK_TYPE_OPTIONS dlopen dynamic static)
 set(BINARY_LINK_TYPE dlopen CACHE STRING "How to link fastfetch")
@@ -87,6 +90,15 @@ 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()
 
+set(PACKAGE_MANAGERS AM APK BREW CHOCO DPKG EMERGE EOPKG FLATPAK GUIX LINGLONG LPKG LPKGBUILD MACPORTS NIX OPKG PACMAN PACSTALL PALUDIS PKG PKGTOOL RPM SCOOP SNAP SORCERY WINGET XBPS)
+foreach(package_manager ${PACKAGE_MANAGERS})
+    if(package_manager STREQUAL "WINGET")
+        option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON)
+    else()
+        option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" OFF)
+    endif()
+endforeach()
+
 if (LINUX)
     set(CUSTOM_PCI_IDS_PATH "" CACHE STRING "Custom path to file pci.ids, defaults to `/usr/share/hwdata/pci.ids`")
     set(CUSTOM_AMDGPU_IDS_PATH "" CACHE STRING "Custom path to file amdgpu.ids, defaults to `/usr/share/libdrm/amdgpu.ids`")
@@ -202,10 +214,10 @@ if (SET_TWEAK AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
     execute_process(
         COMMAND git describe --tags
         WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-        OUTPUT_VARIABLE PROJECT_VERSION_TWEAK
+        OUTPUT_VARIABLE PROJECT_VERSION_GIT
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    string(REGEX MATCH "-[0-9]+" PROJECT_VERSION_TWEAK "${PROJECT_VERSION_TWEAK}")
+    string(REGEX MATCH "-[0-9]+" PROJECT_VERSION_TWEAK "${PROJECT_VERSION_GIT}")
 endif()
 if(PROJECT_VERSION_TWEAK)
     string(REGEX MATCH "[0-9]+" PROJECT_VERSION_TWEAK_NUM "${PROJECT_VERSION_TWEAK}")
@@ -244,6 +256,16 @@ else()
     file(READ "src/data/help.json" DATATEXT_JSON_HELP)
 endif()
 
+if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "fastfetch_pciids.c.inc")
+    if(Python_FOUND)
+        execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-pciids.py"
+                        OUTPUT_FILE "fastfetch_pciids.c.inc")
+    else()
+        message(STATUS "Python3 is not found, 'fastfetch_pciids.c.inc' will not be generated")
+        set(ENABLE_EMBEDDED_PCIIDS OFF)
+    endif()
+endif()
+
 fastfetch_encode_c_string("${DATATEXT_JSON_HELP}" DATATEXT_JSON_HELP)
 fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE)
 fastfetch_load_text(src/data/help_footer.txt DATATEXT_HELP_FOOTER)
@@ -294,6 +316,7 @@ set(LIBFASTFETCH_SRC
     src/common/properties.c
     src/common/settings.c
     src/common/temps.c
+    src/detection/bluetoothradio/bluetoothradio.c
     src/detection/bootmgr/bootmgr.c
     src/detection/chassis/chassis.c
     src/detection/cpu/cpu.c
@@ -326,10 +349,12 @@ set(LIBFASTFETCH_SRC
     src/modules/battery/battery.c
     src/modules/bios/bios.c
     src/modules/bluetooth/bluetooth.c
+    src/modules/bluetoothradio/bluetoothradio.c
     src/modules/board/board.c
     src/modules/bootmgr/bootmgr.c
     src/modules/brightness/brightness.c
     src/modules/break/break.c
+    src/modules/btrfs/btrfs.c
     src/modules/camera/camera.c
     src/modules/chassis/chassis.c
     src/modules/colors/colors.c
@@ -381,6 +406,7 @@ set(LIBFASTFETCH_SRC
     src/modules/terminalsize/terminalsize.c
     src/modules/theme/theme.c
     src/modules/title/title.c
+    src/modules/tpm/tpm.c
     src/modules/uptime/uptime.c
     src/modules/users/users.c
     src/modules/version/version.c
@@ -390,15 +416,17 @@ set(LIBFASTFETCH_SRC
     src/modules/wifi/wifi.c
     src/modules/wm/wm.c
     src/modules/wmtheme/wmtheme.c
+    src/modules/zpool/zpool.c
     src/options/display.c
     src/options/modules.c
     src/options/logo.c
     src/options/general.c
-    src/options/library.c
     src/util/edidHelper.c
     src/util/base64.c
     src/util/FFlist.c
     src/util/FFstrbuf.c
+    src/util/kmod.c
+    src/util/path.c
     src/util/platform/FFPlatform.c
     src/util/smbiosHelper.c
 )
@@ -415,12 +443,14 @@ if(LINUX)
         src/detection/board/board_linux.c
         src/detection/bootmgr/bootmgr_linux.c
         src/detection/brightness/brightness_linux.c
+        src/detection/btrfs/btrfs_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/bluetoothradio/bluetoothradio_linux.c
         src/detection/disk/disk_linux.c
         src/detection/dns/dns_linux.c
         src/detection/physicaldisk/physicaldisk_linux.c
@@ -464,11 +494,11 @@ if(LINUX)
         src/detection/gtk_qt/qt.c
         src/detection/sound/sound_linux.c
         src/detection/swap/swap_linux.c
-        src/detection/temps/temps_linux.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/tpm/tpm_linux.c
         src/detection/uptime/uptime_linux.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_linux.c
@@ -477,7 +507,9 @@ if(LINUX)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
+        src/detection/zpool/zpool_linux.c
         src/util/platform/FFPlatform_unix.c
+        src/util/binary_linux.c
     )
 elseif(ANDROID)
     list(APPEND LIBFASTFETCH_SRC
@@ -488,9 +520,11 @@ elseif(ANDROID)
         src/detection/battery/battery_android.c
         src/detection/bios/bios_android.c
         src/detection/bluetooth/bluetooth_nosupport.c
+        src/detection/bluetoothradio/bluetoothradio_nosupport.c
         src/detection/board/board_android.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_linux.c
         src/detection/cpucache/cpucache_linux.c
@@ -524,11 +558,11 @@ elseif(ANDROID)
         src/detection/processes/processes_linux.c
         src/detection/sound/sound_nosupport.c
         src/detection/swap/swap_linux.c
-        src/detection/temps/temps_linux.c
         src/detection/terminalfont/terminalfont_android.c
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/terminalsize/terminalsize_linux.c
         src/detection/theme/theme_nosupport.c
+        src/detection/tpm/tpm_nosupport.c
         src/detection/uptime/uptime_linux.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_nosupport.c
@@ -537,9 +571,11 @@ elseif(ANDROID)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_nosupport.c
         src/detection/camera/camera_android.c
+        src/detection/zpool/zpool_nosupport.c
         src/util/platform/FFPlatform_unix.c
+        src/util/binary_linux.c
     )
-elseif(BSD)
+elseif(FreeBSD)
     list(APPEND LIBFASTFETCH_SRC
         src/common/dbus.c
         src/common/io/io_unix.c
@@ -550,9 +586,11 @@ elseif(BSD)
         src/detection/battery/battery_bsd.c
         src/detection/bios/bios_bsd.c
         src/detection/bluetooth/bluetooth_linux.c
+        src/detection/bluetoothradio/bluetoothradio_linux.c
         src/detection/board/board_bsd.c
         src/detection/bootmgr/bootmgr_bsd.c
         src/detection/brightness/brightness_bsd.c
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_bsd.c
         src/detection/cpu/cpu_bsd.c
         src/detection/cpucache/cpucache_shared.c
@@ -591,7 +629,7 @@ elseif(BSD)
         src/detection/gamepad/gamepad_bsd.c
         src/detection/media/media_linux.c
         src/detection/memory/memory_bsd.c
-        src/detection/monitor/monitor_nosupport.c
+        src/detection/monitor/monitor_linux.c
         src/detection/netio/netio_bsd.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_linux.c
@@ -601,11 +639,11 @@ elseif(BSD)
         src/detection/gtk_qt/qt.c
         src/detection/sound/sound_bsd.c
         src/detection/swap/swap_bsd.c
-        src/detection/temps/temps_bsd.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/tpm/tpm_bsd.c
         src/detection/uptime/uptime_bsd.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_linux.c
@@ -614,7 +652,9 @@ elseif(BSD)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_linux.c
+        src/detection/zpool/zpool_linux.c
         src/util/platform/FFPlatform_unix.c
+        src/util/binary_linux.c
     )
 elseif(APPLE)
     list(APPEND LIBFASTFETCH_SRC
@@ -626,9 +666,11 @@ elseif(APPLE)
         src/detection/battery/battery_apple.c
         src/detection/bios/bios_apple.c
         src/detection/bluetooth/bluetooth_apple.m
+        src/detection/bluetoothradio/bluetoothradio_apple.m
         src/detection/board/board_apple.c
         src/detection/bootmgr/bootmgr_apple.c
         src/detection/brightness/brightness_apple.c
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_apple.c
         src/detection/cpucache/cpucache_apple.c
@@ -663,11 +705,11 @@ elseif(APPLE)
         src/detection/processes/processes_bsd.c
         src/detection/sound/sound_apple.c
         src/detection/swap/swap_apple.c
-        src/detection/temps/temps_apple.c
         src/detection/terminalfont/terminalfont_apple.m
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/terminalsize/terminalsize_linux.c
         src/detection/theme/theme_nosupport.c
+        src/detection/tpm/tpm_nosupport.c
         src/detection/uptime/uptime_bsd.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_apple.m
@@ -676,9 +718,12 @@ elseif(APPLE)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_apple.m
         src/detection/camera/camera_apple.m
+        src/detection/zpool/zpool_nosupport.c
         src/util/apple/cf_helpers.c
         src/util/apple/osascript.m
+        src/util/apple/smc_temps.c
         src/util/platform/FFPlatform_unix.c
+        src/util/binary_apple.c
     )
 elseif(WIN32)
     list(APPEND LIBFASTFETCH_SRC
@@ -689,11 +734,14 @@ elseif(WIN32)
         src/detection/battery/battery_windows.c
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_windows.c
+        src/detection/bluetoothradio/bluetoothradio_windows.c
         src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_windows.c
         src/detection/brightness/brightness_windows.cpp
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_windows.c
+        src/detection/cpu/cpu_windows.cpp
         src/detection/cpucache/cpucache_windows.c
         src/detection/cpuusage/cpuusage_windows.c
         src/detection/cursor/cursor_windows.c
@@ -728,8 +776,8 @@ elseif(WIN32)
         src/detection/terminalfont/terminalfont_windows.c
         src/detection/terminalshell/terminalshell_windows.c
         src/detection/terminalsize/terminalsize_windows.c
-        src/detection/temps/temps_windows.cpp
         src/detection/theme/theme_nosupport.c
+        src/detection/tpm/tpm_windows.c
         src/detection/uptime/uptime_windows.c
         src/detection/users/users_windows.c
         src/detection/wallpaper/wallpaper_windows.c
@@ -738,12 +786,14 @@ elseif(WIN32)
         src/detection/de/de_nosupport.c
         src/detection/wmtheme/wmtheme_windows.c
         src/detection/camera/camera_windows.cpp
+        src/detection/zpool/zpool_nosupport.c
         src/util/windows/getline.c
         src/util/windows/com.cpp
         src/util/windows/registry.c
         src/util/windows/unicode.c
         src/util/windows/wmi.cpp
         src/util/platform/FFPlatform_windows.c
+        src/util/binary_windows.c
     )
 elseif(SunOS)
     list(APPEND LIBFASTFETCH_SRC
@@ -757,12 +807,14 @@ elseif(SunOS)
         src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_sunos.c
         src/detection/cpucache/cpucache_shared.c
         src/detection/cpuusage/cpuusage_sunos.c
         src/detection/cursor/cursor_linux.c
         src/detection/bluetooth/bluetooth_nosupport.c
+        src/detection/bluetoothradio/bluetoothradio_nosupport.c
         src/detection/disk/disk_sunos.c
         src/detection/dns/dns_linux.c
         src/detection/physicaldisk/physicaldisk_nosupport.c
@@ -796,7 +848,7 @@ elseif(SunOS)
         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/monitor/monitor_linux.c
         src/detection/netio/netio_sunos.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_sunos.c
@@ -810,6 +862,7 @@ elseif(SunOS)
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/terminalsize/terminalsize_linux.c
         src/detection/theme/theme_linux.c
+        src/detection/tpm/tpm_nosupport.c
         src/detection/uptime/uptime_sunos.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_linux.c
@@ -818,7 +871,9 @@ elseif(SunOS)
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
         src/detection/camera/camera_nosupport.c
+        src/detection/zpool/zpool_linux.c
         src/util/platform/FFPlatform_unix.c
+        src/util/binary_linux.c
     )
 endif()
 
@@ -828,14 +883,14 @@ if(ENABLE_DIRECTX_HEADERS)
 endif()
 
 # Proprietary GPU driver APIs
-if(LINUX OR BSD OR WIN32)
+if(LINUX OR FreeBSD OR WIN32)
     list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_nvidia.c)
+    list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_mthreads.c)
 endif()
 if(WIN32)
     list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_intel.c)
     list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_amd.c)
 endif()
-
 include(CheckFunctionExists)
 check_function_exists(wcwidth HAVE_WCWIDTH)
 if(NOT HAVE_WCWIDTH)
@@ -863,8 +918,8 @@ add_library(libfastfetch OBJECT
 )
 
 if(yyjson_FOUND)
-    target_compile_definitions(libfastfetch PRIVATE FF_USE_SYSTEM_YYJSON)
-    target_link_libraries(libfastfetch PRIVATE yyjson::yyjson)
+    target_compile_definitions(libfastfetch PUBLIC FF_USE_SYSTEM_YYJSON)
+    target_link_libraries(libfastfetch PUBLIC yyjson::yyjson)
     # `target_link_libraries(yyjson::yyjson)` sets rpath implicitly
 else()
     # Used for dlopen finding dylibs installed by homebrew
@@ -888,7 +943,7 @@ if(APPLE AND EXISTS "/usr/bin/otool")
         target_compile_definitions(libfastfetch PUBLIC FF_LIBSYSTEM_VERSION="${CMAKE_MATCH_1}")
     endif()
 endif()
-if(BSD AND EXISTS "/usr/local/bin/objdump")
+if(FreeBSD AND EXISTS "/usr/local/bin/objdump")
     execute_process(COMMAND /bin/sh -c "/usr/local/bin/objdump -T /lib/libc.so.* | grep 'FBSD_[^ )]*' -o | sort -Vru | head -1"
                     OUTPUT_VARIABLE OBJDUMP_T_RESULT)
     if("${OBJDUMP_T_RESULT}" MATCHES "FBSD_([0-9]+\\.[0-9]+)")
@@ -906,11 +961,11 @@ elseif(SunOS)
 endif()
 
 if(HAVE_STATX)
-    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_STATX)
+    target_compile_definitions(libfastfetch PUBLIC FF_HAVE_STATX)
 endif()
 
 if(HAVE_WCWIDTH)
-    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_WCWIDTH)
+    target_compile_definitions(libfastfetch PUBLIC FF_HAVE_WCWIDTH)
 endif()
 
 if(NOT "${CUSTOM_PCI_IDS_PATH}" STREQUAL "")
@@ -1000,6 +1055,10 @@ ff_lib_enable(DRM
     "libdrm"
     "Libdrm"
 )
+ff_lib_enable(DRM_AMDGPU
+    "libdrm_amdgpu"
+    "Libdrm_Amdgpu"
+)
 ff_lib_enable(GIO
     "gio-2.0"
     "GIO"
@@ -1056,10 +1115,6 @@ ff_lib_enable(OPENCL
     "OpenCL"
     "OpenCL"
 )
-ff_lib_enable(LIBNM
-    "libnm"
-    "libnm"
-)
 ff_lib_enable(FREETYPE
     "freetype2"
     "FreeType2"
@@ -1072,22 +1127,56 @@ ff_lib_enable(DDCUTIL
     "ddcutil"
     "Ddcutil"
 )
+ff_lib_enable(ELF
+    "libelf"
+    "libelf"
+)
 ff_lib_enable(DIRECTX_HEADERS
     "DirectX-Headers"
     "DirectX-Headers"
 )
+# The system <libzfs.h> is only usable on SunOS. We provide our local copy of it so it's always available.
+if(ENABLE_LIBZFS)
+    if(BINARY_LINK_TYPE STREQUAL "dlopen")
+        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_LIBZFS=1)
+    else()
+        set(CMAKE_REQUIRED_LIBRARIES_BACKUP ${CMAKE_REQUIRED_LIBRARIES})
+        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} zfs)
+        check_function_exists("libzfs_init" LIBZFS_FOUND)
+        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BACKUP})
+        if(NOT LIBZFS_FOUND)
+            message(STATUS "Library: missing: LIBZFS")
+        else()
+            message(STATUS "Library: found LIBZFS")
+            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_LIBZFS=1)
+            target_link_libraries(libfastfetch PRIVATE zfs)
+        endif()
+    endif()
+endif()
 
 if(ENABLE_THREADS)
-    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_THREADS)
+    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_THREADS=1)
     if(CMAKE_USE_PTHREADS_INIT) #Threads::Threads is not set for WIN32
         target_link_libraries(libfastfetch PRIVATE Threads::Threads)
     endif()
 endif()
 
+if(ENABLE_EMBEDDED_PCIIDS)
+    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_EMBEDDED_PCIIDS=1)
+endif()
+
 if(LINUX)
     target_link_libraries(libfastfetch
         PRIVATE "m"
     )
+
+    if(ENABLE_DIRECTX_HEADERS)
+        if(NOT BINARY_LINK_TYPE STREQUAL "dlopen")
+            target_link_libraries(libfastfetch
+                PRIVATE "/usr/lib/wsl/lib/libdxcore.so"
+            )
+        endif()
+    endif()
 elseif(APPLE)
     target_link_libraries(libfastfetch
         PRIVATE "-framework AVFoundation"
@@ -1111,7 +1200,7 @@ elseif(APPLE)
         PRIVATE "-weak_framework Apple80211"
     )
 elseif(WIN32)
-    target_compile_definitions(libfastfetch PRIVATE -D_WIN32_WINNT=0x0601)
+    target_compile_definitions(libfastfetch PRIVATE -D_WIN32_WINNT=0x0A00)
     target_link_libraries(libfastfetch
         PRIVATE "dwmapi"
         PRIVATE "gdi32"
@@ -1124,8 +1213,9 @@ elseif(WIN32)
         PRIVATE "setupapi"
         PRIVATE "hid"
         PRIVATE "wtsapi32"
+        PRIVATE "imagehlp"
     )
-elseif(BSD)
+elseif(FreeBSD)
     target_link_libraries(libfastfetch
         PRIVATE "m"
         PRIVATE "usbhid"
@@ -1137,6 +1227,8 @@ elseif(SunOS)
         PRIVATE "socket"
         PRIVATE "kstat"
         PRIVATE "proc"
+        PRIVATE "zfs"
+        PRIVATE "nvpair"
     )
 elseif(ANDROID)
     CHECK_LIBRARY_EXISTS(-l:libandroid-wordexp.a wordexp "" HAVE_LIBANDROID_WORDEXP_STATIC)
@@ -1178,8 +1270,63 @@ if(WIN32)
             PRIVATE "-static" # stdc++, winpthread, gcc_s, etc.
         )
     endif()
-        set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD 17)
 endif()
+if(FreeBSD)
+  set(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include")
+endif()
+if(LINUX OR FreeBSD)
+    CHECK_INCLUDE_FILE("linux/videodev2.h" HAVE_LINUX_VIDEODEV2)
+    if(HAVE_LINUX_VIDEODEV2)
+        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_LINUX_VIDEODEV2=1)
+    endif()
+endif()
+if(LINUX)
+    CHECK_INCLUDE_FILE("linux/wireless.h" HAVE_LINUX_WIRELESS)
+    if(HAVE_LINUX_WIRELESS)
+        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_LINUX_WIRELESS=1)
+    endif()
+endif()
+if(NOT WIN32)
+    CHECK_INCLUDE_FILE("utmpx.h" HAVE_UTMPX)
+    if(HAVE_UTMPX)
+        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_UTMPX=1)
+    endif()
+    CHECK_INCLUDE_FILE("wordexp.h" HAVE_WORDEXP)
+    if(HAVE_WORDEXP)
+        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_WORDEXP=1)
+    endif()
+    if(ENABLE_THREADS AND CMAKE_USE_PTHREADS_INIT)
+        CHECK_INCLUDE_FILE("pthread_np.h" HAVE_PTHREAD_NP)
+        if(HAVE_PTHREAD_NP)
+            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_PTHREAD_NP=1)
+            set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} pthread_np.h)
+        endif()
+        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} Threads::Threads)
+        check_function_exists("pthread_timedjoin_np" HAVE_TIMEDJOIN_NP)
+        if(HAVE_TIMEDJOIN_NP)
+            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_TIMEDJOIN_NP=1)
+        else()
+            message(WARNING "pthread_timedjoin_np was not found; networking timeout will not work")
+        endif()
+    endif()
+endif()
+
+set(PACKAGES_DISABLE_LIST "")
+foreach(package_manager ${PACKAGE_MANAGERS})
+    if(PACKAGES_DISABLE_${package_manager})
+        list(APPEND PACKAGES_DISABLE_LIST "${package_manager}")
+    endif()
+endforeach()
+if("${PACKAGES_DISABLE_LIST}" STREQUAL "")
+    set(PACKAGES_DISABLE_LIST "FF_PACKAGES_FLAG_NONE")
+else()
+    message(STATUS "Disabled package managers: ${PACKAGES_DISABLE_LIST}")
+    list(TRANSFORM PACKAGES_DISABLE_LIST PREPEND "FF_PACKAGES_FLAG_")
+    list(TRANSFORM PACKAGES_DISABLE_LIST APPEND "_BIT")
+    list(JOIN PACKAGES_DISABLE_LIST " | " PACKAGES_DISABLE_LIST)
+endif()
+target_compile_definitions(libfastfetch PRIVATE FF_PACKAGES_DISABLE_LIST=${PACKAGES_DISABLE_LIST})
 
 ######################
 # Executable targets #
@@ -1211,13 +1358,6 @@ set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "")
 set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C)
 set_target_properties(flashfetch PROPERTIES LINKER_LANGUAGE C)
 
-if(yyjson_FOUND)
-    target_compile_definitions(fastfetch PRIVATE FF_USE_SYSTEM_YYJSON)
-    target_link_libraries(fastfetch PRIVATE yyjson::yyjson)
-    target_compile_definitions(flashfetch PRIVATE FF_USE_SYSTEM_YYJSON)
-    target_link_libraries(flashfetch PRIVATE yyjson::yyjson)
-endif()
-
 if(WIN32)
     target_sources(fastfetch
         PRIVATE src/util/windows/version.rc
@@ -1258,9 +1398,17 @@ if (BUILD_TESTS)
         PRIVATE libfastfetch
     )
 
+    add_executable(fastfetch-test-format
+        tests/format.c
+    )
+    target_link_libraries(fastfetch-test-format
+        PRIVATE libfastfetch
+    )
+
     enable_testing()
     add_test(NAME test-strbuf COMMAND fastfetch-test-strbuf)
     add_test(NAME test-list COMMAND fastfetch-test-list)
+    add_test(NAME test-format COMMAND fastfetch-test-format)
 endif()
 
 ##################
@@ -1287,6 +1435,12 @@ install(
     RENAME "${CMAKE_PROJECT_NAME}"
 )
 
+install(
+    FILES "${CMAKE_SOURCE_DIR}/completions/${CMAKE_PROJECT_NAME}.zsh"
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/zsh/site-functions"
+    RENAME "_${CMAKE_PROJECT_NAME}"
+)
+
 install(
     FILES "${CMAKE_SOURCE_DIR}/completions/${CMAKE_PROJECT_NAME}.fish"
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/fish/vendor_completions.d"

README.md

@@ -27,20 +27,26 @@ There are [screenshots on different platforms](https://github.com/fastfetch-cli/
 
 ### Linux
 
-Some distros packaged an outdated fastfetch version. Older version receive no support, so please try always to use the latest version.
+Some distros package an outdated fastfetch version. Older versions receive no support, so please try always to use the latest version.
 
 * Ubuntu: [`ppa:zhangsongcui3371/fastfetch`](https://launchpad.net/~zhangsongcui3371/+archive/ubuntu/fastfetch) (for Ubuntu 22.04 or newer)
-* Debian: `sudo apt install fastfetch` (for Debian 13 or newer)
+* Debian: `apt install fastfetch` (for Debian 13 or newer)
 * Debian / Ubuntu: Download `fastfetch-linux-<proper architecture>.deb` from [Github release page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and double-click it (for Ubuntu 20.04 or newer and Debian 11 or newer).
-* Arch Linux: `sudo pacman -S fastfetch`
-* Fedora: `sudo dnf install fastfetch`
-* Gentoo: `sudo emerge --ask app-misc/fastfetch`
+* Arch Linux: `pacman -S fastfetch`
+* Fedora: `dnf install fastfetch`
+* Gentoo: `emerge --ask app-misc/fastfetch`
 * Alpine: `apk add --upgrade fastfetch`
 * NixOS: `nix-shell -p fastfetch`
-* openSUSE: `sudo zypper install fastfetch`
-* ALT Linux: `sudo apt-get install fastfetch`
+* openSUSE: `zypper install fastfetch`
+* ALT Linux: `apt-get install fastfetch`
+* Exherbo: `cave resolve --execute app-misc/fastfetch`
+* GNU Guix: `guix install fastfetch`
+* Solus: `eopkg install fastfetch`
+* Slackware: `sbopkg -i fastfetch`
+* Void Linux: `xbps-install fastfetch`
+* Venom Linux: `scratch install fastfetch`
 
-Replace sudo with doas depending on what you use.
+You may need `sudo`, `doas` or `sup` to run these commands.
 
 [See also if fastfetch has been packaged for your favorite Linux distro](#Packaging).
 
@@ -54,8 +60,9 @@ If fastfetch is not packaged for your distro or an outdated version is packaged,
 ### Windows
 
 * [scoop](https://scoop.sh/#/apps?q=fastfetch): `scoop install fastfetch`
+* [Chocolatey](https://community.chocolatey.org/packages/fastfetch): `choco 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`
+* [MSYS2 MinGW](https://packages.msys2.org/base/mingw-w64-fastfetch): `pacman -S mingw-w64-<subsystem>-<arch>-fastfetch`
 
 You may also download the program directly from [the GitHub releases page](https://github.com/fastfetch-cli/fastfetch/releases/latest) in the form of an archive file.
 
@@ -74,7 +81,7 @@ See Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building
 ## Usage
 
 * Run it with default configuration: `fastfetch`
-* Run it with [all supported modules](https://github.com/fastfetch-cli/fastfetch/wiki/Support+Status#available-modules) and find what you interest: `fastfetch -c all.jsonc`
+* Run it with [all supported modules](https://github.com/fastfetch-cli/fastfetch/wiki/Support+Status#available-modules) and find what interests you: `fastfetch -c all.jsonc`
 * Find all data that fastfetch detects: `fastfetch -s <module> --format json`
 * Display help messages: `fastfetch --help`
 * Generate config file based on command line arguments: `fastfetch --arg1 --arg2 --gen-config`
@@ -83,7 +90,7 @@ See Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building
 
 Fastfetch uses the JSONC (or JSON with comments) for configuration. [See Wiki for detail](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration). There are some premade config files in [`presets`](presets), including the ones used for the screenshots above. You can load them using `-c <filename>`. Those files can serve as examples of the configuration syntax.
 
-Logos can be heavily customized too; see the [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for more information.
+Logos can also be heavily customized; see the [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for more information.
 
 
 ## Packaging
@@ -105,7 +112,7 @@ Logos can be heavily customized too; see the [logo documentation](https://github
 2. Fastfetch is faster. As the name suggests.
 3. Fastfetch has a greater number of features, though by default fastfetch only has a few modules enabled; use `fastfetch -c all` to find what you want.
 4. Fastfetch is more configurable. You can find more information in the Wiki: <https://github.com/fastfetch-cli/fastfetch/wiki/Configuration>.
-5. Fastfetch is more polished. For example, neofetch prints `555MiB` in `Memory` module and `23G` in `Disk` module, whereas fastfetch prints `555.00 MiB` and `22.97 GiB` respectively.
+5. Fastfetch is more polished. For example, neofetch prints `555 MiB` in the Memory module and `23 G` in the Disk module, whereas fastfetch prints `555.00 MiB` and `22.97 GiB` respectively.
 6. Fastfetch is more accurate. For example, [neofetch never actually supports the Wayland protocol](https://github.com/dylanaraps/neofetch/pull/2395).
 
 ### Q: Fastfetch shows my local IP address. It leaks my privacy!
@@ -126,6 +133,12 @@ Fastfetch uses JSON (with comments) for configuration. I suggest you use an IDE
 
 Alternatively, you can refer to the presets in [`presets` directory](https://github.com/fastfetch-cli/fastfetch/tree/dev/presets).
 
+The **correct** way to edit the configuration:
+
+This is an example that [changes size prefix from MiB / GiB to MB / GB](https://github.com/fastfetch-cli/fastfetch/discussions/1014). Editor used: [helix](https://github.com/helix-editor/helix)
+
+[![asciicast](https://asciinema.org/a/1uF6sTPGKrHKI1MVaFcikINSQ.svg)](https://asciinema.org/a/1uF6sTPGKrHKI1MVaFcikINSQ)
+
 ### Q: I WANT THE DOCUMENTATION!
 
 [Here is the documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Json-Schema). It is generated from [JSON schema](https://github.com/fastfetch-cli/fastfetch/blob/dev/doc/json_schema.json) but you won't like it.
@@ -139,13 +152,13 @@ Fastfetch uses `format` to generate output. For example, to make the `GPU` modul
     "modules": [
         {
             "type": "gpu",
-            "format": "{2}" // See `fastfetch -h gpu-format` for detail
+            "format": "{name}" // See `fastfetch -h gpu-format` for detail
         }
     ]
 }
 ```
 
-. . which is equivalent to `fastfetch -s gpu --gpu-format '{2}'`
+. . which is equivalent to `fastfetch -s gpu --gpu-format '{name}'`
 
 See `fastfetch -h format` for information on basic usage. For module specific formattion, see `fastfetch -h <module>-format`
 
@@ -169,6 +182,14 @@ The p10k doc clearly states that you should NOT print anything to stdout after `
 
 You can always use `fastfetch --pipe false` to force fastfetch running in colorful mode.
 
+### Q: Why do fastfetch and neofetch show different memory usage result?
+
+See [#1096](https://github.com/fastfetch-cli/fastfetch/issues/1096).
+
+### Q: I use Debian / Ubuntu / Debian deserved distro. My GPU is detected as `XXXX Device XXXX (VGA compatible)`. Is it a bug?
+
+See [#1282](https://github.com/fastfetch-cli/fastfetch/issues/1282)
+
 ### 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:
@@ -193,6 +214,13 @@ Otherwise, open a feature request in [GitHub Issues](https://github.com/fastfetc
 * 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.
 
+## Donate
+
+If you find Fastfetch to be useful, please consider donating.
+
+* Current maintainer: [@CarterLi](https://paypal.me/zhangsongcui)
+* Original author: [@LinusDierheimer](https://github.com/sponsors/LinusDierheimer)
+
 ## Star History
 
 Give it a star to support us!

completions/fastfetch.bash

@@ -83,12 +83,12 @@ __fastfetch_complete_logo_type()
 
 __fastfetch_complete_binary_prefix()
 {
-    local __ff_binary_prefixes=(
+    local __ff_size_binary_prefixes=(
         "iec"
         "si"
         "jedec"
     )
-    COMPREPLY=($(compgen -W "${__ff_binary_prefixes[*]}" -- "$CURRENT_WORD"))
+    COMPREPLY=($(compgen -W "${__ff_size_binary_prefixes[*]}" -- "$CURRENT_WORD"))
 }
 
 __fastfetch_complete_gl()

completions/fastfetch.zsh

@@ -0,0 +1,106 @@
+#compdef fastfetch
+
+function _fastfetch() {
+  local state
+
+  local -a opts=("${(f)$(
+        python3 <<EOF
+import json
+import subprocess
+import sys
+
+
+def main():
+    data: dict[str, list[dict]] = json.loads(
+        subprocess.check_output(["fastfetch", "--help-raw"])
+    )
+
+    for key in data:
+        for flag in data[key]:
+            if flag["long"] == "logo-color-[1-9]":
+                for i in range(1, 10):
+                    command_prefix = f"--logo-color-{i}[{flag["desc"]} ({i})]"
+                    print_command(command_prefix, flag)
+                continue
+
+            if flag.get("pseudo", False):
+                continue
+
+            if "short" in flag:
+                command_prefix = f"-{flag["short"]}[{flag["desc"]}]"
+                print_command(command_prefix, flag)
+
+            if "long" in flag:
+                command_prefix = f"--{flag["long"]}[{flag["desc"]}]"
+                print_command(command_prefix, flag)
+
+
+def print_command(command_prefix: str, flag: dict):
+    if "arg" in flag:
+        type: str = flag["arg"]["type"]
+        if type == "bool":
+            print(f"{command_prefix}::bool:(true false)")
+        elif type == "color":
+            print(f"{command_prefix}:color:->colors")
+        elif type == "command":
+            print(f"{command_prefix}::module:->modules")
+        elif type == "config":
+            print(f"{command_prefix}:preset:->presets")
+        elif type == "enum":
+            temp: str = " ".join(flag["arg"]["enum"])
+            print(f'{command_prefix}:type:({temp})')
+        elif type == "logo":
+            print(f"{command_prefix}:logo:->logos")
+        elif type == "structure":
+            print(f"{command_prefix}:structure:->structures")
+        elif type == "path":
+            print(f"{command_prefix}::path:_files")
+        else:
+            print(f"{command_prefix}:")
+    else:
+        print(f"{command_prefix}")
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except Exception:
+        sys.exit(1)
+EOF
+  )}")
+
+  _arguments "$opts[@]"
+
+  case $state in
+    colors)
+      local -a colors=(black red green yellow blue magenta cyan white default)
+      _describe 'color' colors
+      ;;
+    modules)
+      local -a modules=("${(f)$(fastfetch --list-modules autocompletion)}")
+      modules=(${(L)^modules[@]%%:*}-format format color)
+      _describe 'module' modules
+      ;;
+    presets)
+      local -a presets=(
+        "${(f)$(fastfetch --list-presets autocompletion)}"
+        "none:Disable loading config file"
+      )
+      _describe 'preset' presets || _files
+      ;;
+    structures)
+      local -a structures=("${(f)$(fastfetch --list-modules autocompletion)}")
+      _describe 'structure' structures
+      ;;
+    logos)
+      local -a logos=(
+        "${(f)$(fastfetch --list-logos autocompletion)}"
+        "none:Don't print logo"
+        "small:Print small ascii logo if available"
+      )
+      _describe 'logo' logos
+      ;;
+  esac
+}
+
+_fastfetch "$@"

debian/changelog

@@ -1,3 +1,87 @@
+fastfetch (2.26.0) jammy; urgency=medium
+
+  * Update to 2.26.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Sun, 29 Sep 2024 13:31:25 +0800
+
+fastfetch (2.25.0) jammy; urgency=medium
+
+  * Update to 2.25.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 19 Sep 2024 10:28:38 +0800
+
+fastfetch (2.24.0) jammy; urgency=medium
+
+  * Update to 2.24.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 11 Sep 2024 13:50:02 +0800
+
+fastfetch (2.23.0) jammy; urgency=medium
+
+  * Update to 2.23.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 03 Sep 2024 18:44:11 +0800
+
+fastfetch (2.22.0) jammy; urgency=medium
+
+  * Update to 2.22.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 26 Aug 2024 18:53:35 +0800
+
+fastfetch (2.21.3) jammy; urgency=medium
+
+  * Update to 2.21.3
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 15 Aug 2024 16:14:52 +0800
+
+fastfetch (2.21.2) jammy; urgency=medium
+
+  * Update to 2.21.2
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 14 Aug 2024 14:42:07 +0800
+
+fastfetch (2.21.1) jammy; urgency=medium
+
+  * Update to 2.21.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 09 Aug 2024 14:27:10 +0800
+
+fastfetch (2.21.0) jammy; urgency=medium
+
+  * Update to 2.21.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 05 Aug 2024 14:35:43 +0800
+
+fastfetch (2.20.0) jammy; urgency=medium
+
+  * Update to 2.20.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 26 Jul 2024 14:02:50 +0800
+
+fastfetch (2.19.1) jammy; urgency=medium
+
+  * Update to 2.19.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 23 Jul 2024 10:25:14 +0800
+
+fastfetch (2.19.0) jammy; urgency=medium
+
+  * Update to 2.19.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 22 Jul 2024 14:17:55 +0800
+
+fastfetch (2.18.1) jammy; urgency=medium
+
+  * Update to 2.18.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 11 Jul 2024 14:32:15 +0800
+
+fastfetch (2.18.0) jammy; urgency=medium
+
+  * Update to 2.18.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 10 Jul 2024 16:46:32 +0800
+
 fastfetch (2.17.2) jammy; urgency=medium
 
   * Update to 2.17.2

debian/control

@@ -2,7 +2,7 @@ Source: fastfetch
 Section: universe/utils
 Priority: optional
 Maintainer: Carter Li <zhangsongcui@live.cn>
-Build-Depends: 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, pkgconf, cmake (>= 3.12), debhelper (>= 11.2), dh-cmake, dh-cmake-compat (= 1), dh-sequence-cmake, dh-sequence-ctest, ninja-build
+Build-Depends: 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, libpulse-dev, libdrm-dev, libddcutil-dev, libchafa-dev, directx-headers-dev, pkgconf, cmake (>= 3.12), debhelper (>= 11.2), dh-cmake, dh-cmake-compat (= 1), dh-sequence-cmake, dh-sequence-ctest, ninja-build
 Standards-Version: 4.0.0
 Homepage: https://github.com/fastfetch-cli/fastfetch
 

debian/files

@@ -1 +1 @@
-fastfetch_2.17.2_source.buildinfo universe/utils optional
+fastfetch_2.26.0_source.buildinfo universe/utils optional

doc/fastfetch.1.in

@@ -98,7 +98,7 @@ config files, see the CONFIGURATION section
 
 .B \-\-gen\-config \fI[file]
 Generate a config file with options specified on the command line.
-If \fIfile\fR is specified, the configuration will written to the
+If \fIfile\fR is specified, the configuration will be written to the
 file, otherwise it will be written to stdout.
 .TP
 

doc/json_schema.json

@@ -22,6 +22,10 @@
             "minimum": 0,
             "default": 0
         },
+        "keyIcon": {
+            "description": "Set the icon to be displayed by `display.keyType: \"icon\"`",
+            "type": "string"
+        },
         "format": {
             "description": "Output format of the module. See `-h <module>-format` for detail. I.e: fastfetch -h disk-format",
             "type": "string"
@@ -333,12 +337,17 @@
                 "processingTimeout": {
                     "type": "integer",
                     "description": "Set the timeout (ms) when waiting for child processes, `-1` for no timeout",
-                    "default": 1000
+                    "default": 5000
                 },
                 "preRun": {
                     "type": "string",
                     "description": "Set the command to be executed before printing logos",
                     "default": ""
+                },
+                "showVersion": {
+                    "type": "boolean",
+                    "description": "Whether to detect and display component versions. Mainly for benchmarking",
+                    "default": true
                 }
             }
         },
@@ -348,9 +357,17 @@
             "additionalProperties": false,
             "properties": {
                 "stat": {
-                    "type": "boolean",
-                    "description": "Show time usage (in ms) for individual modules",
-                    "default": false
+                    "description": "Show time usage (in ms) for individual modules with optional threshold",
+                    "oneOf": [
+                        {
+                            "type": "boolean",
+                            "default": false
+                        },
+                        {
+                            "type": "integer",
+                            "minimum": 1
+                        }
+                    ]
                 },
                 "pipe": {
                     "type": "boolean",
@@ -413,35 +430,59 @@
                     "type": "boolean",
                     "default": true
                 },
-                "keyWidth": {
-                    "description": "Align the width of keys to number of characters, 0 to disable",
-                    "type": "integer",
-                    "minimum": 0,
-                    "default": 0
-                },
-                "binaryPrefix": {
-                    "type": "string",
-                    "description": "Set the binary prefix to used when printing bytes",
-                    "oneOf": [
-                        {
-                            "const": "iec",
-                            "description": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ... (standard)"
+                "key": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "description": "Set how module keys should be displayed",
+                    "properties": {
+                        "width": {
+                            "description": "Align the width of keys to number of characters, 0 to disable",
+                            "type": "integer",
+                            "minimum": 0,
+                            "default": 0
                         },
-                        {
-                            "const": "si",
-                            "description": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ..."
+                        "type": {
+                            "type": "string",
+                            "description": "Set whether to show icon before string keys",
+                            "enum": [
+                                "none",
+                                "string",
+                                "icon",
+                                "both"
+                            ],
+                            "default": "string"
                         },
-                        {
-                            "const": "jedec",
-                            "description": "1024 Bytes = 1 kB, 1024 K = 1 MB, ..."
+                        "paddingLeft": {
+                            "type": "integer",
+                            "description": "Set the left padding of keys",
+                            "minimum": 0,
+                            "default": 0
                         }
-                    ]
+                    }
                 },
                 "size": {
                     "type": "object",
                     "additionalProperties": false,
                     "description": "Set how a size value should be displayed",
                     "properties": {
+                        "binaryPrefix": {
+                            "type": "string",
+                            "description": "Set the binary prefix to used when formatting sizes",
+                            "oneOf": [
+                                {
+                                    "const": "iec",
+                                    "description": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ... (standard)"
+                                },
+                                {
+                                    "const": "si",
+                                    "description": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ..."
+                                },
+                                {
+                                    "const": "jedec",
+                                    "description": "1024 Bytes = 1 kB, 1024 K = 1 MB, ..."
+                                }
+                            ]
+                        },
                         "maxPrefix": {
                             "type": "string",
                             "description": "Set the largest binary prefix to use when formatting sizes",
@@ -569,118 +610,31 @@
                         }
                     }
                 },
+                "freq": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "description": "Set how frequency values should be displayed",
+                    "properties": {
+                        "ndigits": {
+                            "type": "integer",
+                            "description": "Set the number of digits to keep after the decimal point when formatting frequency values\nA positive value will show the frequency in GHz of decimal\n-1 will show the frequency in MHz",
+                            "minimum": -1,
+                            "maximum": 9,
+                            "default": 2
+                        }
+                    }
+                },
                 "noBuffer": {
                     "type": "boolean",
                     "description": "Whether to disable the stdout application buffer",
                     "default": false
                 },
-                "tsVersion": {
-                    "type": "boolean",
-                    "description": "Whether to detect and display the version of terminal, shell and editor. Mainly for benchmarking",
-                    "default": true
-                }
-            }
-        },
-        "library": {
-            "description": "Set the path of a library to load",
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "vulkan": {
-                    "type": "string",
-                    "description": "Vulkan module & fallback for GPU output"
-                },
-                "freetype": {
-                    "type": "string",
-                    "description": "Used for Termux font detection (Android)"
-                },
-                "wayland": {
-                    "type": "string",
-                    "description": "Better display performance and output in wayland sessions.\nSupports different refresh rates per monitor.\n(Linux, FreeBSD)"
-                },
-                "xcbRandr": {
-                    "type": "string",
-                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD, SunOS)"
-                },
-                "xcb": {
-                    "type": "string",
-                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD, SunOS)"
-                },
-                "xrandr": {
-                    "type": "string",
-                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD, SunOS)"
-                },
-                "x11": {
-                    "type": "string",
-                    "description": "X11 sessions for better display detection and faster WM detection.\nThe *randr ones provide multi monitor support The libxcb* ones usually have better performance.\n (Linux, FreeBSD, SunOS)"
-                },
-                "drm": {
-                    "type": "string",
-                    "description": "Used for fast resolution and refresh rate detection (Linux, FreeBSD)"
-                },
-                "gio": {
-                    "type": "string",
-                    "description": "Needed for values that are only stored GSettings (Linux, FreeBSD, SunOS)"
-                },
-                "dconf": {
-                    "type": "string",
-                    "description": "Needed for values that are only stored in DConf + Fallback for GSettings (Linux, FreeBSD, SunOS)"
-                },
-                "dbus": {
-                    "type": "string",
-                    "description": "Bluetooth, Player & Media detection (Linux, FreeBSD, SunOS)"
-                },
-                "xfconf": {
-                    "type": "string",
-                    "description": "Needed for XFWM theme and XFCE Terminal font (Linux, FreeBSD, SunOS)"
-                },
-                "sqlite3": {
-                    "type": "string",
-                    "description": "Needed for pkg & rpm package count (Linux, FreeBSD)"
-                },
-                "rpm": {
-                    "type": "string",
-                    "description": "Slower fallback for rpm package count. Needed on openSUSE & old CentOS / Redhat. (Linux)"
-                },
-                "imagemagick": {
-                    "type": "string",
-                    "description": "Images in terminal using sixel or kitty graphics protocol (Linux, FreeBSD, SunOS, macOS)"
-                },
-                "z": {
-                    "description": "Libz. Faster image output when using kitty graphics protocol (Linux, FreeBSD, SunOS, macOS)",
-                    "type": "string"
-                },
-                "chafa": {
-                    "type": "string",
-                    "description": "Image output as ascii art (Linux, FreeBSD, SunOS, macOS)"
-                },
-                "egl": {
-                    "type": "string",
-                    "description": "Library used by the OpenGL module for gl context creation (Linux, FreeBSD, SunOS, Windows)"
-                },
-                "glx": {
-                    "type": "string",
-                    "description": "Library used by the OpenGL module for gl context creation (Linux, FreeBSD, SunOS)"
-                },
-                "osmesa": {
-                    "type": "string",
-                    "description": "Library used by the OpenGL module for gl context creation (Linux, FreeBSD, SunOS)"
-                },
-                "opencl": {
-                    "type": "string",
-                    "description": "OpenCL module (Linux, FreeBSD, SunOS, Windows)"
-                },
-                "pulse": {
-                    "description": "Pulseaudio. Used for Sound detection (Linux, FreeBSD, SunOS)",
-                    "type": "string"
-                },
-                "nm": {
-                    "description": "NetworkManager. Used for Wifi detection (Linux)",
-                    "type": "string"
-                },
-                "ddcutil": {
-                    "description": "Used for brightness detection of external displays (Linux)",
-                    "type": "string"
+                "constants": {
+                    "type": "array",
+                    "description": "List of strings to be used in custom format of modules",
+                    "items": {
+                        "type": "string"
+                    }
                 }
             }
         },
@@ -696,10 +650,12 @@
                             "battery",
                             "bios",
                             "bluetooth",
+                            "bluetoothradio",
                             "board",
                             "bootmgr",
                             "break",
                             "brightness",
+                            "btrfs",
                             "camera",
                             "chassis",
                             "cpu",
@@ -750,6 +706,7 @@
                             "terminaltheme",
                             "title",
                             "theme",
+                            "tpm",
                             "uptime",
                             "users",
                             "version",
@@ -758,7 +715,8 @@
                             "weather",
                             "wm",
                             "wifi",
-                            "wmtheme"
+                            "wmtheme",
+                            "zpool"
                         ]
                     },
                     {
@@ -908,6 +866,10 @@
                                                 "const": "theme",
                                                 "description": "Print current theme of desktop environment"
                                             },
+                                            {
+                                                "const": "tpm",
+                                                "description": "Print info of Trusted Platform Module (TPM) Security Device"
+                                            },
                                             {
                                                 "const": "uptime",
                                                 "description": "Print how long system has been running"
@@ -940,12 +902,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -977,12 +942,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -994,7 +962,7 @@
                                 "additionalProperties": false,
                                 "properties": {
                                     "type": {
-                                        "description": "List bluetooth devices",
+                                        "description": "List (connected) bluetooth devices",
                                         "const": "bluetooth"
                                     },
                                     "showDisconnected": {
@@ -1011,12 +979,44 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                }
+                            },
+                            {
+                                "title": "Bluetooth Radio",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "type": {
+                                        "description": "List bluetooth radios width supported version and vendor",
+                                        "const": "bluetoothradio"
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1047,12 +1047,47 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                }
+                            },
+                            {
+                                "title": "BTRFS",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "type": {
+                                        "const": "btrfs",
+                                        "description": "Print Btrfs volumes"
+                                    },
+                                    "percent": {
+                                        "$ref": "#/$defs/percent"
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1073,12 +1108,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1096,13 +1134,6 @@
                                     "temp": {
                                         "$ref": "#/$defs/temperature"
                                     },
-                                    "freqNdigits": {
-                                        "description": "Set the number of digits to keep after the decimal point when printing CPU frequency",
-                                        "type": "integer",
-                                        "minimum": 0,
-                                        "maximum": 9,
-                                        "default": 2
-                                    },
                                     "showPeCoreCount": {
                                         "description": "Detect and display CPU frequency of different core types (eg. Pcore and Ecore) if supported",
                                         "type": "boolean",
@@ -1114,12 +1145,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1148,12 +1182,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1173,13 +1210,14 @@
                                         "type": "string",
                                         "enum": [
                                             "block",
+                                            "background",
                                             "circle",
                                             "diamond",
                                             "triangle",
                                             "square",
                                             "star"
                                         ],
-                                        "default": "block"
+                                        "default": "background"
                                     },
                                     "paddingLeft": {
                                         "description": "Set the number of white spaces to print before the symbol",
@@ -1213,6 +1251,9 @@
                                     },
                                     "key": {
                                         "$ref": "#/$defs/key"
+                                    },
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     }
                                 }
                             },
@@ -1229,6 +1270,10 @@
                                         "description": "Set the shell program to execute the command text\nDefault: cmd for Windows, /bin/sh for *nix",
                                         "type": "string"
                                     },
+                                    "param": {
+                                        "description": "Set the parameter used when starting the shell\nDefault: /c for Windows, -c for *nix",
+                                        "type": "string"
+                                    },
                                     "text": {
                                         "description": "Set the command text to be executed",
                                         "type": "string"
@@ -1239,12 +1284,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1266,12 +1314,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "description": "Text to print",
                                         "type": "string"
@@ -1318,12 +1369,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1381,12 +1435,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1416,12 +1473,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1447,12 +1507,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1482,12 +1545,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1511,12 +1577,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1566,12 +1635,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1596,6 +1668,16 @@
                                         "type": "boolean",
                                         "default": false
                                     },
+                                    "showSpeed": {
+                                        "description": "Show ethernet rx speed",
+                                        "type": "boolean",
+                                        "default": false
+                                    },
+                                    "showMtu": {
+                                        "description": "Show MTU",
+                                        "type": "boolean",
+                                        "default": false
+                                    },
                                     "showMac": {
                                         "description": "Show MAC addresses",
                                         "type": "boolean",
@@ -1636,12 +1718,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1665,12 +1750,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1706,12 +1794,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1746,12 +1837,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1782,12 +1876,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1843,12 +1940,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1876,12 +1976,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1919,12 +2022,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -1940,12 +2046,19 @@
                                         "const": "separator"
                                     },
                                     "string": {
-                                        "description": "Set the string to be printed",
+                                        "description": "Set the string to be printed by the separator line",
                                         "type": "string",
                                         "default": "-"
                                     },
                                     "outputColor": {
+                                        "description": "Set the color of the separator line",
                                         "$ref": "#/$defs/outputColor"
+                                    },
+                                    "length": {
+                                        "description": "Set the length of the separator line, or 0 to auto-detect",
+                                        "type": "integer",
+                                        "minimum": 0,
+                                        "default": 0
                                     }
                                 }
                             },
@@ -1977,12 +2090,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -2006,12 +2122,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -2056,12 +2175,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -2092,12 +2214,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -2133,12 +2258,15 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }
@@ -2164,12 +2292,47 @@
                                     "keyColor": {
                                         "$ref": "#/$defs/keyColor"
                                     },
-                                    "outputColor": {
-                                        "$ref": "#/$defs/outputColor"
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
                                     },
                                     "keyWidth": {
                                         "$ref": "#/$defs/keyWidth"
                                     },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                }
+                            },
+                            {
+                                "title": "Zpool",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "type": {
+                                        "const": "zpool",
+                                        "description": "Print ZFS storage pools"
+                                    },
+                                    "percent": {
+                                        "$ref": "#/$defs/percent"
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
                                     "format": {
                                         "$ref": "#/$defs/format"
                                     }

presets/all.jsonc

@@ -54,15 +54,25 @@
         "physicalmemory",
         "swap",
         "disk",
-        "battery",
+        "btrfs",
+        "zpool",
+        {
+            "type": "battery",
+            "temp": true
+        },
         "poweradapter",
         "player",
         "media",
-        "publicip",
+        {
+            "type": "publicip",
+            "timeout": 1000
+        },
         {
             "type": "localip",
             "showIpv6": true,
-            "showMac": true
+            "showMac": true,
+            "showSpeed": true,
+            "showMtu": true
         },
         "dns",
         "wifi",
@@ -73,6 +83,7 @@
         "opencl",
         "users",
         "bluetooth",
+        "bluetoothradio",
         "sound",
         "camera",
         "gamepad",
@@ -86,6 +97,7 @@
             "type": "physicaldisk",
             "temp": true
         },
+        "tpm",
         "version",
         "break",
         "colors"

presets/archey.jsonc

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

presets/btw.jsonc

@@ -1,42 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
-        "type": "builtin",
-        "source": "arch"
-    },
-    "modules": [
-        "title",
-        "separator",
-        {
-            "type": "os",
-            "format": "Arch Linux ({12})"
-        },
-        "host",
-        "kernel",
-        "uptime",
-        {
-            "type": "packages",
-            "format": "{} (pacman)"
-        },
-        "shell",
-        "display",
-        "de",
-        "wm",
-        "wmtheme",
-        "theme",
-        "icons",
-        "font",
-        "cursor",
-        "terminal",
-        "terminalfont",
-        "cpu",
-        "gpu",
-        "memory",
-        "disk",
-        "battery",
-        "poweradapter",
-        "locale",
-        "break",
-        "colors"
-    ]
-}

presets/ci.jsonc

@@ -1,95 +1,107 @@
 {
-  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-  "display": {
-    "stat": true,
-    "pipe": true,
-    "showErrors": true,
-    "noBuffer": true
-  },
-  "logo": null,
-  "modules": [
-    "title",
-    "separator",
-    "os",
-    "host",
-    "bios",
-    "bootmgr",
-    "board",
-    "chassis",
-    "kernel",
-    "initsystem",
-    "uptime",
-    "loadavg",
-    "processes",
-    "packages",
-    "shell",
-    "editor",
-    "display",
-    "brightness",
-    "monitor",
-    "lm",
-    "de",
-    "wm",
-    "wmtheme",
-    "theme",
-    "icons",
-    "font",
-    "cursor",
-    "wallpaper",
-    "terminal",
-    "terminalfont",
-    "terminalsize",
-    "terminaltheme",
-    {
-        "type": "cpu",
-        "showPeCoreCount": true,
-        "temp": true
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "display": {
+        "stat": true,
+        "pipe": true,
+        "showErrors": true,
+        "noBuffer": true
     },
-    "cpucache",
-    "cpuusage",
-    {
-        "type": "gpu",
-        "driverSpecific": true,
-        "temp": true
-    },
-    "memory",
-    "physicalmemory",
-    "swap",
-    "disk",
-    "battery",
-    "poweradapter",
-    "player",
-    "media",
-    "publicip",
-    {
-        "type": "localip",
-        "showIpv6": true,
-        "showMac": true
-    },
-    "dns",
-    "wifi",
-    "datetime",
-    "locale",
-    "vulkan",
-    "opengl",
-    "opencl",
-    "users",
-    "bluetooth",
-    "sound",
-    "camera",
-    "gamepad",
-    {
-      "type": "weather",
-      "timeout": 1000
-    },
-    "netio",
-    "diskio",
-    {
-        "type": "physicaldisk",
-        "temp": true
-    },
-    "version",
-    "break",
-    "colors"
-  ]
+    "logo": null,
+    "modules": [
+        "title",
+        "separator",
+        "os",
+        "host",
+        "bios",
+        "bootmgr",
+        "board",
+        "chassis",
+        "kernel",
+        "initsystem",
+        "uptime",
+        "loadavg",
+        "processes",
+        "packages",
+        "shell",
+        "editor",
+        "display",
+        "brightness",
+        "monitor",
+        "lm",
+        "de",
+        "wm",
+        "wmtheme",
+        "theme",
+        "icons",
+        "font",
+        "cursor",
+        "wallpaper",
+        "terminal",
+        "terminalfont",
+        "terminalsize",
+        "terminaltheme",
+        {
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "temp": true
+        },
+        "cpucache",
+        "cpuusage",
+        {
+            "type": "gpu",
+            "driverSpecific": true,
+            "temp": true
+        },
+        "memory",
+        "physicalmemory",
+        "swap",
+        "disk",
+        "btrfs",
+        "zpool",
+        {
+            "type": "battery",
+            "temp": true
+        },
+        "poweradapter",
+        "player",
+        "media",
+        {
+            "type": "publicip",
+            "timeout": 1000
+        },
+        {
+            "type": "localip",
+            "showIpv6": true,
+            "showMac": true,
+            "showSpeed": true,
+            "showMtu": true
+        },
+        "dns",
+        "wifi",
+        "datetime",
+        "locale",
+        "vulkan",
+        "opengl",
+        "opencl",
+        "users",
+        "bluetooth",
+        "bluetoothradio",
+        "sound",
+        "camera",
+        "gamepad",
+        {
+            "type": "weather",
+            "timeout": 1000
+        },
+        "netio",
+        "diskio",
+        {
+            "type": "physicaldisk",
+            "temp": true
+        },
+        "tpm",
+        "version",
+        "break",
+        "colors"
+    ]
 }

presets/examples/10.jsonc

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

presets/examples/12.jsonc

@@ -6,96 +6,104 @@
     "display": {
         "separator": "->   ",
         "color": {
-            "separator": "1"
+            "separator": "1" // Bold
+        },
+        "constants": [
+            "───────────────────────────"
+        ],
+        "key": {
+            "type": "both",
+            "paddingLeft": 4
         }
     },
     "modules": [
         {
             "type": "title",
-            "format": "                                {6}{7}{8}"
+            "format": "                             {user-name-colored}{at-symbol-colored}{host-name-colored}"
         },
         "break",
         {
             "type": "custom",
-            "format": "┌───────────────────────────── {#1}System Information{#} ─────────────────────────────┐"
+            "format": "┌{$1} {#1}System Information{#} {$1}┐"
         },
         "break",
         {
-            "key": "     OS           ",
+            "key": "OS           ",
             "keyColor": "red",
             "type": "os"
         },
         {
-            "key": "    󰌢 Machine      ",
+            "key": "Machine      ",
             "keyColor": "green",
             "type": "host"
         },
         {
-            "key": "     Kernel       ",
+            "key": "Kernel       ",
             "keyColor": "magenta",
             "type": "kernel"
         },
         {
-            "key": "    󰅐 Uptime       ",
+            "key": "Uptime       ",
             "keyColor": "red",
             "type": "uptime"
         },
         {
-            "key": "    󰍹 Resolution   ",
+            "key": "Resolution   ",
             "keyColor": "yellow",
             "type": "display",
             "compactType": "original-with-refresh-rate"
         },
         {
-            "key": "     WM           ",
+            "key": "WM           ",
             "keyColor": "blue",
             "type": "wm"
         },
         {
-            "key": "     DE           ",
+            "key": "DE           ",
             "keyColor": "green",
             "type": "de"
         },
         {
-            "key": "     Shell        ",
+            "key": "Shell        ",
             "keyColor": "cyan",
             "type": "shell"
         },
         {
-            "key": "     Terminal     ",
+            "key": "Terminal     ",
             "keyColor": "red",
             "type": "terminal"
         },
         {
-            "key": "    󰻠 CPU          ",
+            "key": "CPU          ",
             "keyColor": "yellow",
             "type": "cpu"
         },
         {
-            "key": "    󰍛 GPU          ",
+            "key": "GPU          ",
             "keyColor": "blue",
             "type": "gpu"
         },
         {
-            "key": "    󰑭 Memory       ",
+            "key": "Memory       ",
             "keyColor": "magenta",
             "type": "memory"
         },
         {
-            "key": "    󰩟 Local IP     ",
+            "key": "Local IP     ",
             "keyColor": "red",
             "type": "localip",
             "compact": true
         },
         {
-            "key": "    󰩠 Public IP    ",
+            "key": "Public IP    ",
             "keyColor": "cyan",
-            "type": "publicip"
+            "type": "publicip",
+            "timeout": 1000
         },
         "break",
         {
             "type": "custom",
-            "format": "└──────────────────────────────────────────────────────────────────────────────┘"
+            "format": "└{$1}────────────────────{$1}┘"
         },
         "break",
         {

presets/examples/13.jsonc

@@ -8,8 +8,7 @@
         }
     },
     "display": {
-        "separator": "",
-        "keyWidth": 15
+        "separator": " "
     },
     "modules": [
         {
@@ -17,65 +16,64 @@
             "type": "custom"
         },
         {
-            // draw borders first to make colors of left and right border consistant
-            "key": "│           │\u001b[11D{#31} user",
+            "key": "│ {#31} user    {#keys}│",
             "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
         },
         {
-            "key": "│           │\u001b[11D{#32}󰇅 hname",
+            "key": "│ {#32}󰇅 hname   {#keys}│",
             "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
         },
         {
-            "key": "│           │\u001b[11D{#33}󰅐 uptime",
+            "key": "│ {#33}󰅐 uptime  {#keys}│",
             "type": "uptime"
         },
         {
-            "key": "│           │\u001b[11D{#34}󰟾 distro",
+            "key": "│ {#34}{icon} distro  {#keys}│",
             "type": "os"
         },
         {
-            "key": "│           │\u001b[11D{#35} kernel",
+            "key": "│ {#35} kernel  {#keys}│",
             "type": "kernel"
         },
         {
-            "key": "│           │\u001b[11D{#36}󰇄 desktop",
+            "key": "│ {#36}󰇄 desktop {#keys}│",
             "type": "de"
         },
         {
-            "key": "│           │\u001b[11D{#31} term",
+            "key": "│ {#31} term    {#keys}│",
             "type": "terminal"
         },
         {
-            "key": "│           │\u001b[11D{#32} shell",
+            "key": "│ {#32} shell   {#keys}│",
             "type": "shell"
         },
         {
-            "key": "│           │\u001b[11D{#33}󰍛 cpu",
+            "key": "│ {#33}󰍛 cpu     {#keys}│",
             "type": "cpu",
             "showPeCoreCount": true
         },
         {
-            "key": "│           │\u001b[11D{#34}󰉉 disk",
+            "key": "│ {#34}󰉉 disk    {#keys}│",
             "type": "disk",
             "folders": "/"
         },
         {
-            "key": "│           │\u001b[11D{#35} memory",
+            "key": "│ {#35} memory  {#keys}│",
             "type": "memory"
         },
         {
-            "key": "│           │\u001b[11D{#36}󰩟 network",
+            "key": "│ {#36}󰩟 network {#keys}│",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
             "key": "├───────────┤",
             "type": "custom"
         },
         {
-            "key": "│           │\u001b[11D{#39} colors",
+            "key": "│ {#39} colors  {#keys}│",
             "type": "colors",
             "symbol": "circle"
         },

presets/examples/14.jsonc

@@ -6,20 +6,22 @@
     },
     "display": {
         "separator": "",
-        "keyWidth": 12
+        "key": {
+            "width": 15
+        }
     },
     "modules": [
         {
             // draw borders first to make colors of left and right border consistant
             "key": " user",
             "type": "title",
-            "format": "{1}",
+            "format": "{user-name}",
             "keyColor": "31"
         },
         {
             "key": "󰇅 hname",
             "type": "title",
-            "format": "{2}",
+            "format": "{host-name}",
             "keyColor": "32"
 
         },
@@ -29,7 +31,7 @@
             "keyColor": "33"
         },
         {
-            "key": "󰟾 distro",
+            "key": "{icon} distro",
             "type": "os",
             "keyColor": "34"
         },
@@ -73,7 +75,7 @@
         {
             "key": "󰩟 network",
             "type": "localip",
-            "format": "{1} ({4})",
+            "format": "{ipv4} ({ifname})",
             "keyColor": "36"
         },
         {

presets/examples/15.jsonc

@@ -8,8 +8,7 @@
         }
     },
     "display": {
-        "separator": "",
-        "keyWidth": 15
+        "separator": " "
     },
     "modules": [
         {
@@ -17,65 +16,64 @@
             "type": "custom"
         },
         {
-            // draw borders first to make colors of left and right border consistant
-            "key": "•           •\u001b[11D{#31} user",
+            "key": "• {#31} user    {#keys}•",
             "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
         },
         {
-            "key": "•           •\u001b[11D{#32}󰇅 hname",
+            "key": "• {#32}󰇅 hname   {#keys}•",
             "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
         },
         {
-            "key": "•           •\u001b[11D{#33}󰅐 uptime",
+            "key": "• {#33}󰅐 uptime  {#keys}•",
             "type": "uptime"
         },
         {
-            "key": "•           •\u001b[11D{#34}󰟾 distro",
+            "key": "• {#34}{icon} distro  {#keys}•",
             "type": "os"
         },
         {
-            "key": "•           •\u001b[11D{#35} kernel",
+            "key": "• {#35} kernel  {#keys}•",
             "type": "kernel"
         },
         {
-            "key": "•           •\u001b[11D{#36}󰇄 desktop",
+            "key": "• {#36}󰇄 desktop {#keys}•",
             "type": "de"
         },
         {
-            "key": "•           •\u001b[11D{#31} term",
+            "key": "• {#31} term    {#keys}•",
             "type": "terminal"
         },
         {
-            "key": "•           •\u001b[11D{#32} shell",
+            "key": "• {#32} shell   {#keys}•",
             "type": "shell"
         },
         {
-            "key": "•           •\u001b[11D{#33}󰍛 cpu",
+            "key": "• {#33}󰍛 cpu     {#keys}•",
             "type": "cpu",
             "showPeCoreCount": true
         },
         {
-            "key": "•           •\u001b[11D{#34}󰉉 disk",
+            "key": "• {#34}󰉉 disk    {#keys}•",
             "type": "disk",
             "folders": "/"
         },
         {
-            "key": "•           •\u001b[11D{#35} memory",
+            "key": "• {#35} memory  {#keys}•",
             "type": "memory"
         },
         {
-            "key": "•           •\u001b[11D{#36}󰩟 network",
+            "key": "• {#36}󰩟 network {#keys}•",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
             "key": "•••••••••••••",
             "type": "custom"
         },
         {
-            "key": "•           •\u001b[11D{#39} colors",
+            "key": "• {#39} colors  {#keys}•",
             "type": "colors",
             "symbol": "circle"
         },

presets/examples/16.jsonc

@@ -18,19 +18,19 @@
         {
             "key": "║ {#31} user    {#keys}║",
             "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
         },
         {
             "key": "║ {#32}󰇅 hname   {#keys}║",
             "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
         },
         {
             "key": "║ {#33}󰅐 uptime  {#keys}║",
             "type": "uptime"
         },
         {
-            "key": "║ {#34}󰟾 distro  {#keys}║",
+            "key": "║ {#34}{icon} distro  {#keys}║",
             "type": "os"
         },
         {
@@ -66,7 +66,7 @@
         {
             "key": "║ {#36}󰩟 network {#keys}║",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
             "key": "╠═══════════╣",

presets/examples/17.jsonc

@@ -11,72 +11,76 @@
         "separator": ">  ",
         "color": {
             "separator": "red"
-        }
+        },
+        "constants": [
+            "───────────────────────────────────────────────────────────────────────────",
+            "│\u001b[75C│\u001b[75D"
+        ]
     },
     "modules": [
         {
-            "format": "{#1}{#keys}╭───────────────────────────────────────────────────────────────────────────╮\u001b[76D {6}{7}{8} 🖥  ",
+            "format": "{#1}{#keys}╭{$1}╮\u001b[76D {user-name-colored}{at-symbol-colored}{host-name-colored} 🖥  ",
             "type": "title"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#31} kernel   ",
+            "key": "{$2}{#31} kernel   ",
             "type": "kernel"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#32}󰅐 uptime   ",
+            "key": "{$2}{#32}󰅐 uptime   ",
             "type": "uptime"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#33}󰟾 distro   ",
+            "key": "{$2}{#33}{icon} distro   ",
             "type": "os"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#34}󰇄 desktop  ",
+            "key": "{$2}{#34}󰇄 desktop  ",
             "type": "de"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#35} term     ",
+            "key": "{$2}{#35} term     ",
             "type": "terminal"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#36} shell    ",
+            "key": "{$2}{#36} shell    ",
             "type": "shell"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#35}󰍛 cpu      ",
+            "key": "{$2}{#35}󰍛 cpu      ",
             "type": "cpu",
             "showPeCoreCount": true,
             "temp": true
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#34}󰍛 gpu      ",
+            "key": "{$2}{#34}󰍛 gpu      ",
             "type": "gpu"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#33}󰉉 disk     ",
+            "key": "{$2}{#33}󰉉 disk     ",
             "type": "disk",
             "folders": "/"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#32} memory   ",
+            "key": "{$2}{#32} memory   ",
             "type": "memory"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#31}󰩟 network  ",
+            "key": "{$2}{#31}󰩟 network  ",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
-            "format": "{#1}{#keys}├───────────────────────────────────────────────────────────────────────────┤",
+            "format": "{#1}{#keys}├{$1}┤",
             "type": "custom"
         },
         {
-            "key": "│\u001b[75C│\u001b[75D{#39} colors   ",
+            "key": "{$2}{#39} colors   ",
             "type": "colors",
             "symbol": "circle"
         },
         {
-            "format": "{#1}{#keys}╰───────────────────────────────────────────────────────────────────────────╯",
+            "format": "{#1}{#keys}╰{$1}╯",
             "type": "custom"
         }
     ]

presets/examples/18.jsonc

@@ -11,72 +11,76 @@
         "separator": ">  ",
         "color": {
             "separator": "red"
-        }
+        },
+        "constants": [
+            "═══════════════════════════════════════════════════════════════════════════",
+            "║\u001b[75C║\u001b[75D"
+        ]
     },
     "modules": [
         {
-            "format": "{#1}{#keys}╔═══════════════════════════════════════════════════════════════════════════╗\u001b[76D {6}{7}{8} 💻 ",
+            "format": "{#1}{#keys}╔{$1}╗\u001b[76D {user-name-colored}{at-symbol-colored}{host-name-colored} 💻 ",
             "type": "title"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#31} kernel   ",
+            "key": "{$2}{#31} kernel   ",
             "type": "kernel"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#32}󰅐 uptime   ",
+            "key": "{$2}{#32}󰅐 uptime   ",
             "type": "uptime"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#33}󰟾 distro   ",
+            "key": "{$2}{#33}{icon} distro   ",
             "type": "os"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#34}󰇄 desktop  ",
+            "key": "{$2}{#34}󰇄 desktop  ",
             "type": "de"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#35} term     ",
+            "key": "{$2}{#35} term     ",
             "type": "terminal"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#36} shell    ",
+            "key": "{$2}{#36} shell    ",
             "type": "shell"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#35}󰍛 cpu      ",
+            "key": "{$2}{#35}󰍛 cpu      ",
             "type": "cpu",
             "showPeCoreCount": true,
             "temp": true
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#34}󰍛 gpu      ",
+            "key": "{$2}{#34}󰍛 gpu      ",
             "type": "gpu"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#33}󰉉 disk     ",
+            "key": "{$2}{#33}󰉉 disk     ",
             "type": "disk",
             "folders": "/"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#32} memory   ",
+            "key": "{$2}{#32} memory   ",
             "type": "memory"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#31}󰩟 network  ",
+            "key": "{$2}{#31}󰩟 network  ",
             "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
         },
         {
-            "format": "{#1}{#keys}╠═══════════════════════════════════════════════════════════════════════════╣",
+            "format": "{#1}{#keys}╠{$1}╣",
             "type": "custom"
         },
         {
-            "key": "║\u001b[75C║\u001b[75D{#39} colors   ",
+            "key": "{$2}{#39} colors   ",
             "type": "colors",
             "symbol": "circle"
         },
         {
-            "format": "{#1}{#keys}╚═══════════════════════════════════════════════════════════════════════════╝",
+            "format": "{#1}{#keys}╚{$1}╝",
             "type": "custom"
         }
     ]

presets/examples/19.jsonc

@@ -12,7 +12,7 @@
     "logo": {
         "source": " _____ _____ _____ _____ _____ _____ _____ _____ _____\n|   __|  _  |   __|_   _|   __|   __|_   _|     |  |  |\n|   __|     |__   | | | |   __|   __| | | |   --|     |\n|__|  |__|__|_____| |_| |__|  |_____| |_| |_____|__|__|",
         "type": "data",
-        "separate": true,
+        "position": "top",
         "padding": {
             "right": 2
         }

presets/examples/2.jsonc

@@ -10,153 +10,74 @@
     //     "height": 12
     // },
     "display": {
-        "separator": "  "
+        "separator": "  ",
+        "constants": [
+            "─────────────────" // {$1}, used in Custom module
+        ],
+        "key": {
+            "type": "icon",
+            "paddingLeft": 2
+        }
     },
     "modules": [
         {
             "type": "custom", // HardwareStart
             // {#1} is equivalent to `\u001b[1m`. {#} is equivalent to `\u001b[m`
-            "format": "┌─────────── {#1}Hardware Information{#} ───────────┐"
-        },
-        {
-            "type": "host",
-            "key": "  󰌢"
-        },
-        {
-            "type": "cpu",
-            "key": "  󰻠"
-        },
-        {
-            "type": "gpu",
-            "key": "  󰍛"
-        },
-        {
-            "type": "disk",
-            "key": "  "
-        },
-        {
-            "type": "memory",
-            "key": "  󰑭"
-        },
-        {
-            "type": "swap",
-            "key": "  󰓡"
-        },
-        {
-            "type": "display",
-            "key": "  󰍹"
-        },
-        {
-            "type": "brightness",
-            "key": "  󰃞"
-        },
-        {
-            "type": "battery",
-            "key": "  "
-        },
-        {
-            "type": "poweradapter",
-            "key": "  "
-        },
-        {
-            "type": "bluetooth",
-            "key": "  "
-        },
-        {
-            "type": "sound",
-            "key": "  "
-        },
-        {
-            "type": "gamepad",
-            "key": "  "
+            "format": "┌{$1} {#1}Hardware Information{#} {$1}┐"
         },
+        "host",
+        "cpu",
+        "gpu",
+        "disk",
+        "memory",
+        "swap",
+        "display",
+        "brightness",
+        "battery",
+        "poweradapter",
+        "bluetooth",
+        "sound",
+        "gamepad",
         {
             "type": "custom", // SoftwareStart
-            "format": "├─────────── {#1}Software Information{#} ───────────┤"
+            "format": "├{$1} {#1}Software Information{#} {$1}┤"
         },
         {
             "type": "title",
-            "key": "  ",
-            "format": "{1}@{2}"
-        },
-        {
-            "type": "os",
-            "key": "  " // Just get your distro's logo off nerdfonts.com
-        },
-        {
-            "type": "kernel",
-            "key": "  ",
-            "format": "{1} {2}"
-        },
-        {
-            "type": "lm",
-            "key": "  󰧨"
-        },
-        {
-            "type": "de",
-            "key": "  "
-        },
-        {
-            "type": "wm",
-            "key": "  "
-        },
-        {
-            "type": "shell",
-            "key": "  "
-        },
-        {
-            "type": "terminal",
-            "key": "  "
-        },
-        {
-            "type": "terminalfont",
-            "key": "  "
-        },
-        {
-            "type": "theme",
-            "key": "  󰉼"
-        },
-        {
-            "type": "icons",
-            "key": "  󰀻"
-        },
-        {
-            "type": "wallpaper",
-            "key": "  󰸉"
-        },
-        {
-            "type": "packages",
-            "key": "  󰏖"
-        },
-        {
-            "type": "uptime",
-            "key": "  󰅐"
-        },
-        {
-            "type": "media",
-            "key": "  󰝚"
+            "keyIcon": "",
+            "key": "Title", // Title module has no key by default, so that icon is not displayed
+            "format": "{user-name}@{host-name}"
         },
+        "os",
+        "kernel",
+        "lm",
+        "de",
+        "wm",
+        "shell",
+        "terminal",
+        "terminalfont",
+        "theme",
+        "icons",
+        "wallpaper",
+        "packages",
+        "uptime",
+        "media",
         {
             "type": "localip",
-            "key": "  󰩟",
             "compact": true
         },
         {
             "type": "publicip",
-            "key": "  󰩠"
+            "timeout": 1000
         },
         {
             "type": "wifi",
-            "key": "  ",
-            "format": "{4}" // ssid
-        },
-        {
-            "type": "locale",
-            "key": "  "
+            "format": "{ssid}"
         },
+        "locale",
         {
             "type": "custom", // InformationEnd
-            "format": "└────────────────────────────────────────────┘"
+            "format": "└{$1}──────────────────────{$1}┘"
         },
         {
             "type": "colors",

presets/examples/20.jsonc

@@ -4,7 +4,9 @@
     "logo": null,
     "display": {
         "pipe": true,
-        "keyWidth": 16,
+        "key": {
+            "width": 16
+        },
         "separator": "│ ",
         "percent": {
             "type": 6
@@ -15,7 +17,10 @@
             "charElapsed": "█",
             "charTotal": "░",
             "width": 40
-        }
+        },
+        "constants": [
+            "\u001b[42C"
+        ]
     },
     "modules": [
         {
@@ -41,11 +46,11 @@
         },
         {
             "type": "os",
-            "key": "│ OS         │\u001b[42C"
+            "key": "│ OS         │{$1}"
         },
         {
             "type": "kernel",
-            "key": "│ KERNEL     │\u001b[42C"
+            "key": "│ KERNEL     │{$1}"
         },
         {
             "type": "custom",
@@ -53,34 +58,34 @@
         },
         {
             "type": "title",
-            "key": "│ HOSTNAME   │\u001b[42C",
+            "key": "│ HOSTNAME   │{$1}",
             "format": "{host-name}"
         },
         {
             "type": "localip",
-            "key": "│ CLIENT IP  │\u001b[42C",
+            "key": "│ CLIENT IP  │{$1}",
             "format": "{ipv4}"
         },
         {
             "type": "localip",
-            "key": "│ MAC ADDR   │\u001b[42C",
+            "key": "│ MAC ADDR   │{$1}",
             "format": "{mac} ({ifname})",
             "showIPv4": false,
             "showMac": true
         },
         {
             "type": "dns",
-            "key": "│ DNS        │\u001b[42C",
+            "key": "│ DNS        │{$1}",
             "showType": "ipv4"
         },
         {
             "type": "title",
-            "key": "│ USER       │\u001b[42C",
+            "key": "│ USER       │{$1}",
             "format": "{user-name}"
         },
         {
             "type": "host",
-            "key": "│ MACHINE    │\u001b[42C",
+            "key": "│ MACHINE    │{$1}",
             "format": "{name}"
         },
         {
@@ -89,25 +94,24 @@
         },
         {
             "type": "cpu",
-            "key": "│ PROCESSOR  │\u001b[42C",
+            "key": "│ PROCESSOR  │{$1}",
             "format": "{name}"
         },
         {
             "type": "cpu",
-            "key": "│ CORES      │\u001b[42C",
+            "key": "│ CORES      │{$1}",
             "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"
+            "key": "│ CPU FREQ   │{$1}",
+            "format": "{freq-max}{/freq-max}{freq-base}{/}"
         },
         {
             "type": "loadavg",
             "compact": false,
-            // {duration} is not fixed length, hack it
-            "key": "│ LOAD \u001b[s{duration}m\u001b[u\u001b[6C│\u001b[42C"
+            "key": "│ LOAD  {duration>2}m  │{$1}" // pad duration to 2 chars
         },
         {
             "type": "custom",
@@ -115,12 +119,12 @@
         },
         {
             "type": "memory",
-            "key": "│ MEMORY     │\u001b[42C",
+            "key": "│ MEMORY     │{$1}",
             "format": "{used} / {total} [{percentage}]"
         },
         {
             "type": "memory",
-            "key": "│ USAGE      │\u001b[42C",
+            "key": "│ USAGE      │{$1}",
             "format": ""
         },
         {
@@ -129,13 +133,13 @@
         },
         {
             "type": "disk",
-            "key": "│ VOLUME     │\u001b[42C",
+            "key": "│ VOLUME     │{$1}",
             "format": "{size-used} / {size-total} [{size-percentage}]",
             "folders": "/"
         },
         {
             "type": "disk",
-            "key": "│ DISK USAGE │\u001b[42C",
+            "key": "│ DISK USAGE │{$1}",
             "format": ""
         },
         {
@@ -144,13 +148,13 @@
         },
         {
             "type": "users",
-            "key": "│ LAST LOGIN │\u001b[42C",
+            "key": "│ LAST LOGIN │{$1}",
             "format": "{login-time}{?client-ip} ({client-ip})",
             "myselfOnly": true
         },
         {
             "type": "uptime",
-            "key": "│ UPTIME     │\u001b[42C"
+            "key": "│ UPTIME     │{$1}"
         },
         {
             "type": "custom",

presets/examples/21.jsonc

@@ -3,39 +3,44 @@
     "logo": {
         "type": "small"
     },
+    "display": {
+        "constants": [
+            "██ "
+        ]
+    },
     "modules": [
         {
-            "key": "██ Distro",
+            "key": "{$1}Distro",
             "keyColor": "38;5;210",
             "type": "os"
         },
         {
-            "key": "██ Kernel",
+            "key": "{$1}Kernel",
             "keyColor": "38;5;84",
             "type": "kernel"
         },
         {
-            "key": "██ Shell",
+            "key": "{$1}Shell",
             "keyColor": "38;5;147",
             "type": "shell"
         },
         {
-            "key": "██ Packages",
+            "key": "{$1}Packages",
             "keyColor": "38;5;200",
             "type": "packages"
         },
         {
-            "key": "██ WM",
+            "key": "{$1}WM",
             "keyColor": "38;5;44",
             "type": "wm"
         },
         {
-            "key": "██ CPU",
+            "key": "{$1}CPU",
             "keyColor": "38;5;75",
             "type": "cpu"
         },
         {
-            "key": "██ Memory",
+            "key": "{$1}Memory",
             "keyColor": "38;5;123",
             "type": "memory"
         }

presets/examples/22.jsonc

@@ -1,3 +1,4 @@
+// Designed for Arch Linux
 // Modified from: https://github.com/fastfetch-cli/fastfetch/pull/1025#issuecomment-2177566138
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
@@ -12,7 +13,10 @@
         "color": {
             "separator": "blue"
         },
-        "separator": " | "
+        "separator": " | ",
+        "constants": [
+            ">-----------<+>---------------------------------------------<"
+        ]
     },
     "modules": [
         {
@@ -22,7 +26,7 @@
         },
         {
             "type": "custom",
-            "format": ">-----------<+>------------------------------------------<",
+            "format": "{$1}",
             "outputColor": "separator"
         },
         {
@@ -57,7 +61,7 @@
         },
         {
             "type": "custom",
-            "format": ">-----------<+>------------------------------------------<",
+            "format": "{$1}",
             "outputColor": "separator"
         },
         {
@@ -97,7 +101,7 @@
         },
         {
             "type": "custom",
-            "format": ">-----------<+>------------------------------------------<",
+            "format": "{$1}",
             "outputColor": "separator"
         },
         "break",

presets/examples/23.jsonc

@@ -0,0 +1,63 @@
+// designed for presenting Vanilla Linux
+// inspired from imstilllearnin's Vanilla Logo Ultra
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "display": {
+        "color": {
+            "output": "cyan"
+        },
+        "separator": ""
+    },
+    "modules": [
+        {
+            "type": "kernel",
+            "key": "[_Kernel___> ",
+            "keyColor": "blue"
+        },
+        {
+            "type": "packages",
+            "outputColor": "white",
+            "key": " [_Packages_> ",
+            "keyColor": "green"
+        },
+        {
+            "type": "localip",
+            "outputColor": "white",
+            "key": " [_Local_IP_> ",
+            "keyColor": "green"
+        },
+        {
+            "type": "memory",
+            "format": "[{3}] {1} / {2}",
+            "key": " [_RAM______> ",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "swap",
+            "format": "[{3}] {1} / {2}",
+            "key": " [_SWAP_____> ",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "disk",
+            "format": "[{3}] {1} / {2} {9}",
+            "key": " [_Disk_____> ",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "battery",
+            "format": "[{4}] {5}",
+            "key": " [_Battery__> ",
+            "keyColor": "magenta"
+        },
+        "break",
+        {
+            "type": "colors",
+            "paddingLeft": 9,
+            "symbol": "circle"
+        }
+    ]
+}

presets/examples/24.jsonc

@@ -0,0 +1,152 @@
+// By jan-rex
+// Modified from: https://github.com/fastfetch-cli/fastfetch/discussions/1269
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+      "padding": {
+        "top": 2
+      }
+    },
+    "display": {
+      "separator": "",
+      "constants": [
+        // CONSTANT {$1} - COLOR BACKGROUND FOR KEY
+        "\u001b[48;2;43;43;69m",
+        // CONSTANT {$2} - COLOR BACKGROUND FOR OUTPUT
+        "\u001b[48;2;56;59;78m",
+        // CONSTANT {$3} - VERTICAL BARS AT START AND 75th CHARACTERS FORWARD AND BACKWARD
+        "\u001b[90m│                                                            │\u001b[60D\u001b[39m",
+      ]
+    },
+    "modules": [
+      // CUSTOM - Top UI bar
+      {
+        "type": "custom",
+        "key": "{#90}{$1}╭─────────────╮",
+        "format": "{#90}{$2}╭────────────────────────────────────────────────────────────╮",
+      },
+      {
+        "type": "title",
+        "key": "{#90}{$1}│ {#92}User        {#90}│",
+        "format": "{$2}{$3}{user-name} {#2}[{home-dir}]"
+      },
+      {
+        "type": "users",
+        "key": "{#90}{$1}│ {#92}Users       {#90}│",
+        "myselfOnly": false,
+        "format": "{$2}{$3}{1}@{host-name}{/host-name}localhost{/}{?client-ip}  {#2}[IP:{client-ip}]{?}  {#2}[Login time: {login-time}]",
+      },
+      {
+        "type": "datetime",
+        "key": "{#90}{$1}│ {#92}Datetime    {#90}│",
+        "format": "{$2}{$3}{year}-{month-pretty}-{day-in-month}  {hour-pretty}:{minute-pretty}:{second-pretty}  {#2}{weekday}  {#2}[W{week}] {#2}[UTC{offset-from-utc}]"
+      },
+      {
+        "type": "title",
+        "key": "{#90}{$1}│ {#93}Host:       {#90}│",
+        "format": "{$2}{$3}{#1}{#36}{host-name}"
+      },
+      {
+        "type": "host",
+        "key": "{#90}{$1}│ {#93}Machine     {#90}│",
+        "format": "{$2}{$3}{name} {#2}{version}"
+      },
+      {
+        "type": "os",
+        "key": "{#90}{$1}│ {#93}OS          {#90}│",
+        "format": "{$2}{$3}{pretty-name} {codename} {#2}[v{version}] {#2}[{arch}]"
+      },
+      {
+        "type": "kernel",
+        "key": "{#90}{$1}│ {#93}Kernel      {#90}│",
+        "format": "{$2}{$3}{sysname} {#2}[v{release}]"
+      },
+      {
+        "type": "uptime",
+        "key": "{#90}{$1}│ {#93}Uptime      {#90}│",
+        "format": "{$2}{$3}{?days}{days} Days + {?}{hours}:{minutes}:{seconds}"
+      },
+      {
+        "type": "cpu",
+        "key": "{#90}{$1}│ {#91}CPU         {#90}│",
+        "showPeCoreCount": true,
+        "temp": true,
+        "format": "{$2}{$3}{name} {#2}[C:{core-types}] {#2}[{freq-max}]"
+      },
+      {
+        "type": "gpu",
+        "key": "{#90}{$1}│ {#91}GPU         {#90}│",
+        "detectionMethod": "auto",
+        "driverSpecific": true,
+        "format": "{$2}{$3}{name} {#2}[C:{core-count}] {#2}[{type}]"
+      },
+      {
+        "type": "memory",
+        "key": "{#90}{$1}│ {#91}Memory      {#90}│",
+        "format": "{$2}{$3}{used} / {total} ({percentage}{$2})"
+      },
+      {
+        "type": "disk",
+        "key": "{#90}{$1}│ {#91}Disk        {#90}│",
+        "format": "{$2}{$3}{size-used} / {size-total} ({size-percentage}{$2})"
+      },
+      {
+        "type": "poweradapter",
+        "key": "{#90}{$1}│ {#91}Power       {#90}│",
+        "format": "{$2}{$3}{name}"
+      },
+      {
+        "type": "terminal",
+        "key": "{#90}{$1}│ {#95}Terminal    {#90}│",
+        "format": "{$2}{$3}{pretty-name} {#2}[{version}] [PID:{pid}]"
+      },
+      {
+        "type": "terminalfont",
+        "key": "{#90}{$1}│ {#95}Font        {#90}│",
+        "format": "{$2}{$3}{name}  {#2}[{size}]"
+      },
+      {
+        "type": "shell",
+        "key": "{#90}{$1}│ {#95}Shell       {#90}│",
+        "format": "{$2}{$3}{pretty-name}  {#2}[v{version}] [PID:{pid}]"
+      },
+      {
+        // localip IPv4
+        "type": "localip",
+        "key": "{#90}{$1}│ {#94}Local IPv4  {#90}│",
+        "showPrefixLen": true,
+        "showIpv4": true,
+        "showIpv6": false,
+        "showMtu": true,
+        "format": "{$2}{$3}{ifname}: {ipv4}  {#2}[MTU:{mtu}]"
+      },
+      {
+        // localip IPv6
+        "type": "localip",
+        "key": "{#90}{$1}│ {#94}Local IPv6  {#90}│",
+        "showPrefixLen": true,
+        "showIpv4": false,
+        "showIpv6": true,
+        "showMtu": true,
+        "format": "{$2}{$3}{ifname}: {ipv6}  {#2}[MTU:{mtu}]"
+      },
+      {
+        "type": "publicip",
+        "key": "{#90}{$1}│ {#94}Public IPv4 {#90}│",
+        "ipv6": false,
+        "format": "{$2}{$3}{ip}  {#2}[{location}]"
+      },
+      {
+        "type": "publicip",
+        "key": "{#90}{$1}│ {#94}Public IPv6 {#90}│",
+        "ipv6": true,
+        "format": "{$2}{$3}{ip}  {#2}[{location}]"
+      },
+      // CUSTOM - Button UI bar
+      {
+        "type": "custom",
+        "key": "{#90}{$1}╰─────────────╯",
+        "format": "{#90}{$2}╰────────────────────────────────────────────────────────────╯",
+      }
+    ]
+  }

presets/examples/3.jsonc

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

presets/examples/4.jsonc

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

presets/examples/5.jsonc

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

presets/examples/6.jsonc

@@ -3,12 +3,6 @@
 
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    // "logo": {
-    //     "type": "iterm",
-    //     "source": "/Users/carter/Desktop/apple1.png",
-    //     "width": 28,
-    //     "height": 12
-    // },
     "display": {
         "separator": " "
     },
@@ -125,23 +119,22 @@
             "key": "╰─󰸉",
             "keyColor": "yellow"
         },
-
         "break",
+
         {
             "type": "title",
             "key": "╭─",
-            "format": "{1}@{2}",
+            "format": "{user-name}@{host-name}",
             "keyColor": "blue"
         },
         {
             "type": "os",
-            "key": "├─", // Just get your distro's logo off nerdfonts.com
+            "key": "├─{icon}", // Just get your distro's logo off nerdfonts.com
             "keyColor": "blue"
         },
         {
             "type": "kernel",
             "key": "├─",
-            "format": "{1} {2}",
             "keyColor": "blue"
         },
         {
@@ -168,12 +161,13 @@
         {
             "type": "publicip",
             "key": "├─󰩠",
-            "keyColor": "blue"
+            "keyColor": "blue",
+            "timeout": 1000
         },
         {
             "type": "wifi",
             "key": "├─",
-            "format": "{4}", // ssid
+            "format": "{ssid}",
             "keyColor": "blue"
         },
         {

presets/examples/7.jsonc

@@ -22,9 +22,8 @@
         },
         {
             "type": "os",
-            "key": "├", // Just get your distro's logo off nerdfonts.com
-            "keyColor": "yellow",
-            "format": "{6}{?6} {?}{10}{?10} {?}{8}{?8} {?}{11}"
+            "key": "├{icon}", // Just get your distro's logo off nerdfonts.com
+            "keyColor": "yellow"
         },
         {
             "type": "kernel",
@@ -106,13 +105,13 @@
             "keyColor": "green"
         },
         {
-            "type": "uptime",
-            "key": "├󰅐",
+            "type": "display",
+            "key": "├󰍹",
             "keyColor": "green"
         },
         {
-            "type": "display",
-            "key": "└󰍹",
+            "type": "uptime",
+            "key": "└󰅐",
             "keyColor": "green"
         },
 

presets/examples/8.jsonc

@@ -11,6 +11,9 @@
         "size": {
             "ndigits": 0,
             "maxPrefix": "MB"
+        },
+        "key": {
+            "type": "icon"
         }
     },
     "modules": [
@@ -22,31 +25,17 @@
                 "host": "blue"
             }
         },
+        "os",
+        "kernel",
+        "memory",
+        "packages",
+        "uptime",
         {
-            "type": "os",
-            "key": "",
-            "format": "{2} {8}"
-        },
-        {
-            "type": "kernel",
-            "key": ""
-        },
-        {
-            "type": "memory",
-            "key": ""
-        },
-        {
-            "type": "packages",
-            "key": "󰏖"
-        },
-        {
-            "type": "uptime",
-            "key": "󰅐"
-        },
-        {
-            "type": "custom",
-            "key": "",
-            "format": "{#31}███{#32}███{#33}███{#34}███{#35}███{#36}███"
+            "type": "colors",
+            "key": "Colors", // For printing icon
+            "block": {
+                "range": [1, 6]
+            }
         }
     ]
 }

presets/examples/9.jsonc

@@ -4,7 +4,9 @@
         "type": "small"
     },
     "display": {
-        "keyWidth": 11,
+        "key": {
+            "width": 11
+        },
         "bar": {
             "charElapsed": "=",
             "charTotal": "-",
@@ -23,7 +25,10 @@
             "type": "disk",
             "folders": "/"
         },
-        "battery",
+        {
+            "type": "battery",
+            "key": "Battery"
+        },
         {
             "type": "colors",
             "paddingLeft": 10,

presets/hardware.jsonc

@@ -1,37 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "modules": [
-	    {
-		    "type": "host",
-			"format": "{?2}{2}{?}{?5} ({5}){?}"
-		},
-		"chassis",
-		{
-		    "type": "board",
-			"format": "{?1}{1}{?}{?2} ({2}){?}"
-		},
-        "cpu",
-        {
-            "type": "memory",
-            "format": "{?2}{2}{?}"
-        },
-		"physicaldisk",
-		"gpu",
-	    "display",
-		"monitor",
-		{
-		    "type": "wifi",
-			"format": "{?1}{1}{?}{?6} - {6}{?}"
-		},
-	    {
-		    "type": "sound",
-			"format": "{?2}{2}{?}"
-		},
-		"camera",
-        {
-            "type": "battery",
-            "format": "{?1}{1}{?}{?2} {2}{?}{?3} ({3}){?}"
-        },
-		"poweradapter"
-    ]
-}

presets/neofetch.jsonc

@@ -11,7 +11,10 @@
         "separator",
         "os",
         "host",
-        "kernel",
+        {
+            "type": "kernel",
+            "format": "{release}"
+        },
         "uptime",
         "packages",
         "shell",
@@ -28,7 +31,7 @@
         "terminal",
         {
             "type": "terminalfont",
-            "format": "{/2}{-}{/}{2}{?3} {3}{?}"
+            "format": "{/name}{-}{/}{name}{?size} {size}{?}"
         },
         "cpu",
         {
@@ -37,7 +40,7 @@
         },
         {
             "type": "memory",
-            "format": "{/1}{-}{/}{/2}{-}{/}{} / {}"
+            "format": "{} / {}"
         },
         "break",
         "colors"

presets/software.jsonc

@@ -1,17 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "modules": [
-        "os",
-        "kernel",
-        "shell",
-        "de",
-        "wm",
-        "wmtheme",
-        "theme",
-        "icons",
-        "font",
-        "cursor",
-        "terminal",
-        "terminalfont"
-    ]
-}

scripts/gen-pciids.py

@@ -0,0 +1,95 @@
+from requests import get as http_get
+
+class PciDeviceModel:
+    def __init__(self, id: int, name: str):
+        self.id = id
+        self.name = name
+
+class PciVendorModel:
+    def __init__(self, id: int, name: str):
+        self.id = id
+        self.name = name
+        self.devices = []
+
+def main(keep_vendor_list: set):
+    vendors = []
+    try:
+        with open('pci.ids', 'r') as f:
+            full_text = f.read()
+    except FileNotFoundError:
+        response = http_get('https://pci-ids.ucw.cz/v2.2/pci.ids')
+        full_text = response.text
+
+    dev_list_text = full_text[:full_text.rfind('\n\n\n')]  # remove known classes
+    for line in dev_list_text.split('\n'):
+        if not line or line[0] == '#':
+            continue
+        if line[0] != '\t':
+            id, name = line.split('  ', maxsplit=1)
+            vendors.append(PciVendorModel(int(id, 16), name))
+        elif line[1] != '\t':
+            id, name = line[1:].split('  ', maxsplit=1)
+            vendors[-1].devices.append(PciDeviceModel(int(id, 16), name))
+
+    code = """\
+// SPDX-License-Identifier: BSD-3-Clause
+// https://opensource.org/license/BSD-3-Clause
+// Generated from https://pci-ids.ucw.cz/v2.2/pci.ids
+
+#include <stdint.h>
+#include <stddef.h>
+
+typedef struct FFPciDevice
+{
+    const uint32_t id;
+    const char* name;
+} FFPciDevice;
+
+typedef struct FFPciVendor
+{
+    const uint32_t id;
+    const char* name;
+    const FFPciDevice* devices;
+    const uint32_t nDevices;
+} FFPciVendor;
+"""
+
+    if keep_vendor_list:
+        vendors = [vendor for vendor in vendors if vendor.id in keep_vendor_list]
+
+    for vendor in vendors:
+        if vendor.devices:
+            piece = ',\n    '.join('{{ 0x{:04X}, "{}" }}'.format(device.id, device.name.replace('"', '\\"')) for device in vendor.devices)
+            code += f"""
+// {vendor.name}
+static const FFPciDevice pciDevices_{vendor.id:04X}[] = {{
+    {piece},
+    {{}},
+}};
+"""
+
+    piece = ',\n    '.join('{{ 0x{:04X}, "{}", {}, {} }}'.format(vendor.id, vendor.name.replace('"', '\\"'), vendor.devices and f"pciDevices_{vendor.id:04X}" or "NULL", len(vendor.devices)) for vendor in vendors)
+    code += f"""
+const FFPciVendor ffPciVendors[] = {{
+    {piece},
+    {{}},
+}};"""
+
+    print(code)
+
+if __name__ == '__main__':
+    # From <src/detection/gpu/gpu.c>
+    main({
+        0x106b, # Apple
+        0x1002, 0x1022, # AMD
+        0x8086, 0x8087, 0x03e7, # Intel
+        0x0955, 0x10de, 0x12d2, # Nvidia
+        0x1ed5, # MThreads
+        0x5143, # Qualcomm
+        0x14c3, # MTK
+        0x15ad, # VMware
+        0x1af4, # RedHat
+        0x1ab8, # Parallel
+        0x1414, # Microsoft
+        0x108e, # Oracle
+    })

src/common/commandoption.c

@@ -1,4 +1,5 @@
 #include "commandoption.h"
+#include "common/color.h"
 #include "common/printing.h"
 #include "common/time.h"
 #include "common/jsonconfig.h"
@@ -105,32 +106,35 @@ static void parseStructureCommand(
 void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc)
 {
     //Parse the structure and call the modules
+    int32_t thres = instance.config.display.stat;
     uint32_t startIndex = 0;
     while (startIndex < data->structure.length)
     {
         uint32_t colonIndex = ffStrbufNextIndexC(&data->structure, startIndex, ':');
         data->structure.chars[colonIndex] = '\0';
 
-        uint64_t ms = 0;
-        if(instance.config.display.stat)
+        double ms = 0;
+        if(thres >= 0)
             ms = ffTimeGetTick();
 
         parseStructureCommand(data->structure.chars + startIndex, genJsonResult, jsonDoc);
 
-        if(instance.config.display.stat)
+        if(thres >= 0)
         {
             ms = ffTimeGetTick() - ms;
 
             if (jsonDoc)
             {
                 yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(jsonDoc->root);
-                yyjson_mut_obj_add_uint(jsonDoc, moduleJson, "stat", ms);
+                yyjson_mut_obj_add_real(jsonDoc, moduleJson, "stat", ms);
             }
             else
             {
-                char str[32];
-                int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
-                printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+                char str[64];
+                int len = snprintf(str, sizeof str, "%.3fms", ms);
+                if (thres > 0)
+                    snprintf(str, sizeof str, "\e[%sm%.3fms\e[m", (ms <= thres ? FF_COLOR_FG_GREEN : ms <= 2 * thres ? FF_COLOR_FG_YELLOW : FF_COLOR_FG_RED), ms);
+                printf("\e[s\e[1A\e[9999999C\e[%dD%s\e[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
             }
         }
 

src/common/dbus.c

@@ -7,12 +7,11 @@
 
 static bool loadLibSymbols(FFDBusLibrary* lib)
 {
-    FF_LIBRARY_LOAD(dbus, &instance.config.library.libDBus, false, "libdbus-1" FF_LIBRARY_EXTENSION, 4);
+    FF_LIBRARY_LOAD(dbus, false, "libdbus-1" FF_LIBRARY_EXTENSION, 4);
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_bus_get, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_new_method_call, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_append_args, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_init, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_init_append, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_append_basic, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_get_arg_type, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_get_basic, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_recurse, false)
@@ -20,10 +19,6 @@ static bool loadLibSymbols(FFDBusLibrary* lib)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_next, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_unref, false)
     FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_send_with_reply_and_block, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_flush, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_block, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_steal_reply, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_unref, false)
     dbus = NULL; // don't auto dlclose
     return true;
 }
@@ -56,11 +51,11 @@ const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data)
     return NULL;
 }
 
-bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
+bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
 {
     int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);
 
-    if(argType == DBUS_TYPE_STRING)
+    if(argType == DBUS_TYPE_STRING || argType == DBUS_TYPE_OBJECT_PATH)
     {
         const char* value = NULL;
         dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
@@ -72,6 +67,14 @@ bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
         return true;
     }
 
+    if (argType == DBUS_TYPE_BYTE)
+    {
+        uint8_t value;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        ffStrbufAppendC(result, (char) value);
+        return false; // Don't append a comma
+    }
+
     if(argType != DBUS_TYPE_VARIANT && argType != DBUS_TYPE_ARRAY)
         return false;
 
@@ -79,7 +82,7 @@ bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
     dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
 
     if(argType == DBUS_TYPE_VARIANT)
-        return ffDBusGetValue(dbus, &subIter, result);
+        return ffDBusGetString(dbus, &subIter, result);
 
     //At this point we have an array
 
@@ -87,13 +90,16 @@ bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
 
     while(true)
     {
-        if(ffDBusGetValue(dbus, &subIter, result))
+        if(ffDBusGetString(dbus, &subIter, result))
         {
             foundAValue = true;
             ffStrbufAppendS(result, ", ");
         }
 
-        FF_DBUS_ITER_CONTINUE(dbus, &subIter);
+        if(!dbus->lib->ffdbus_message_iter_next(&subIter))
+            break;
+        else
+            continue;
     }
 
     if(foundAValue)
@@ -122,11 +128,27 @@ bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result)
     return ffDBusGetBool(dbus, &subIter, result);
 }
 
-bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result)
+bool ffDBusGetUint(FFDBusData* dbus, DBusMessageIter* iter, uint32_t* result)
 {
     int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);
 
     if(argType == DBUS_TYPE_BYTE)
+    {
+        uint8_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value;
+        return true;
+    }
+
+    if(argType == DBUS_TYPE_UINT16)
+    {
+        uint16_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value;
+        return true;
+    }
+
+    if(argType == DBUS_TYPE_UINT32)
     {
         dbus->lib->ffdbus_message_iter_get_basic(iter, result);
         return true;
@@ -137,15 +159,18 @@ bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result)
 
     DBusMessageIter subIter;
     dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
-    return ffDBusGetByte(dbus, &subIter, result);
+    return ffDBusGetUint(dbus, &subIter, result);
 }
 
-DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method)
+DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method, const char* arg)
 {
     DBusMessage* message = dbus->lib->ffdbus_message_new_method_call(busName, objectPath, interface, method);
     if(message == NULL)
         return NULL;
 
+    if (arg)
+        dbus->lib->ffdbus_message_append_args(message, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
+
     DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
 
     dbus->lib->ffdbus_message_unref(message);
@@ -159,20 +184,10 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
     if(message == NULL)
         return NULL;
 
-    DBusMessageIter requestIterator;
-    dbus->lib->ffdbus_message_iter_init_append(message, &requestIterator);
-
-    if(!dbus->lib->ffdbus_message_iter_append_basic(&requestIterator, DBUS_TYPE_STRING, &interface))
-    {
-        dbus->lib->ffdbus_message_unref(message);
-        return NULL;
-    }
-
-    if(!dbus->lib->ffdbus_message_iter_append_basic(&requestIterator, DBUS_TYPE_STRING, &property))
-    {
-        dbus->lib->ffdbus_message_unref(message);
-        return NULL;
-    }
+    dbus->lib->ffdbus_message_append_args(message,
+        DBUS_TYPE_STRING, &interface,
+        DBUS_TYPE_STRING, &property,
+        DBUS_TYPE_INVALID);
 
     DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
 
@@ -194,7 +209,27 @@ bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char*
         return false;
     }
 
-    bool ret = ffDBusGetValue(dbus, &rootIterator, result);
+    bool ret = ffDBusGetString(dbus, &rootIterator, result);
+
+    dbus->lib->ffdbus_message_unref(reply);
+
+    return ret;
+}
+
+bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result)
+{
+    DBusMessage* reply = ffDBusGetProperty(dbus, busName, objectPath, interface, property);
+    if(reply == NULL)
+        return false;
+
+    DBusMessageIter rootIterator;
+    if(!dbus->lib->ffdbus_message_iter_init(reply, &rootIterator))
+    {
+        dbus->lib->ffdbus_message_unref(reply);
+        return false;
+    }
+
+    bool ret = ffDBusGetUint(dbus, &rootIterator, result);
 
     dbus->lib->ffdbus_message_unref(reply);
 

src/common/dbus.h

@@ -6,23 +6,14 @@
 #include "util/FFstrbuf.h"
 #include "common/library.h"
 
-#define FF_DBUS_TIMEOUT_MILLISECONDS 35
-
-#define FF_DBUS_ITER_CONTINUE(dbus, iterator) \
-    { \
-        if(!(dbus)->lib->ffdbus_message_iter_has_next(iterator)) \
-            break; \
-        (dbus)->lib->ffdbus_message_iter_next(iterator); \
-        continue; \
-    }
+#define FF_DBUS_TIMEOUT_MILLISECONDS 100
 
 typedef struct FFDBusLibrary
 {
     FF_LIBRARY_SYMBOL(dbus_bus_get)
     FF_LIBRARY_SYMBOL(dbus_message_new_method_call)
+    FF_LIBRARY_SYMBOL(dbus_message_append_args)
     FF_LIBRARY_SYMBOL(dbus_message_iter_init)
-    FF_LIBRARY_SYMBOL(dbus_message_iter_init_append)
-    FF_LIBRARY_SYMBOL(dbus_message_iter_append_basic)
     FF_LIBRARY_SYMBOL(dbus_message_iter_get_arg_type)
     FF_LIBRARY_SYMBOL(dbus_message_iter_get_basic)
     FF_LIBRARY_SYMBOL(dbus_message_iter_recurse)
@@ -30,10 +21,6 @@ typedef struct FFDBusLibrary
     FF_LIBRARY_SYMBOL(dbus_message_iter_next)
     FF_LIBRARY_SYMBOL(dbus_message_unref)
     FF_LIBRARY_SYMBOL(dbus_connection_send_with_reply_and_block)
-    FF_LIBRARY_SYMBOL(dbus_connection_flush)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_block)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_steal_reply)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_unref)
 } FFDBusLibrary;
 
 typedef struct FFDBusData
@@ -43,11 +30,12 @@ typedef struct FFDBusData
 } FFDBusData;
 
 const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data); //Returns an error message or NULL on success
-bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result);
+bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result);
 bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result);
-bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result);
-DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method);
+bool ffDBusGetUint(FFDBusData* dbus, DBusMessageIter* iter, uint32_t* result);
+DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method, const char* arg);
 DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property);
 bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result);
+bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result);
 
 #endif // FF_HAVE_DBUS

src/common/format.c

@@ -8,39 +8,53 @@
 
 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
 {
-    if(formatarg->type == FF_FORMAT_ARG_TYPE_INT)
-        ffStrbufAppendF(buffer, "%i", *(int*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT)
-        ffStrbufAppendF(buffer, "%" PRIu32, *(uint32_t*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT64)
-        ffStrbufAppendF(buffer, "%" PRIu64, *(uint64_t*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT16)
-        ffStrbufAppendF(buffer, "%" PRIu16, *(uint16_t*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT8)
-        ffStrbufAppendF(buffer, "%" PRIu8, *(uint8_t*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_STRING)
-        ffStrbufAppendS(buffer, (const char*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_STRBUF)
-        ffStrbufAppend(buffer, (FFstrbuf*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_FLOAT)
-        ffStrbufAppendF(buffer, "%f", *(float*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_DOUBLE)
-        ffStrbufAppendF(buffer, "%g", *(double*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_BOOL)
-        ffStrbufAppendS(buffer, *(bool*)formatarg->value ? "true" : "false");
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_LIST)
+    switch(formatarg->type)
     {
-        const FFlist* list = formatarg->value;
-        for(uint32_t i = 0; i < list->length; i++)
+        case FF_FORMAT_ARG_TYPE_INT:
+            ffStrbufAppendF(buffer, "%" PRIi32, *(int32_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_UINT:
+            ffStrbufAppendF(buffer, "%" PRIu32, *(uint32_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_UINT64:
+            ffStrbufAppendF(buffer, "%" PRIu64, *(uint64_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_UINT16:
+            ffStrbufAppendF(buffer, "%" PRIu16, *(uint16_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_UINT8:
+            ffStrbufAppendF(buffer, "%" PRIu8, *(uint8_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_STRING:
+            ffStrbufAppendS(buffer, (const char*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_STRBUF:
+            ffStrbufAppend(buffer, (FFstrbuf*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_FLOAT:
+            ffStrbufAppendF(buffer, "%f", *(float*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_DOUBLE:
+            ffStrbufAppendF(buffer, "%g", *(double*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_BOOL:
+            ffStrbufAppendS(buffer, *(bool*)formatarg->value ? "true" : "false");
+            break;
+        case FF_FORMAT_ARG_TYPE_LIST:
         {
-            ffStrbufAppend(buffer, ffListGet(list, i));
-            if(i < list->length - 1)
-                ffStrbufAppendS(buffer, ", ");
+            const FFlist* list = formatarg->value;
+            for(uint32_t i = 0; i < list->length; i++)
+            {
+                ffStrbufAppend(buffer, ffListGet(list, i));
+                if(i < list->length - 1)
+                    ffStrbufAppendS(buffer, ", ");
+            }
+            break;
         }
-    }
-    else if(formatarg->type != FF_FORMAT_ARG_TYPE_NULL)
-    {
-        fprintf(stderr, "Error: format string \"%s\": argument is not implemented: %i\n", buffer->chars, formatarg->type);
+        default:
+            if(formatarg->type != FF_FORMAT_ARG_TYPE_NULL)
+                fprintf(stderr, "Error: format string \"%s\": argument is not implemented: %i\n", buffer->chars, formatarg->type);
+            break;
     }
 }
 
@@ -100,7 +114,8 @@ static inline bool formatArgSet(const FFformatarg* arg)
         (arg->type == FF_FORMAT_ARG_TYPE_UINT8 && *(uint8_t*)arg->value > 0) ||
         (arg->type == FF_FORMAT_ARG_TYPE_UINT16 && *(uint16_t*)arg->value > 0) ||
         (arg->type == FF_FORMAT_ARG_TYPE_UINT && *(uint32_t*)arg->value > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_BOOL && arg->value != NULL)
+        (arg->type == FF_FORMAT_ARG_TYPE_BOOL && *(bool*)arg->value) ||
+        (arg->type == FF_FORMAT_ARG_TYPE_LIST && ((FFlist*)arg->value)->length > 0)
     );
 }
 
@@ -244,18 +259,39 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
             continue;
         }
 
-        int32_t truncLength = INT32_MAX;
-        char* pColon = memchr(placeholderValue.chars, ':', placeholderValue.length);
-        if (pColon != NULL)
+        //test for constant, if so evaluate it
+        if (firstChar == '$')
         {
-            char* pEnd = NULL;
-            truncLength = (int32_t) strtol(pColon + 1, &pEnd, 10);
-            if (*pEnd != '\0')
+            char* pend = NULL;
+            int32_t indexSigned = (int32_t) strtol(placeholderValue.chars + 1, &pend, 10);
+            uint32_t index = (uint32_t) indexSigned;
+            bool backward = indexSigned < 0;
+
+            if (indexSigned == 0 || *pend != '\0' || instance.config.display.constants.length < index)
             {
                 appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
                 continue;
             }
-            *pColon = '\0';
+
+            FFstrbuf* item = FF_LIST_GET(FFstrbuf, instance.config.display.constants, backward
+                ? instance.config.display.constants.length - index
+                : index - 1);
+            ffStrbufAppend(buffer, item);
+            continue;
+        }
+
+        char* pSep = placeholderValue.chars;
+        char cSep = '\0';
+        while (*pSep && *pSep != ':' && *pSep != '<' && *pSep != '>' && *pSep != '~')
+            ++pSep;
+        if (*pSep)
+        {
+            cSep = *pSep;
+            *pSep = '\0';
+        }
+        else
+        {
+            pSep = NULL;
         }
 
         uint32_t index = getArgumentIndex(placeholderValue.chars, numArgs, arguments);
@@ -266,26 +302,99 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
 
         if (index > numArgs)
         {
-            if (pColon) *pColon = ':';
+            if (pSep) *pSep = cSep;
             appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
             continue;
         }
 
-        bool ellipsis = false;
-        if (truncLength < 0)
+        if (!cSep)
+            ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
+        else if (cSep == '~')
         {
-            ellipsis = true;
-            truncLength = -truncLength;
-        }
+            FF_STRBUF_AUTO_DESTROY tempString = ffStrbufCreate();
+            ffFormatAppendFormatArg(&tempString, &arguments[index - 1]);
 
-        uint32_t oldLength = buffer->length;
-        ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
-        if (buffer->length - oldLength > (uint32_t) truncLength)
+            char* pEnd = NULL;
+            int32_t start = (int32_t) strtol(pSep + 1, &pEnd, 10);
+            if (start < 0)
+                start = (int32_t) tempString.length + start;
+            if (start >= 0 && (uint32_t) start < tempString.length)
+            {
+                if (*pEnd == '\0')
+                    ffStrbufAppendNS(buffer, tempString.length - (uint32_t) start, &tempString.chars[start]);
+                else if (*pEnd == ',')
+                {
+                    int32_t end = (int32_t) strtol(pEnd + 1, &pEnd, 10);
+                    if (!*pEnd)
+                    {
+                        if (end < 0)
+                            end = (int32_t) tempString.length + end;
+                        if ((uint32_t) end > tempString.length)
+                            end = (int32_t) tempString.length;
+                        if (end > start)
+                            ffStrbufAppendNS(buffer, (uint32_t) (end - start), &tempString.chars[start]);
+                    }
+                }
+            }
+
+            if (*pEnd)
+            {
+                *pSep = cSep;
+                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
+                continue;
+            }
+        }
+        else
         {
-            ffStrbufSubstrBefore(buffer, oldLength + (uint32_t) truncLength);
-            ffStrbufTrimRightSpace(buffer);
-            if (ellipsis)
-                ffStrbufAppendS(buffer, "…");
+            char* pEnd = NULL;
+            int32_t truncLength = (int32_t) strtol(pSep + 1, &pEnd, 10);
+            if (*pEnd != '\0')
+            {
+                *pSep = cSep;
+                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
+                continue;
+            }
+
+            bool ellipsis = false;
+            if (truncLength < 0)
+            {
+                ellipsis = true;
+                truncLength = -truncLength;
+            }
+
+            FF_STRBUF_AUTO_DESTROY tempString = ffStrbufCreate();
+            ffFormatAppendFormatArg(&tempString, &arguments[index - 1]);
+            if (tempString.length == (uint32_t) truncLength)
+                ffStrbufAppend(buffer, &tempString);
+            else if (tempString.length > (uint32_t) truncLength)
+            {
+                if (cSep == ':')
+                {
+                    ffStrbufSubstrBefore(&tempString, (uint32_t) truncLength);
+                    ffStrbufTrimRightSpace(&tempString);
+                }
+                else
+                    ffStrbufSubstrBefore(&tempString, (uint32_t) (!ellipsis? truncLength : truncLength - 1));
+                ffStrbufAppend(buffer, &tempString);
+
+                if (ellipsis)
+                    ffStrbufAppendS(buffer, "…");
+            }
+            else if (cSep == ':')
+                ffStrbufAppend(buffer, &tempString);
+            else
+            {
+                if (cSep == '<')
+                {
+                    ffStrbufAppend(buffer, &tempString);
+                    ffStrbufAppendNC(buffer, (uint32_t) truncLength - tempString.length, ' ');
+                }
+                else
+                {
+                    ffStrbufAppendNC(buffer, (uint32_t) truncLength - tempString.length, ' ');
+                    ffStrbufAppend(buffer, &tempString);
+                }
+            }
         }
     }
 

src/common/format.h

@@ -1,6 +1,8 @@
 #pragma once
 
-typedef enum FFformatargtype
+#include "util/FFstrbuf.h"
+
+typedef enum FFformatArgType
 {
     FF_FORMAT_ARG_TYPE_NULL = 0,
     FF_FORMAT_ARG_TYPE_UINT,
@@ -14,11 +16,26 @@ typedef enum FFformatargtype
     FF_FORMAT_ARG_TYPE_DOUBLE,
     FF_FORMAT_ARG_TYPE_LIST,
     FF_FORMAT_ARG_TYPE_BOOL
-} FFformatargtype;
+} FFformatArgType;
+
+#define FF_FORMAT_ARG(variable, var_name) { _Generic((variable), \
+        uint32_t: FF_FORMAT_ARG_TYPE_UINT, \
+        uint64_t: FF_FORMAT_ARG_TYPE_UINT64, \
+        uint16_t: FF_FORMAT_ARG_TYPE_UINT16, \
+        uint8_t: FF_FORMAT_ARG_TYPE_UINT8, \
+        int32_t: FF_FORMAT_ARG_TYPE_INT, \
+        char*: FF_FORMAT_ARG_TYPE_STRING, \
+        const char*: FF_FORMAT_ARG_TYPE_STRING, \
+        FFstrbuf: FF_FORMAT_ARG_TYPE_STRBUF, \
+        float: FF_FORMAT_ARG_TYPE_FLOAT, \
+        double: FF_FORMAT_ARG_TYPE_DOUBLE, \
+        FFlist: FF_FORMAT_ARG_TYPE_LIST, \
+        bool: FF_FORMAT_ARG_TYPE_BOOL \
+    ), _Generic((variable), char*: (variable), const char*: (variable), default: &(variable) ), (var_name) }
 
 typedef struct FFformatarg
 {
-    FFformatargtype type;
+    FFformatArgType type;
     const void* value;
     const char* name; // argument name, must start with an alphabet
 } FFformatarg;

src/common/init.c

@@ -43,7 +43,6 @@ static void defaultConfig(void)
     ffOptionsInitGeneral(&instance.config.general);
     ffOptionsInitModules(&instance.config.modules);
     ffOptionsInitDisplay(&instance.config.display);
-    ffOptionsInitLibrary(&instance.config.library);
 }
 
 void ffInitInstance(void)
@@ -54,10 +53,6 @@ void ffInitInstance(void)
     #else
         // Never use `setlocale(LC_ALL, "")`
         setlocale(LC_TIME, "");
-        setlocale(LC_NUMERIC, "");
-        #ifdef LC_MESSAGES
-            setlocale(LC_MESSAGES, "");
-        #endif
     #endif
 
     initState(&instance.state);
@@ -152,7 +147,6 @@ static void destroyConfig(void)
     ffOptionsDestroyGeneral(&instance.config.general);
     ffOptionsDestroyModules(&instance.config.modules);
     ffOptionsDestroyDisplay(&instance.config.display);
-    ffOptionsDestroyLibrary(&instance.config.library);
 }
 
 static void destroyState(void)
@@ -173,96 +167,105 @@ void ffDestroyInstance(void)
 void ffListFeatures(void)
 {
     fputs(
-        #ifdef FF_HAVE_THREADS
+        #if FF_HAVE_THREADS
             "threads\n"
         #endif
-        #ifdef FF_HAVE_VULKAN
+        #if FF_HAVE_VULKAN
             "vulkan\n"
         #endif
-        #ifdef FF_HAVE_WAYLAND
+        #if FF_HAVE_WAYLAND
             "wayland\n"
         #endif
-        #ifdef FF_HAVE_XCB_RANDR
+        #if FF_HAVE_XCB_RANDR
             "xcb-randr\n"
         #endif
-        #ifdef FF_HAVE_XCB
+        #if FF_HAVE_XCB
             "xcb\n"
         #endif
-        #ifdef FF_HAVE_XRANDR
+        #if FF_HAVE_XRANDR
             "xrandr\n"
         #endif
-        #ifdef FF_HAVE_X11
+        #if FF_HAVE_X11
             "x11\n"
         #endif
-        #ifdef FF_HAVE_DRM
+        #if FF_HAVE_DRM
             "drm\n"
         #endif
-        #ifdef FF_HAVE_GIO
+        #if FF_HAVE_DRM_AMDGPU
+            "drm_amdgpu\n"
+        #endif
+        #if FF_HAVE_GIO
             "gio\n"
         #endif
-        #ifdef FF_HAVE_DCONF
+        #if FF_HAVE_DCONF
             "dconf\n"
         #endif
-        #ifdef FF_HAVE_DBUS
+        #if FF_HAVE_DBUS
             "dbus\n"
         #endif
-        #ifdef FF_HAVE_IMAGEMAGICK7
+        #if FF_HAVE_IMAGEMAGICK7
             "imagemagick7\n"
         #endif
-        #ifdef FF_HAVE_IMAGEMAGICK6
+        #if FF_HAVE_IMAGEMAGICK6
             "imagemagick6\n"
         #endif
-        #ifdef FF_HAVE_CHAFA
+        #if FF_HAVE_CHAFA
             "chafa\n"
         #endif
-        #ifdef FF_HAVE_ZLIB
+        #if FF_HAVE_ZLIB
             "zlib\n"
         #endif
-        #ifdef FF_HAVE_XFCONF
+        #if FF_HAVE_XFCONF
             "xfconf\n"
         #endif
-        #ifdef FF_HAVE_SQLITE3
+        #if FF_HAVE_SQLITE3
             "sqlite3\n"
         #endif
-        #ifdef FF_HAVE_RPM
+        #if FF_HAVE_RPM
             "rpm\n"
         #endif
-        #ifdef FF_HAVE_EGL
+        #if FF_HAVE_EGL
             "egl\n"
         #endif
-        #ifdef FF_HAVE_GLX
+        #if FF_HAVE_GLX
             "glx\n"
         #endif
-        #ifdef FF_HAVE_OSMESA
+        #if FF_HAVE_OSMESA
             "osmesa\n"
         #endif
-        #ifdef FF_HAVE_OPENCL
+        #if FF_HAVE_OPENCL
             "opencl\n"
         #endif
-        #ifdef FF_HAVE_FREETYPE
+        #if FF_HAVE_FREETYPE
             "freetype\n"
         #endif
-        #ifdef FF_HAVE_PULSE
+        #if FF_HAVE_PULSE
             "libpulse\n"
         #endif
-        #ifdef FF_HAVE_LIBNM
-            "libnm\n"
-        #endif
-        #ifdef FF_HAVE_DDCUTIL
+        #if FF_HAVE_DDCUTIL
             "libddcutil\n"
         #endif
-        #ifdef FF_HAVE_DIRECTX_HEADERS
+        #if FF_HAVE_ELF || __sun || __FreeBSD__
+            "libelf\n"
+        #endif
+        #if FF_HAVE_LIBZFS
+            "libzfs\n"
+        #endif
+        #if FF_HAVE_DIRECTX_HEADERS
             "Directx Headers\n"
         #endif
-        #ifdef FF_USE_SYSTEM_YYJSON
+        #if FF_USE_SYSTEM_YYJSON
             "System yyjson\n"
         #endif
-        #if __has_include(<linux/videodev2.h>)
+        #if FF_HAVE_LINUX_VIDEODEV2
             "linux/videodev2\n"
         #endif
-        #if __has_include(<linux/wireless.h>)
+        #if FF_HAVE_LINUX_WIRELESS
             "linux/wireless\n"
         #endif
+        #if FF_HAVE_EMBEDDED_PCIIDS
+            "Embedded pciids\n"
+        #endif
         ""
     , stdout);
 }

src/common/io/io.h

@@ -130,8 +130,8 @@ bool ffPathExpandEnv(const char* in, FFstrbuf* out);
 
 #define FF_IO_TERM_RESP_WAIT_MS 100 // #554
 
-FF_C_SCANF(2, 3)
-const char* ffGetTerminalResponse(const char* request, const char* format, ...);
+FF_C_SCANF(3, 4)
+const char* ffGetTerminalResponse(const char* request, int nParams, const char* format, ...);
 
 // Not thread safe!
 bool ffSuppressIO(bool suppress);

src/common/io/io_unix.c

@@ -4,12 +4,18 @@
 
 #include <fcntl.h>
 #include <termios.h>
-#include <poll.h>
 #include <dirent.h>
 #include <errno.h>
+#ifndef __APPLE__
+#include <poll.h>
+#else
+#include <sys/select.h>
+#endif
 
-#if __has_include(<wordexp.h>)
-#include <wordexp.h>
+#if FF_HAVE_WORDEXP
+    #include <wordexp.h>
+#else
+    #warning "<wordexp.h> not available"
 #endif
 
 static void createSubfolders(const char* fileName)
@@ -112,7 +118,7 @@ bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* o
 {
     bool result = false;
 
-    #if __has_include(<wordexp.h>) // https://github.com/termux/termux-packages/pull/7056
+    #if FF_HAVE_WORDEXP // https://github.com/termux/termux-packages/pull/7056
 
     wordexp_t exp;
     if(wordexp(in, &exp, 0) != 0)
@@ -131,55 +137,72 @@ bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* o
     return result;
 }
 
-const char* ffGetTerminalResponse(const char* request, const char* format, ...)
+static int ftty = -1;
+static struct termios oldTerm;
+void restoreTerm(void)
 {
-    int fin = STDIN_FILENO, fout = STDOUT_FILENO;
-    FF_AUTO_CLOSE_FD int ftty = -1;
+    tcsetattr(ftty, TCSAFLUSH, &oldTerm);
+}
 
-    if (!isatty(STDIN_FILENO))
+const char* ffGetTerminalResponse(const char* request, int nParams, const char* format, ...)
+{
+    if (ftty < 0)
     {
+        ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
         if (ftty < 0)
-            ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
-        fin = ftty;
-    }
-    if (!isatty(STDOUT_FILENO))
-    {
-        if (ftty < 0)
-            ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
-        fout = ftty;
+            return "open(\"/dev/tty\", O_RDWR | O_NOCTTY | O_CLOEXEC) failed";
+
+        if(tcgetattr(ftty, &oldTerm) == -1)
+            return "tcgetattr(STDIN_FILENO, &oldTerm) failed";
+
+        struct termios newTerm = oldTerm;
+        newTerm.c_lflag &= (tcflag_t) ~(ICANON | ECHO);
+        if(tcsetattr(ftty, TCSAFLUSH, &newTerm) == -1)
+            return "tcsetattr(STDIN_FILENO, TCSAFLUSH, &newTerm)";
+        atexit(restoreTerm);
     }
 
-    struct termios oldTerm;
-    if(tcgetattr(fin, &oldTerm) == -1)
-        return "tcgetattr(STDIN_FILENO, &oldTerm) failed";
-
-    struct termios newTerm = oldTerm;
-    newTerm.c_lflag &= (tcflag_t) ~(ICANON | ECHO);
-    if(tcsetattr(fin, TCSAFLUSH, &newTerm) == -1)
-        return "tcsetattr(STDIN_FILENO, TCSAFLUSH, &newTerm)";
-
-    ffWriteFDData(fout, strlen(request), request);
+    ffWriteFDData(ftty, strlen(request), request);
 
     //Give the terminal some time to respond
-    if(poll(&(struct pollfd) { .fd = fin, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS) <= 0)
+    #ifndef __APPLE__
+    if(poll(&(struct pollfd) { .fd = ftty, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS) <= 0)
+        return "poll(/dev/tty) timeout or failed";
+    #else
     {
-        tcsetattr(fin, TCSANOW, &oldTerm);
-        return "poll() timeout or failed";
+        // On macOS, poll(/dev/tty) always returns immediately
+        // See also https://nathancraddock.com/blog/macos-dev-tty-polling/
+        fd_set rd;
+        FD_ZERO(&rd);
+        FD_SET(ftty, &rd);
+        if(select(ftty + 1, &rd, NULL, NULL, &(struct timeval) { .tv_sec = FF_IO_TERM_RESP_WAIT_MS / 1000, .tv_usec = (FF_IO_TERM_RESP_WAIT_MS % 1000) * 1000 }) <= 0)
+            return "select(/dev/tty) timeout or failed";
     }
+    #endif
 
-    char buffer[512];
-    ssize_t bytesRead = read(fin, buffer, sizeof(buffer) - 1);
-
-    tcsetattr(fin, TCSANOW, &oldTerm);
-
-    if(bytesRead <= 0)
-        return "read(STDIN_FILENO, buffer, sizeof(buffer) - 1) failed";
-
-    buffer[bytesRead] = '\0';
+    char buffer[1024];
+    size_t bytesRead = 0;
 
     va_list args;
     va_start(args, format);
-    vsscanf(buffer, format, args);
+
+    while (true)
+    {
+        ssize_t nRead = read(ftty, buffer + bytesRead, sizeof(buffer) - bytesRead - 1);
+
+        if (nRead <= 0)
+            return "read(STDIN_FILENO, buffer, sizeof(buffer) - 1) failed";
+
+        bytesRead += (size_t) nRead;
+        buffer[bytesRead] = '\0';
+
+        int ret = vsscanf(buffer, format, args);
+        if (ret <= 0)
+            return "vsscanf(buffer, format, args) failed";
+        if (ret >= nParams)
+            break;
+    }
+
     va_end(args);
 
     return NULL;
@@ -237,12 +260,15 @@ void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indenta
 
     while((entry = readdir(dir)) != NULL)
     {
+        if(entry->d_name[0] == '.') // skip hidden files
+            continue;
+
         bool isDir = false;
-#ifdef _DIRENT_HAVE_D_TYPE
+#ifndef __sun
         if(entry->d_type != DT_UNKNOWN && entry->d_type != DT_LNK)
             isDir = entry->d_type == DT_DIR;
         else
-#else
+#endif
         {
             struct stat stbuf;
             if (fstatat(dfd, entry->d_name, &stbuf, 0) < 0)
@@ -250,12 +276,8 @@ void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indenta
             else
                 isDir = S_ISDIR(stbuf.st_mode);
         }
-#endif
         if (isDir)
         {
-            if(ffStrEquals(entry->d_name, ".") || ffStrEquals(entry->d_name, ".."))
-                continue;
-
             ffStrbufAppendS(folder, entry->d_name);
             ffStrbufAppendC(folder, '/');
             listFilesRecursively(baseLength, folder, (uint8_t) (indentation + 1), entry->d_name, pretty);

src/common/io/io_windows.c

@@ -205,7 +205,7 @@ void ffListFilesRecursively(const char* path, bool pretty)
     listFilesRecursively(folder.length, &folder, 0, NULL, pretty);
 }
 
-const char* ffGetTerminalResponse(const char* request, const char* format, ...)
+const char* ffGetTerminalResponse(const char* request, int nParams, const char* format, ...)
 {
     HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
     FF_AUTO_CLOSE_FD HANDLE hConin = INVALID_HANDLE_VALUE;
@@ -229,7 +229,6 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
             hConout = CreateFileW(L"CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, NULL);
             hOutput = hConout;
         }
-        WriteFile(hOutput, "TEST\n", 5, &bytes, NULL);
         WriteFile(hOutput, request, (DWORD) strlen(request), &bytes, NULL);
     }
 
@@ -257,20 +256,30 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
             ReadConsoleInputW(hInput, &record, 1, &len);
     }
 
-    char buffer[512];
-    DWORD bytes = 0;
-    ReadFile(hInput, buffer, sizeof(buffer) - 1, &bytes, NULL);
+    va_list args;
+    va_start(args, format);
+
+    char buffer[1024];
+    uint32_t bytesRead = 0;
+
+    while (true)
+    {
+        DWORD bytes = 0;
+        if (!ReadFile(hInput, buffer, sizeof(buffer) - 1, &bytes, NULL) || bytes == 0)
+            return "ReadFile() failed";
+
+        bytesRead += bytes;
+        buffer[bytesRead] = '\0';
+
+        int ret = vsscanf(buffer, format, args);
+        if (ret <= 0)
+            return "vsscanf(buffer, format, args) failed";
+        if (ret >= nParams)
+            break;
+    }
 
     SetConsoleMode(hInput, inputMode);
 
-    if(bytes <= 0)
-        return "ReadFile() failed";
-
-    buffer[bytes] = '\0';
-
-    va_list args;
-    va_start(args, format);
-    vsscanf(buffer, format, args);
     va_end(args);
 
     return NULL;

src/common/jsonconfig.c

@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/color.h"
 #include "common/jsonconfig.h"
 #include "common/printing.h"
 #include "common/io/io.h"
@@ -37,6 +38,11 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs*
         moduleArgs->keyWidth = (uint32_t) yyjson_get_uint(val);
         return true;
     }
+    else if(ffStrEqualsIgnCase(key, "keyIcon"))
+    {
+        ffStrbufSetS(&moduleArgs->keyIcon, yyjson_get_str(val));
+        return true;
+    }
     return false;
 }
 
@@ -50,6 +56,8 @@ void ffJsonConfigGenerateModuleArgsConfig(yyjson_mut_doc* doc, yyjson_mut_val* m
         yyjson_mut_obj_add_strbuf(doc, module, "keyColor", &moduleArgs->keyColor);
     if (moduleArgs->keyWidth != defaultModuleArgs->keyWidth)
         yyjson_mut_obj_add_uint(doc, module, "keyWidth", moduleArgs->keyWidth);
+    if (!ffStrbufEqual(&defaultModuleArgs->keyIcon, &moduleArgs->keyIcon))
+        yyjson_mut_obj_add_strbuf(doc, module, "keyIcon", &moduleArgs->keyIcon);
 }
 
 const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair pairs[])
@@ -174,12 +182,13 @@ static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
     if (!modules) return NULL;
     if (!yyjson_is_arr(modules)) return "Property 'modules' must be an array of strings or objects";
 
+    int32_t thres = instance.config.display.stat;
     yyjson_val* item;
     size_t idx, max;
     yyjson_arr_foreach(modules, idx, max, item)
     {
-        uint64_t ms = 0;
-        if(!prepare && instance.config.display.stat)
+        double ms = 0;
+        if(!prepare && thres >= 0)
             ms = ffTimeGetTick();
 
         yyjson_val* module = item;
@@ -201,19 +210,21 @@ static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
         else if(!parseModuleJsonObject(type, module, jsonDoc))
             return "Unknown module type";
 
-        if(!prepare && instance.config.display.stat)
+        if(!prepare && thres >= 0)
         {
             ms = ffTimeGetTick() - ms;
             if (jsonDoc)
             {
                 yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(jsonDoc->root);
-                yyjson_mut_obj_add_uint(jsonDoc, moduleJson, "stat", ms);
+                yyjson_mut_obj_add_real(jsonDoc, moduleJson, "stat", ms);
             }
             else
             {
-                char str[32];
-                int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
-                printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+                char str[64];
+                int len = snprintf(str, sizeof str, "%.3fms", ms);
+                if (thres > 0)
+                    snprintf(str, sizeof str, "\e[%sm%.3fms\e[m", (ms <= thres ? FF_COLOR_FG_GREEN : ms <= 2 * thres ? FF_COLOR_FG_YELLOW : FF_COLOR_FG_RED), ms);
+                printf("\e[s\e[1A\e[9999999C\e[%dD%s\e[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
             }
         }
 

src/common/library.c

@@ -55,28 +55,28 @@ static void* libraryLoad(const char* path, int maxVersion)
     return result;
 }
 
-void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...)
+void* ffLibraryLoad(const char* path, int maxVersion, ...)
 {
-    if(userProvidedName != NULL && userProvidedName->length > 0)
-        return dlopen(userProvidedName->chars, FF_DLOPEN_FLAGS);
+    void* result = libraryLoad(path, maxVersion);
 
-    va_list defaultNames;
-    va_start(defaultNames, userProvidedName);
-
-    void* result = NULL;
-
-    while(result == NULL)
+    if (!result)
     {
-        const char* path = va_arg(defaultNames, const char*);
-        if(path == NULL)
-            break;
+        va_list defaultNames;
+        va_start(defaultNames, maxVersion);
 
-        int maxVersion = va_arg(defaultNames, int);
-        result = libraryLoad(path, maxVersion);
+        do
+        {
+            const char* pathRest = va_arg(defaultNames, const char*);
+            if(pathRest == NULL)
+                break;
+
+            int maxVersionRest = va_arg(defaultNames, int);
+            result = libraryLoad(pathRest, maxVersionRest);
+        } while (!result);
+
+        va_end(defaultNames);
     }
 
-    va_end(defaultNames);
-
     return result;
 }
 

src/common/library.h

@@ -33,8 +33,8 @@ static inline void ffLibraryUnload(void** handle)
 #define FF_LIBRARY_SYMBOL(symbolName) \
     __typeof__(&symbolName) ff ## symbolName;
 
-#define FF_LIBRARY_LOAD(libraryObjectName, userLibraryName, returnValue, ...) \
-    void* __attribute__((__cleanup__(ffLibraryUnload))) libraryObjectName = ffLibraryLoad(userLibraryName, __VA_ARGS__, NULL);\
+#define FF_LIBRARY_LOAD(libraryObjectName, returnValue, ...) \
+    void* __attribute__((__cleanup__(ffLibraryUnload))) libraryObjectName = ffLibraryLoad(__VA_ARGS__, NULL);\
     if(libraryObjectName == NULL) \
         return returnValue;
 
@@ -72,7 +72,7 @@ static inline void ffLibraryUnload(void** handle)
 #define FF_LIBRARY_LOAD_SYMBOL_PTR(library, varName, symbolName, returnValue) \
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);
 
-void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);
+void* ffLibraryLoad(const char* path, int maxVersion, ...);
 
 #else
 
@@ -81,7 +81,7 @@ void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);
 #define FF_LIBRARY_SYMBOL(symbolName) \
     __typeof__(&symbolName) ff ## symbolName;
 
-#define FF_LIBRARY_LOAD(libraryObjectName, userLibraryName, returnValue, ...) \
+#define FF_LIBRARY_LOAD(libraryObjectName, returnValue, ...) \
     FF_MAYBE_UNUSED void* libraryObjectName = NULL; // Placeholder
 
 #define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \

src/common/modules.c

@@ -8,10 +8,12 @@ static FFModuleBaseInfo* B[] = {
     (void*) &instance.config.modules.battery,
     (void*) &instance.config.modules.bios,
     (void*) &instance.config.modules.bluetooth,
+    (void*) &instance.config.modules.bluetoothRadio,
     (void*) &instance.config.modules.board,
     (void*) &instance.config.modules.bootmgr,
     (void*) &instance.config.modules.break_,
     (void*) &instance.config.modules.brightness,
+    (void*) &instance.config.modules.btrfs,
     NULL,
 };
 
@@ -135,6 +137,7 @@ static FFModuleBaseInfo* T[] = {
     (void*) &instance.config.modules.terminalTheme,
     (void*) &instance.config.modules.title,
     (void*) &instance.config.modules.theme,
+    (void*) &instance.config.modules.tpm,
     NULL,
 };
 
@@ -168,6 +171,7 @@ static FFModuleBaseInfo* Y[] = {
 };
 
 static FFModuleBaseInfo* Z[] = {
+    (void*) &instance.config.modules.zpool,
     NULL,
 };
 

src/common/networking_linux.c

@@ -132,5 +132,6 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf
     } while (ffStrbufGetFree(buffer) > 0 && strstr(buffer->chars + recvStart, "\r\n\r\n") == NULL);
 
     close(state->sockfd);
+    if (buffer->length == 0) return "Empty server response received";
     return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n") ? NULL : "Invalid response";
 }

src/common/networking_windows.c

@@ -63,19 +63,21 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
         return "socket() failed";
     }
 
-    {
-        //ConnectEx requires the socket to be initially bound
-        if(bind(state->sockfd, (SOCKADDR *) &(struct sockaddr_in) {
+    //ConnectEx requires the socket to be initially bound
+    if((state->ipv6
+        ? bind(state->sockfd, (SOCKADDR *) &(struct sockaddr_in6) {
+            .sin6_family = AF_INET6,
+            .sin6_addr = in6addr_any,
+        }, sizeof(struct sockaddr_in6))
+        : bind(state->sockfd, (SOCKADDR *) &(struct sockaddr_in) {
             .sin_family = AF_INET,
             .sin_addr.s_addr = INADDR_ANY,
-            .sin_port = 0,
-        }, sizeof(struct sockaddr_in)) != 0)
-        {
-            closesocket(state->sockfd);
-            freeaddrinfo(addr);
-            state->sockfd = INVALID_SOCKET;
-            return "bind() failed";
-        }
+        }, sizeof(struct sockaddr_in))) != 0)
+    {
+        closesocket(state->sockfd);
+        freeaddrinfo(addr);
+        state->sockfd = INVALID_SOCKET;
+        return "bind() failed";
     }
 
     FF_STRBUF_AUTO_DESTROY command = ffStrbufCreateA(64);
@@ -93,7 +95,6 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
     if(!result && WSAGetLastError() != WSA_IO_PENDING)
     {
         closesocket(state->sockfd);
-        freeaddrinfo(addr);
         state->sockfd = INVALID_SOCKET;
         return "ConnectEx() failed";
     }
@@ -140,5 +141,6 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf
     } while (ffStrbufGetFree(buffer) > 0 && strstr(buffer->chars + recvStart, "\r\n\r\n") == NULL);
 
     closesocket(state->sockfd);
+    if (buffer->length == 0) return "Empty server response received";
     return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n") ? NULL : "Invalid response";
 }

src/common/option.c

@@ -50,20 +50,29 @@ bool ffOptionParseModuleArgs(const char* argumentKey, const char* subKey, const
         ffOptionParseColor(value, &result->outputColor);
         return true;
     }
-    else if(ffStrEqualsIgnCase(subKey, "key-color"))
+    else if(ffStrStartsWithIgnCase(subKey, "key-"))
     {
-        if(value == NULL)
+        const char* subKey2 = subKey + strlen("key-");
+        if(ffStrEqualsIgnCase(subKey2, "color"))
         {
-            fprintf(stderr, "Error: usage: %s <str>\n", argumentKey);
-            exit(477);
+            if(value == NULL)
+            {
+                fprintf(stderr, "Error: usage: %s <str>\n", argumentKey);
+                exit(477);
+            }
+            ffOptionParseColor(value, &result->keyColor);
+            return true;
+        }
+        else if(ffStrEqualsIgnCase(subKey2, "width"))
+        {
+            result->keyWidth = ffOptionParseUInt32(argumentKey, value);
+            return true;
+        }
+        else if(ffStrEqualsIgnCase(subKey2, "icon"))
+        {
+            ffOptionParseString(argumentKey, value, &result->keyIcon);
+            return true;
         }
-        ffOptionParseColor(value, &result->keyColor);
-        return true;
-    }
-    else if(ffStrEqualsIgnCase(subKey, "key-width"))
-    {
-        result->keyWidth = ffOptionParseUInt32(argumentKey, value);
-        return true;
     }
     return false;
 }
@@ -197,6 +206,11 @@ void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
             else FF_APPEND_COLOR_PROP_COND(title, colorTitle)
             else FF_APPEND_COLOR_PROP_COND(output, colorOutput)
             else FF_APPEND_COLOR_PROP_COND(separator, colorSeparator)
+            else
+            {
+                fprintf(stderr, "Error: invalid color code found: %s\n", value);
+                exit(479);
+            }
         }
         ffStrbufAppendC(buffer, *value);
         ++value;
@@ -205,20 +219,3 @@ void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
         #undef FF_APPEND_COLOR_PROP_COND
     }
 }
-
-void ffOptionInitModuleArg(FFModuleArgs* args)
-{
-    ffStrbufInit(&args->key);
-    ffStrbufInit(&args->keyColor);
-    ffStrbufInit(&args->outputFormat);
-    ffStrbufInit(&args->outputColor);
-    args->keyWidth = 0;
-}
-
-void ffOptionDestroyModuleArg(FFModuleArgs* args)
-{
-    ffStrbufDestroy(&args->key);
-    ffStrbufDestroy(&args->keyColor);
-    ffStrbufDestroy(&args->outputFormat);
-    ffStrbufDestroy(&args->outputColor);
-}

src/common/option.h

@@ -45,10 +45,19 @@ static inline void ffOptionInitModuleBaseInfo(
     baseInfo->generateJsonConfig = (__typeof__(baseInfo->generateJsonConfig)) generateJsonConfig;
 }
 
+typedef enum FFModuleKeyType
+{
+    FF_MODULE_KEY_TYPE_NONE = 0,
+    FF_MODULE_KEY_TYPE_STRING = 1 << 0,
+    FF_MODULE_KEY_TYPE_ICON = 1 << 1,
+    FF_MODULE_KEY_TYPE_BOTH = FF_MODULE_KEY_TYPE_STRING | FF_MODULE_KEY_TYPE_ICON,
+} FFModuleKeyType;
+
 typedef struct FFModuleArgs
 {
     FFstrbuf key;
     FFstrbuf keyColor;
+    FFstrbuf keyIcon;
     FFstrbuf outputFormat;
     FFstrbuf outputColor;
     uint32_t keyWidth;
@@ -73,5 +82,22 @@ static inline void ffOptionParseColor(const char* value, FFstrbuf* buffer)
     ffStrbufClear(buffer);
     ffOptionParseColorNoClear(value, buffer);
 }
-void ffOptionInitModuleArg(FFModuleArgs* args);
-void ffOptionDestroyModuleArg(FFModuleArgs* args);
+
+static inline void ffOptionInitModuleArg(FFModuleArgs* args, const char* icon)
+{
+    ffStrbufInit(&args->key);
+    ffStrbufInit(&args->keyColor);
+    ffStrbufInitStatic(&args->keyIcon, icon);
+    ffStrbufInit(&args->outputFormat);
+    ffStrbufInit(&args->outputColor);
+    args->keyWidth = 0;
+}
+
+static inline void ffOptionDestroyModuleArg(FFModuleArgs* args)
+{
+    ffStrbufDestroy(&args->key);
+    ffStrbufDestroy(&args->keyColor);
+    ffStrbufDestroy(&args->keyIcon);
+    ffStrbufDestroy(&args->outputFormat);
+    ffStrbufDestroy(&args->outputColor);
+}

src/common/parsing.c

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

src/common/parsing.h

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

src/common/printing.c

@@ -11,8 +11,10 @@ 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, " ")))
+    if (!(moduleArgs && ffStrbufEqualS(&moduleArgs->key, " ")) && instance.config.display.keyType != FF_MODULE_KEY_TYPE_NONE)
     {
+        ffPrintCharTimes(' ', instance.config.display.keyPaddingLeft);
+
         if(!instance.config.display.pipe)
         {
             fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
@@ -25,21 +27,35 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
                 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)
+        bool hasIcon = false;
+        if (instance.config.display.keyType & FF_MODULE_KEY_TYPE_ICON && moduleArgs && moduleArgs->keyIcon.length > 0)
         {
-            fputs(moduleName, stdout);
-
-            if(moduleIndex > 0)
-                printf(" %hhu", moduleIndex);
+            ffStrbufWriteTo(&moduleArgs->keyIcon, stdout);
+            hasIcon = true;
         }
-        else
+
+        if (instance.config.display.keyType & FF_MODULE_KEY_TYPE_STRING)
         {
-            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(hasIcon)
+                putchar(' ');
+
+            //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, 2, ((FFformatarg[]){
+                    FF_FORMAT_ARG(moduleIndex, "index"),
+                    FF_FORMAT_ARG(moduleArgs->keyIcon, "icon"),
+                }));
+                ffStrbufWriteTo(&key, stdout);
+            }
         }
 
         if(!instance.config.display.pipe)

src/common/processing_windows.c

@@ -8,6 +8,43 @@
 
 enum { FF_PIPE_BUFSIZ = 8192 };
 
+static void argvToCmdline(char* const argv[], FFstrbuf* result)
+{
+    // From https://gist.github.com/jin-x/cdd641d98887524b091fb1f82a68717d
+
+    FF_STRBUF_AUTO_DESTROY temp = ffStrbufCreate();
+    for (int i = 0; argv[i] != NULL; i++)
+    {
+        ffStrbufSetS(&temp, argv[i]);
+        // Add slash (\) before double quotes (") and duplicate slashes before it
+        for (
+            uint32_t pos = ffStrbufFirstIndexC(&temp, '"'), cnt;
+            pos != temp.length;
+            pos = ffStrbufNextIndexC(&temp, pos + cnt * 2, '"')
+        ) {
+            cnt = 1;
+            while (pos > 0 && temp.chars[pos - 1] == '\\') { ++cnt, --pos; }
+            ffStrbufInsertNC(&temp, pos, cnt, '\\');
+        }
+
+        // Add quotes around string if whitespace chars are present (with slash duplicating at the end of string)
+        if (ffStrbufFirstIndexS(&temp, " \t") != temp.length)
+        {
+            uint32_t pos = temp.length;
+            uint32_t cnt = 0;
+            while (pos > 0 && temp.chars[pos - 1] == '\\') { ++cnt, --pos; }
+            if (cnt > 0) ffStrbufAppendNC(&temp, cnt, '\\');
+            ffStrbufPrependC(&temp, '"');
+            ffStrbufAppendC(&temp, '"');
+        }
+
+        // Add space delimiter
+        if (i > 0) ffStrbufAppendC(result, ' ');
+        ffStrbufAppend(result, &temp);
+        ffStrbufClear(&temp);
+    }
+}
+
 const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr)
 {
     int timeout = instance.config.general.processingTimeout;
@@ -55,12 +92,8 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
         else
             siStartInfo.hStdOutput = hChildPipeWrite;
 
-        FF_STRBUF_AUTO_DESTROY cmdline = ffStrbufCreateF("\"%s\"", argv[0]);
-        for(char* const* parg = &argv[1]; *parg; ++parg)
-        {
-            ffStrbufAppendC(&cmdline, ' ');
-            ffStrbufAppendS(&cmdline, *parg);
-        }
+        FF_STRBUF_AUTO_DESTROY cmdline = ffStrbufCreate();
+        argvToCmdline(argv, &cmdline);
 
         success = CreateProcessA(
             NULL,          // application name

src/common/properties.c

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

src/common/properties.h

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

src/common/settings.c

@@ -60,7 +60,7 @@ static const GSettingsData* getGSettingsData(void)
     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(libgsettings, 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)
@@ -141,7 +141,7 @@ static const DConfData* getDConfData(void)
     {
         data.inited = true;
 
-        FF_LIBRARY_LOAD(libdconf, &instance.config.library.libDConf, NULL, "libdconf" FF_LIBRARY_EXTENSION, 2);
+        FF_LIBRARY_LOAD(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)
@@ -218,7 +218,7 @@ static const XFConfData* getXFConfData(void)
     if (!data.inited)
     {
         data.inited = true;
-        FF_LIBRARY_LOAD(libxfconf, &instance.config.library.libXFConf, NULL, "libxfconf-0" FF_LIBRARY_EXTENSION, 4);
+        FF_LIBRARY_LOAD(libxfconf, NULL, "libxfconf-0" FF_LIBRARY_EXTENSION, 4);
 
         FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_get, NULL)
         FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_has_property, NULL)
@@ -292,7 +292,7 @@ static const SQLiteData* getSQLiteData(void)
     if (!data.inited)
     {
         data.inited = true;
-        FF_LIBRARY_LOAD(libsqlite, &instance.config.library.libSQLite3, NULL, "libsqlite3" FF_LIBRARY_EXTENSION, 1);
+        FF_LIBRARY_LOAD(libsqlite, 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)

src/common/thread.h

@@ -33,7 +33,7 @@
     #else
         #include <pthread.h>
         #include <signal.h>
-        #if __has_include(<pthread_np.h>)
+        #if FF_HAVE_PTHREAD_NP
             #include <pthread_np.h>
         #endif
         #define FF_THREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
@@ -51,7 +51,7 @@
         static inline void ffThreadDetach(FFThreadType thread) { pthread_detach(thread); }
         static inline bool ffThreadJoin(FFThreadType thread, FF_MAYBE_UNUSED uint32_t timeout)
         {
-            #if (defined(__linux__) && !defined(__ANDROID__)) || __has_include(<pthread_np.h>)
+            #if HAVE_TIMEDJOIN_NP
                 if (timeout > 0)
                 {
                     struct timespec ts;

src/common/time.h

@@ -9,22 +9,22 @@
     #include <sysinfoapi.h>
 #endif
 
-static inline uint64_t ffTimeGetTick() //In msec
+static inline double ffTimeGetTick(void) //In msec
 {
     #ifdef _WIN32
         LARGE_INTEGER frequency;
         QueryPerformanceFrequency(&frequency);
         LARGE_INTEGER start;
         QueryPerformanceCounter(&start);
-        return (uint64_t)(start.QuadPart * 1000 / frequency.QuadPart);
+        return (double) start.QuadPart * 1000 / (double) frequency.QuadPart;
     #else
         struct timespec timeNow;
         clock_gettime(CLOCK_MONOTONIC, &timeNow);
-        return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
+        return (double) timeNow.tv_sec * 1000. + (double) timeNow.tv_nsec / 1000000.;
     #endif
 }
 
-static inline uint64_t ffTimeGetNow()
+static inline uint64_t ffTimeGetNow(void)
 {
     #ifdef _WIN32
         uint64_t timeNow;
@@ -33,7 +33,7 @@ static inline uint64_t ffTimeGetNow()
     #else
         struct timespec timeNow;
         clock_gettime(CLOCK_REALTIME, &timeNow);
-        return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
+        return (uint64_t)(((uint64_t) timeNow.tv_sec * 1000u) + ((uint64_t) timeNow.tv_nsec / 1000000u));
     #endif
 }
 

src/data/help.json

@@ -128,7 +128,7 @@
             "desc": "Set the timeout (ms) when waiting for child processes",
             "arg": {
                 "type": "num",
-                "default": 1000
+                "default": 5000
             }
         },
         {
@@ -148,6 +148,16 @@
                     "false": "Try `wayland`, then `x11`, then `drm`"
                 }
             }
+        },
+        {
+            "long": "detect-version",
+            "desc": "Whether to detect and display the version of terminal, shell and editor",
+            "remark": "Mainly for benchmarking",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": true
+            }
         }
     ],
     "Logo": [
@@ -495,6 +505,27 @@
                 "type": "num"
             }
         },
+        {
+            "long": "key-padding-left",
+            "desc": "Set the left padding of keys to <num> characters",
+            "arg": {
+                "type": "num"
+            }
+        },
+        {
+            "long": "key-type",
+            "desc": "Set whether to show icon before string keys",
+            "arg": {
+                "type": "enum",
+                "enum": {
+                    "none": "Disable keys",
+                    "string": "Show string",
+                    "icon": "Show icon (requires newest nerd font)",
+                    "both": "Show both icon and string"
+                },
+                "default": "string"
+            }
+        },
         {
             "long": "bright-color",
             "desc": "Set if the keys, title and ASCII logo should be printed in bright color",
@@ -539,19 +570,6 @@
                 "default": false
             }
         },
-        {
-            "long": "binary-prefix",
-            "desc": "Set the binary prefix to used",
-            "arg": {
-                "type": "enum",
-                "enum": {
-                    "IEC": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ...",
-                    "SI": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ...",
-                    "JEDEC": "1024 Bytes = 1 kB, 1024 kB = 1 MB, ..."
-                },
-                "default": "IEC"
-            }
-        },
         {
             "long": "percent-type",
             "desc": "Set the percentage output type",
@@ -659,6 +677,19 @@
                 "type": "num"
             }
         },
+        {
+            "long": "size-binary-prefix",
+            "desc": "Set the binary prefix to used when formatting sizes",
+            "arg": {
+                "type": "enum",
+                "enum": {
+                    "IEC": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ...",
+                    "SI": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ...",
+                    "JEDEC": "1024 Bytes = 1 kB, 1024 kB = 1 MB, ..."
+                },
+                "default": "IEC"
+            }
+        },
         {
             "long": "size-max-prefix",
             "desc": "Set the largest binary prefix to use when formatting sizes",
@@ -678,6 +709,14 @@
                 "default": "YB"
             }
         },
+        {
+            "long": "freq-ndigits",
+            "desc": "Set the number of digits to keep after the decimal point when printing CPU / GPU frequency in GHz",
+            "arg": {
+                "type": "num",
+                "default": 2
+            }
+        },
         {
             "long": "temp-unit",
             "desc": "Set the unit of the temperature",
@@ -725,187 +764,6 @@
                 "type": "color",
                 "default": "light_red"
             }
-        },
-        {
-            "long": "ts-version",
-            "desc": "Whether to detect and display the version of terminal, shell and editor",
-            "remark": "Mainly for benchmarking",
-            "arg": {
-                "type": "bool",
-                "optional": true,
-                "default": true
-            }
-        }
-    ],
-    "Library path": [
-        {
-            "long": "lib-vulkan",
-            "desc": "Vulkan module & fallback for GPU output",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-wayland",
-            "desc": "Better display performance and output in wayland sessions",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-xcb-randr",
-            "desc": "X11 sessions for better display detection and faster WM detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-xcb",
-            "desc": "X11 sessions for better display detection and faster WM detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-xrandr",
-            "desc": "X11 sessions for better display detection and faster WM detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-x11",
-            "desc": "X11 sessions for better display detection and faster WM detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-drm",
-            "desc": "Used for fast resolution and refresh rate detection",
-            "remark": "Linux only",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-gio",
-            "desc": "Needed for values that are only stored GSettings",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-dconf",
-            "desc": "Needed for values that are only stored in DConf + Fallback for GSettings",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-dbus",
-            "desc": "Bluetooth, Player & Media detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-xfconf",
-            "desc": "Needed for XFWM theme and XFCE Terminal font",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-sqlite3",
-            "desc": "Needed for pkg & rpm package count",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-rpm",
-            "desc": "Slower fallback for rpm package count",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-imagemagick",
-            "desc": "Images in terminal using sixel or kitty graphics protocol",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-z",
-            "desc": "Libz. Faster image output when using kitty graphics protocol",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-chafa",
-            "desc": "Image output as ascii art",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-egl",
-            "desc": "Needed by the OpenGL module for gl context creation",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-glx",
-            "desc": "Needed by the OpenGL module for gl context creation",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-osmesa",
-            "desc": "Needed by the OpenGL module for gl context creation",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-opencl",
-            "desc": "OpenCL module",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-pulse",
-            "desc": "Pulseaudio. Used for Sound detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-nm",
-            "desc": "NetworkManager. Used for Wifi detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-freetype",
-            "desc": "Used for Termux font detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-ddcutil",
-            "desc": "Used for brightness detection of external displays",
-            "arg": {
-                "type": "path"
-            }
         }
     ],
     "Module specific": [
@@ -947,7 +805,7 @@
         },
         {
             "long": "separator-string",
-            "desc": "Set the string printed by the separator module",
+            "desc": "Set the string to be printed by the separator line",
             "arg": {
                 "type": "str",
                 "default": "-"
@@ -955,12 +813,21 @@
         },
         {
             "long": "separator-output-color",
-            "desc": "Set the color of the separator module",
+            "desc": "Set the color of the separator line",
             "arg": {
                 "type": "color",
                 "default": "default"
             }
         },
+        {
+            "long": "separator-length",
+            "desc": "Set the length of the separator line",
+            "remark": "Set to 0 to automatically calculate it with the title length",
+            "arg": {
+                "type": "num",
+                "default": "0"
+            }
+        },
         {
             "long": "disk-folders",
             "desc": "A colon (semicolon on Windows) separated list of folder paths to be detected",
@@ -1168,14 +1035,6 @@
                 "default": false
             }
         },
-        {
-            "long": "cpu-freq-ndigits",
-            "desc": "Set the number of digits to keep after the decimal point when printing CPU frequency",
-            "arg": {
-                "type": "num",
-                "default": 2
-            }
-        },
         {
             "long": "cpu-show-pe-core-count",
             "desc": "Detect and display CPU frequency of different core types (eg. Pcore and Ecore) if supported",
@@ -1517,6 +1376,15 @@
                 "default": "\"cmd\" for Windows; \"/bin/sh\" for *nix"
             }
         },
+        {
+            "long": "command-param",
+            "desc": "Set the parameter used when starting the shell",
+            "remark": "If set to empty string, it will be ignored",
+            "arg": {
+                "type": "str",
+                "default": "\"/c\" for Windows; \"-c\" for *nix"
+            }
+        },
         {
             "long": "command-key",
             "desc": "Set the module key to display",
@@ -1538,13 +1406,14 @@
                 "type": "enum",
                 "enum": {
                     "block": "\u2588\u2588\u2588",
+                    "background": "(whitespaces with background)",
                     "circle": "\u25cf",
                     "diamond": "\u25c6",
                     "triangle": "\u25b2",
                     "square": "\u25a0",
                     "star": "\u2605"
                 },
-                "default": "block"
+                "default": "background"
             }
         },
         {
@@ -1627,6 +1496,14 @@
             },
             "pseudo": true
         },
+        {
+            "long": "<module>-key-icon",
+            "desc": "Set the icon to be displayed by \"--key-type icon\"",
+            "arg": {
+                "type": "string"
+            },
+            "pseudo": true
+        },
         {
             "long": "<module>-output-color",
             "desc": "Override the global \"--color-output\" option for each specific module",

src/data/help_format.txt

@@ -13,6 +13,14 @@ For example: "--title-format '{user-name:5}'" will truncate user name into 5-len
 If '<trunc-length>' is negative, an ellipsis … will be appended at the end when the original string is truncated.
 Note: The string length is counted in raw bytes. Multi-byte unicode characters and ANSI escape codes are not taken into account.
 
+In 2.23.0 or newer, `<` or `>` can be specified instead of `:` to set a left or right padding.
+For example: "--title-format '{user-name<20}'" will generate `<user-name>         `;
+"--title-format '{user-name>20}'" will generate `         <user-name>`
+
+In 2.24.0 or newer, `{~startIndex,endIndex}` can be specified to slice a string. Negative index counts back from the end of the string.
+If an index is omitted, 0 is used. For example, both `{~,0}` `{~0,}` and `{~,}` are same as `{~0,0}` and will always generate a empty string.
+If `,endIndex` is omitted or greater than the length of the string, the length of string is used.
+
 If the value index is missing, meaning the placeholder is "{}", an internal counter sets the value index.
 This means that the format string "Values: {1} ({2})" is equivalent to "Values: {} ({})".
 Note that this counter only counts empty placeholders, so the format string "{2} {} {}" will contain the second value, then the first, and then the second again.

src/detection/battery/battery_apple.c

@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "battery.h"
 #include "util/apple/cf_helpers.h"
-#include "detection/temps/temps_apple.h"
+#include "util/apple/smc_temps.h"
 
 #include <IOKit/IOKitLib.h>
 #include <IOKit/pwr_mgt/IOPM.h>

src/detection/battery/battery_linux.c

@@ -1,6 +1,5 @@
 #include "battery.h"
 #include "common/io/io.h"
-#include "detection/temps/temps_linux.h"
 #include "util/stringUtils.h"
 
 #include <dirent.h>

src/detection/bluetooth/bluetooth_linux.c

@@ -61,13 +61,17 @@ static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBlue
     dbus->lib->ffdbus_message_iter_next(&dictIter);
 
     if(ffStrEquals(deviceProperty, "Address"))
-        ffDBusGetValue(dbus, &dictIter, &device->address);
+        ffDBusGetString(dbus, &dictIter, &device->address);
     else if(ffStrEquals(deviceProperty, "Name"))
-        ffDBusGetValue(dbus, &dictIter, &device->name);
+        ffDBusGetString(dbus, &dictIter, &device->name);
     else if(ffStrEquals(deviceProperty, "Icon"))
-        ffDBusGetValue(dbus, &dictIter, &device->type);
+        ffDBusGetString(dbus, &dictIter, &device->type);
     else if(ffStrEquals(deviceProperty, "Percentage"))
-        ffDBusGetByte(dbus, &dictIter, &device->battery);
+    {
+        uint32_t percentage;
+        if (ffDBusGetUint(dbus, &dictIter, &percentage))
+            device->battery = (uint8_t) percentage;
+    }
     else if(ffStrEquals(deviceProperty, "Connected"))
         ffDBusGetBool(dbus, &dictIter, &device->connected);
 }
@@ -86,8 +90,8 @@ static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFB
     const char* propertyType;
     dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &propertyType);
 
-    if(strstr(propertyType, "Device") == NULL && strstr(propertyType, "Battery") == NULL)
-        return; //We don't care about other properties
+    if(!ffStrContains(propertyType, ".Device") && !ffStrContains(propertyType, ".Battery"))
+        return; // We don't care about other properties
 
     dbus->lib->ffdbus_message_iter_next(&dictIter);
 
@@ -97,11 +101,10 @@ static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFB
     DBusMessageIter arrayIter;
     dbus->lib->ffdbus_message_iter_recurse(&dictIter, &arrayIter);
 
-    while(true)
+    do
     {
         detectBluetoothValue(dbus, &arrayIter, device);
-        FF_DBUS_ITER_CONTINUE(dbus, &arrayIter);
-    }
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
 }
 
 static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
@@ -118,8 +121,8 @@ static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessage
     const char* objectPath;
     dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &objectPath);
 
-    //We don't want adapter objects
-    if(strstr(objectPath, "dev_") == NULL)
+    // We don't want adapter objects
+    if(!ffStrContains(objectPath, "/dev_"))
         return;
 
     dbus->lib->ffdbus_message_iter_next(&dictIter);
@@ -137,11 +140,10 @@ static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessage
     device->battery = 0;
     device->connected = false;
 
-    while(true)
+    do
     {
         detectBluetoothProperty(dbus, &arrayIter, device);
-        FF_DBUS_ITER_CONTINUE(dbus, &arrayIter);
-    }
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
 
     if(device->name.length == 0)
     {
@@ -160,11 +162,10 @@ static void detectBluetoothRoot(FFlist* devices, FFDBusData* dbus, DBusMessageIt
     DBusMessageIter arrayIter;
     dbus->lib->ffdbus_message_iter_recurse(iter, &arrayIter);
 
-    while(true)
+    do
     {
         detectBluetoothObject(devices, dbus, &arrayIter);
-        FF_DBUS_ITER_CONTINUE(dbus, &arrayIter);
-    }
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
 }
 
 static const char* detectBluetooth(FFlist* devices)
@@ -174,7 +175,7 @@ static const char* detectBluetooth(FFlist* devices)
     if(error)
         return error;
 
-    DBusMessage* managedObjects = ffDBusGetMethodReply(&dbus, "org.bluez", "/", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
+    DBusMessage* managedObjects = ffDBusGetMethodReply(&dbus, "org.bluez", "/", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects", NULL);
     if(!managedObjects)
         return "Failed to call GetManagedObjects";
 

src/detection/bluetooth/bluetooth_windows.c

@@ -10,48 +10,40 @@
 const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
 {
     // Actually bluetoothapis.dll, but it's missing on Windows 7
-    FF_LIBRARY_LOAD(bluetoothapis, NULL, "dlopen bthprops.cpl failed", "bthprops.cpl", 1)
+    FF_LIBRARY_LOAD(bluetoothapis, "dlopen bthprops.cpl failed", "bthprops.cpl", 1)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindFirstDevice)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindNextDevice)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindDeviceClose)
 
-    BLUETOOTH_DEVICE_SEARCH_PARAMS btsp = {
+    BLUETOOTH_DEVICE_INFO btdi = {
+        .dwSize = sizeof(btdi)
+    };
+    HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstDevice(&(BLUETOOTH_DEVICE_SEARCH_PARAMS) {
         .fReturnConnected = TRUE,
         .fReturnRemembered = TRUE,
         .fReturnAuthenticated = TRUE,
         .fReturnUnknown = TRUE,
-        .dwSize = sizeof(btsp)
-    };
-
-    BLUETOOTH_DEVICE_INFO btdi = {
-        .dwSize = sizeof(btdi)
-    };
-    HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstDevice(&btsp, &btdi);
+        .dwSize = sizeof(BLUETOOTH_DEVICE_SEARCH_PARAMS)
+    }, &btdi);
     if(!hFind)
     {
-        if (GetLastError() == ERROR_NO_MORE_ITEMS)
-            return "No Bluetooth devices found";
-        else
-            return "BluetoothFindFirstDevice() failed";
+        return "BluetoothFindFirstDevice() failed";
     }
 
     do {
         FFBluetoothResult* device = ffListAdd(devices);
-        ffStrbufInit(&device->name);
-        ffStrbufInit(&device->address);
-        ffStrbufInit(&device->type);
-        device->battery = 0;
-        device->connected = !!btdi.fConnected;
-
-        ffStrbufSetWS(&device->name, btdi.szName);
-
-        ffStrbufAppendF(&device->address, "%02x:%02x:%02x:%02x:%02x:%02x",
+        ffStrbufInitWS(&device->name, btdi.szName);
+        ffStrbufInitF(&device->address, "%02x:%02x:%02x:%02x:%02x:%02x",
             btdi.Address.rgBytes[0],
             btdi.Address.rgBytes[1],
             btdi.Address.rgBytes[2],
             btdi.Address.rgBytes[3],
             btdi.Address.rgBytes[4],
             btdi.Address.rgBytes[5]);
+        ffStrbufInit(&device->type);
+        device->battery = 0;
+        device->connected = !!btdi.fConnected;
+
         //https://btprodspecificationrefs.blob.core.windows.net/assigned-numbers/Assigned%20Number%20Types/Assigned%20Numbers.pdf
 
         if(BitTest(&btdi.ulClassofDevice, 13))

src/detection/bluetoothradio/bluetoothradio.c

@@ -0,0 +1,112 @@
+#include "bluetoothradio.h"
+
+// https://github.com/ziglang/zig/blob/a84951465b409495095a9598db0cae745f34fa7b/lib/libc/include/any-windows-any/bthdef.h#L187-L236
+
+#define BTH_MFG_ERICSSON 0
+#define BTH_MFG_NOKIA 1
+#define BTH_MFG_INTEL 2
+#define BTH_MFG_IBM 3
+#define BTH_MFG_TOSHIBA 4
+#define BTH_MFG_3COM 5
+#define BTH_MFG_MICROSOFT 6
+#define BTH_MFG_LUCENT 7
+#define BTH_MFG_MOTOROLA 8
+#define BTH_MFG_INFINEON 9
+#define BTH_MFG_CSR 10
+#define BTH_MFG_SILICONWAVE 11
+#define BTH_MFG_DIGIANSWER 12
+#define BTH_MFG_TI 13
+#define BTH_MFG_PARTHUS 14
+#define BTH_MFG_BROADCOM 15
+#define BTH_MFG_MITEL 16
+#define BTH_MFG_WIDCOMM 17
+#define BTH_MFG_ZEEVO 18
+#define BTH_MFG_ATMEL 19
+#define BTH_MFG_MITSIBUSHI 20
+#define BTH_MFG_RTX_TELECOM 21
+#define BTH_MFG_KC_TECHNOLOGY 22
+#define BTH_MFG_NEWLOGIC 23
+#define BTH_MFG_TRANSILICA 24
+#define BTH_MFG_ROHDE_SCHWARZ 25
+#define BTH_MFG_TTPCOM 26
+#define BTH_MFG_SIGNIA 27
+#define BTH_MFG_CONEXANT 28
+#define BTH_MFG_QUALCOMM 29
+#define BTH_MFG_INVENTEL 30
+#define BTH_MFG_AVM_BERLIN 31
+#define BTH_MFG_BANDSPEED 32
+#define BTH_MFG_MANSELLA 33
+#define BTH_MFG_NEC 34
+#define BTH_MFG_WAVEPLUS_TECHNOLOGY_CO 35
+#define BTH_MFG_ALCATEL 36
+#define BTH_MFG_PHILIPS_SEMICONDUCTOR 37
+#define BTH_MFG_C_TECHNOLOGIES 38
+#define BTH_MFG_OPEN_INTERFACE 39
+#define BTH_MFG_RF_MICRO_DEVICES 40
+#define BTH_MFG_HITACHI 41
+#define BTH_MFG_SYMBOL_TECHNOLOGIES 42
+#define BTH_MFG_TENOVIS 43
+#define BTH_MFG_MACRONIX_INTERNATIONAL 44
+#define BTH_MFG_MARVELL 72
+#define BTH_MFG_APPLE 76
+#define BTH_MFG_NORDIC_SEMICONDUCTORS_ASA 89
+#define BTH_MFG_ARUBA_NETWORKS 283
+#define BTH_MFG_INTERNAL_USE 65535
+
+const char* ffBluetoothRadioGetVendor(uint32_t manufacturerId)
+{
+    switch (manufacturerId)
+    {
+        case BTH_MFG_ERICSSON: return "Ericsson";
+        case BTH_MFG_NOKIA: return "Nokia";
+        case BTH_MFG_INTEL: return "Intel";
+        case BTH_MFG_IBM: return "IBM";
+        case BTH_MFG_TOSHIBA: return "Toshiba";
+        case BTH_MFG_3COM: return "3Com";
+        case BTH_MFG_MICROSOFT: return "Microsoft";
+        case BTH_MFG_LUCENT: return "Lucent";
+        case BTH_MFG_MOTOROLA: return "Motorola";
+        case BTH_MFG_INFINEON: return "Infineon";
+        case BTH_MFG_CSR: return "CSR";
+        case BTH_MFG_SILICONWAVE: return "Silicon-Wave";
+        case BTH_MFG_DIGIANSWER: return "Digi-Answer";
+        case BTH_MFG_TI: return "Ti";
+        case BTH_MFG_PARTHUS: return "Parthus";
+        case BTH_MFG_BROADCOM: return "Broadcom";
+        case BTH_MFG_MITEL: return "Mitel";
+        case BTH_MFG_WIDCOMM: return "Widcomm";
+        case BTH_MFG_ZEEVO: return "Zeevo";
+        case BTH_MFG_ATMEL: return "Atmel";
+        case BTH_MFG_MITSIBUSHI: return "Mitsubishi";
+        case BTH_MFG_RTX_TELECOM: return "RTX Telecom";
+        case BTH_MFG_KC_TECHNOLOGY: return "KC Technology";
+        case BTH_MFG_NEWLOGIC: return "Newlogic";
+        case BTH_MFG_TRANSILICA: return "Transilica";
+        case BTH_MFG_ROHDE_SCHWARZ: return "Rohde-Schwarz";
+        case BTH_MFG_TTPCOM: return "TTPCom";
+        case BTH_MFG_SIGNIA: return "Signia";
+        case BTH_MFG_CONEXANT: return "Conexant";
+        case BTH_MFG_QUALCOMM: return "Qualcomm";
+        case BTH_MFG_INVENTEL: return "Inventel";
+        case BTH_MFG_AVM_BERLIN: return "AVM Berlin";
+        case BTH_MFG_BANDSPEED: return "Bandspeed";
+        case BTH_MFG_MANSELLA: return "Mansella";
+        case BTH_MFG_NEC: return "NEC";
+        case BTH_MFG_WAVEPLUS_TECHNOLOGY_CO: return "Waveplus";
+        case BTH_MFG_ALCATEL: return "Alcatel";
+        case BTH_MFG_PHILIPS_SEMICONDUCTOR: return "Philips Semiconductors";
+        case BTH_MFG_C_TECHNOLOGIES: return "C Technologies";
+        case BTH_MFG_OPEN_INTERFACE: return "Open Interface";
+        case BTH_MFG_RF_MICRO_DEVICES: return "RF Micro Devices";
+        case BTH_MFG_HITACHI: return "Hitachi";
+        case BTH_MFG_SYMBOL_TECHNOLOGIES: return "Symbol Technologies";
+        case BTH_MFG_TENOVIS: return "Tenovis";
+        case BTH_MFG_MACRONIX_INTERNATIONAL: return "Macronix International";
+        case BTH_MFG_MARVELL: return "Marvell";
+        case BTH_MFG_APPLE: return "Apple";
+        case BTH_MFG_NORDIC_SEMICONDUCTORS_ASA: return "Nordic Semiconductor ASA";
+        case BTH_MFG_ARUBA_NETWORKS: return "Aruba Networks";
+        case BTH_MFG_INTERNAL_USE: return "Internal Use";
+        default: return "Unknown";
+    }
+}

src/detection/bluetoothradio/bluetoothradio.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "fastfetch.h"
+
+typedef struct FFBluetoothRadioResult
+{
+    FFstrbuf name;
+    FFstrbuf address;
+    FFstrbuf vendor;
+    int32_t lmpVersion;
+    int32_t lmpSubversion;
+    bool enabled;
+    bool discoverable;
+    bool connectable;
+} FFBluetoothRadioResult;
+
+const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothRadioResult */);
+const char* ffBluetoothRadioGetVendor(uint32_t manufacturerId);

src/detection/bluetoothradio/bluetoothradio_apple.m

@@ -0,0 +1,69 @@
+#include "bluetoothradio.h"
+#include "common/processing.h"
+
+#import <IOBluetooth/IOBluetooth.h>
+
+// For some reason the official declaration of IOBluetoothHostController don't include property `controllers`
+@interface IOBluetoothHostController()
++ (id)controllers;
+@end
+
+const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothResult */)
+{
+    NSArray<IOBluetoothHostController*>* ctrls = IOBluetoothHostController.controllers;
+    if(!ctrls)
+        return "IOBluetoothHostController.controllers returns nil";
+
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+    if (ffProcessAppendStdOut(&buffer, (char* const[]) {
+        "system_profiler",
+        "SPBluetoothDataType",
+        "-xml",
+        "-detailLevel",
+        "basic",
+        NULL
+    }) != NULL)
+        return "Starting `system_profiler SPBluetoothDataType -xml -detailLevel basic` failed";
+
+    NSArray* arr = [NSPropertyListSerialization propertyListWithData:[NSData dataWithBytes:buffer.chars length:buffer.length]
+                    options:NSPropertyListImmutable
+                    format:nil
+                    error:nil];
+    if (!arr || !arr.count)
+        return "system_profiler SPBluetoothDataType returned an empty array";
+
+    for (IOBluetoothHostController* ctrl in ctrls)
+    {
+        FFBluetoothRadioResult* device = ffListAdd(devices);
+        ffStrbufInitS(&device->name, ctrl.nameAsString.UTF8String);
+        ffStrbufInitS(&device->address, ctrl.addressAsString.UTF8String);
+        ffStrbufInitStatic(&device->vendor, "Apple");
+        device->lmpVersion = INT_MIN;
+        device->lmpSubversion = INT_MIN;
+        device->enabled = ctrl.powerState == kBluetoothHCIPowerStateON;
+        device->discoverable = false;
+        device->connectable = true;
+
+        for (NSDictionary* itemDict in arr[0][@"_items"])
+        {
+            NSDictionary* props = itemDict[@"controller_properties"];
+            if (!props) continue;
+
+            if (![ctrl.addressAsString isEqualToString:props[@"controller_address"]]) continue;
+
+            NSString* services = props[@"controller_supportedServices"];
+            if ([services containsString:@" LEA "])
+                device->lmpVersion = -11;
+            else if ([services containsString:@" GATT "])
+                device->lmpVersion = -6;
+
+            device->discoverable = ![props[@"controller_discoverable"] isEqualToString:@"attrib_off"];
+            ffStrbufSetS(&device->vendor, ((NSString*) props[@"controller_vendorID"]).UTF8String);
+            ffStrbufSubstrAfterFirstC(&device->vendor, '(');
+            ffStrbufTrimRight(&device->vendor, ')');
+            break;
+        }
+    }
+
+    return NULL;
+}

src/detection/bluetoothradio/bluetoothradio_linux.c

@@ -0,0 +1,207 @@
+#include "bluetoothradio.h"
+#include "util/stringUtils.h"
+
+#ifdef FF_HAVE_DBUS
+#include "common/dbus.h"
+
+/* Example dbus reply, striped to only the relevant parts:
+array [                                                     //root
+    dict entry(
+        object path "/org/bluez/hci0"
+        array [
+            dict entry(
+                string "org.bluez.Adapter1"
+                array [
+                    dict entry(
+                        string "Address"
+                        variant string "XX:XX:XX:XX:XX:XX"
+                    )
+                    dict entry(
+                        string "Name"
+                        variant string "xxxxxxxx"
+                    )
+                    dict entry(
+                        string "Powered"
+                        variant boolean true
+                    )
+                    dict entry(
+                        string "PowerState"
+                        variant string "on"
+                    )
+                    dict entry(
+                        string "Manufacturer"
+                        variant uint16 2
+                    )
+                    dict entry(
+                        string "Version"
+                        variant byte 12
+                    )
+                ]
+            )
+        ]
+    )
+]
+*/
+
+static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothRadioResult* device)
+{
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
+        return;
+
+    DBusMessageIter dictIter;
+    dbus->lib->ffdbus_message_iter_recurse(iter, &dictIter);
+
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_STRING)
+        return;
+
+    const char* deviceProperty;
+    dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &deviceProperty);
+
+    dbus->lib->ffdbus_message_iter_next(&dictIter);
+
+    if(ffStrEquals(deviceProperty, "Address"))
+        ffDBusGetString(dbus, &dictIter, &device->address);
+    else if(ffStrEquals(deviceProperty, "Alias"))
+        ffDBusGetString(dbus, &dictIter, &device->name);
+    else if(ffStrEquals(deviceProperty, "Manufacturer"))
+    {
+        uint32_t vendorId;
+        if (ffDBusGetUint(dbus, &dictIter, &vendorId))
+            ffStrbufSetStatic(&device->vendor, ffBluetoothRadioGetVendor(vendorId));
+    }
+    else if(ffStrEquals(deviceProperty, "Version"))
+        ffDBusGetUint(dbus, &dictIter, (uint32_t*) &device->lmpVersion);
+    else if(ffStrEquals(deviceProperty, "Powered"))
+        ffDBusGetBool(dbus, &dictIter, &device->enabled);
+    else if(ffStrEquals(deviceProperty, "Discoverable"))
+        ffDBusGetBool(dbus, &dictIter, &device->discoverable);
+    else if(ffStrEquals(deviceProperty, "Pairable"))
+        ffDBusGetBool(dbus, &dictIter, &device->connectable);
+}
+
+static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothRadioResult* device)
+{
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
+        return;
+
+    DBusMessageIter dictIter;
+    dbus->lib->ffdbus_message_iter_recurse(iter, &dictIter);
+
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_STRING)
+        return;
+
+    const char* propertyType;
+    dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &propertyType);
+
+    if(!ffStrContains(propertyType, ".Adapter"))
+        return; //We don't care about other properties
+
+    dbus->lib->ffdbus_message_iter_next(&dictIter);
+
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_ARRAY)
+        return;
+
+    DBusMessageIter arrayIter;
+    dbus->lib->ffdbus_message_iter_recurse(&dictIter, &arrayIter);
+
+    do
+    {
+        detectBluetoothValue(dbus, &arrayIter, device);
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
+}
+
+static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
+{
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
+        return;
+
+    DBusMessageIter dictIter;
+    dbus->lib->ffdbus_message_iter_recurse(iter, &dictIter);
+
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_OBJECT_PATH)
+        return;
+
+    const char* objectPath;
+    dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &objectPath);
+
+    //We want adapter objects
+    if(!ffStrStartsWith(objectPath, "/org/bluez/hci") || ffStrContains(objectPath, "/dev_"))
+        return;
+
+    dbus->lib->ffdbus_message_iter_next(&dictIter);
+
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_ARRAY)
+        return;
+
+    DBusMessageIter arrayIter;
+    dbus->lib->ffdbus_message_iter_recurse(&dictIter, &arrayIter);
+
+    FFBluetoothRadioResult* device = ffListAdd(devices);
+    ffStrbufInit(&device->name);
+    ffStrbufInit(&device->address);
+    ffStrbufInitStatic(&device->vendor, "Unknown");
+    device->lmpVersion = INT_MIN;
+    device->lmpSubversion = INT_MIN;
+    device->enabled = false;
+
+    do
+    {
+        detectBluetoothProperty(dbus, &arrayIter, device);
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
+
+    if(device->name.length == 0)
+    {
+        ffStrbufDestroy(&device->name);
+        ffStrbufDestroy(&device->address);
+        --devices->length;
+    }
+}
+
+static void detectBluetoothRoot(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
+{
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
+        return;
+
+    DBusMessageIter arrayIter;
+    dbus->lib->ffdbus_message_iter_recurse(iter, &arrayIter);
+
+    do
+    {
+        detectBluetoothObject(devices, dbus, &arrayIter);
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
+}
+
+static const char* detectBluetooth(FFlist* devices)
+{
+    FFDBusData dbus;
+    const char* error = ffDBusLoadData(DBUS_BUS_SYSTEM, &dbus);
+    if(error)
+        return error;
+
+    DBusMessage* managedObjects = ffDBusGetMethodReply(&dbus, "org.bluez", "/", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects", NULL);
+    if(!managedObjects)
+        return "Failed to call GetManagedObjects";
+
+    DBusMessageIter rootIter;
+    if(!dbus.lib->ffdbus_message_iter_init(managedObjects, &rootIter))
+    {
+        dbus.lib->ffdbus_message_unref(managedObjects);
+        return "Failed to get root iterator of GetManagedObjects";
+    }
+
+    detectBluetoothRoot(devices, &dbus, &rootIter);
+
+    dbus.lib->ffdbus_message_unref(managedObjects);
+    return NULL;
+}
+
+#endif
+
+const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothRadioResult */)
+{
+    #ifdef FF_HAVE_DBUS
+        return detectBluetooth(devices);
+    #else
+        return "Fastfetch was compiled without DBus support";
+    #endif
+}

src/detection/bluetoothradio/bluetoothradio_nosupport.c

@@ -0,0 +1,6 @@
+#include "bluetoothradio.h"
+
+const char* ffDetectBluetoothRadio(FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothRadioResult */)
+{
+    return "Not supported on this platform";
+}

src/detection/bluetoothradio/bluetoothradio_windows.c

@@ -0,0 +1,105 @@
+#include "bluetoothradio.h"
+#include "common/library.h"
+#include "common/io/io.h"
+#include "util/windows/unicode.h"
+
+#include <windows.h>
+#include <bluetoothapis.h>
+#include <winioctl.h>
+
+// #include <bthioctl.h>
+
+#define BTH_IOCTL_BASE              0
+#define BTH_CTL(id)                 CTL_CODE(FILE_DEVICE_BLUETOOTH, (id), METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_BTH_GET_LOCAL_INFO    BTH_CTL(BTH_IOCTL_BASE+0x00)
+#define LMP_LE_SUPPORTED(x)         ((x >> 38) & 1)
+
+typedef struct _BTH_RADIO_INFO
+{
+    // Supported LMP features of the radio.  Use LMP_XXX() to extract
+    // the desired bits.
+    ULONGLONG lmpSupportedFeatures;
+
+    // Manufacturer ID (possibly BTH_MFG_XXX)
+    USHORT mfg;
+
+    // LMP subversion
+    USHORT lmpSubversion;
+
+    // LMP version
+    UCHAR lmpVersion;
+} __attribute__((__packed__)) BTH_RADIO_INFO;
+
+typedef struct _BTH_LOCAL_RADIO_INFO
+{
+    // Local BTH_ADDR, class of device, and radio name
+    BTH_DEVICE_INFO         localInfo;
+
+    // Combo of LOCAL_RADIO_XXX values
+    ULONG flags;
+
+    // HCI revision, see core spec
+    USHORT hciRevision;
+
+    // HCI version, see core spec
+    UCHAR hciVersion;
+
+    // More information about the local radio (LMP, MFG)
+    BTH_RADIO_INFO radioInfo;
+} __attribute__((__packed__)) BTH_LOCAL_RADIO_INFO;
+static_assert(sizeof(BTH_LOCAL_RADIO_INFO) == 292, "BTH_LOCAL_RADIO_INFO should be 292 bytes");
+
+#pragma GCC diagnostic ignored "-Wpointer-sign"
+
+const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothRadioResult */)
+{
+    // Actually bluetoothapis.dll, but it's missing on Windows 7
+    FF_LIBRARY_LOAD(bluetoothapis, "dlopen bthprops.cpl failed", "bthprops.cpl", 1)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindFirstRadio)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindNextRadio)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindRadioClose)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothIsConnectable)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothIsDiscoverable)
+
+    HANDLE hRadio = NULL;
+    HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstRadio(&(BLUETOOTH_FIND_RADIO_PARAMS) {
+        .dwSize = sizeof(BLUETOOTH_FIND_RADIO_PARAMS)
+    }, &hRadio);
+    if(!hFind)
+    {
+        if (GetLastError() == ERROR_NO_MORE_ITEMS)
+            return "No Bluetooth radios found or service disabled";
+        else
+            return "BluetoothFindFirstRadio() failed";
+    }
+
+    do {
+        BTH_LOCAL_RADIO_INFO blri;
+        DWORD returned;
+        if (!DeviceIoControl(hRadio, IOCTL_BTH_GET_LOCAL_INFO, NULL, 0, &blri, sizeof(blri), &returned, NULL))
+            continue;
+
+        FFBluetoothRadioResult* device = ffListAdd(devices);
+        ffStrbufInitS(&device->name, blri.localInfo.name);
+
+        BLUETOOTH_ADDRESS_STRUCT addr = { .ullLong = blri.localInfo.address };
+        ffStrbufInitF(&device->address, "%02x:%02x:%02x:%02x:%02x:%02x",
+            addr.rgBytes[0],
+            addr.rgBytes[1],
+            addr.rgBytes[2],
+            addr.rgBytes[3],
+            addr.rgBytes[4],
+            addr.rgBytes[5]);
+
+        device->lmpVersion = blri.radioInfo.lmpVersion;
+        device->lmpSubversion = blri.radioInfo.lmpSubversion;
+        ffStrbufInitStatic(&device->vendor, ffBluetoothRadioGetVendor(blri.radioInfo.mfg));
+        device->enabled = true;
+        device->connectable = ffBluetoothIsConnectable(hRadio);
+        device->discoverable = ffBluetoothIsDiscoverable(hRadio);
+    } while (ffBluetoothFindNextRadio(hFind, &hRadio));
+
+    ffBluetoothFindRadioClose(hFind);
+
+    return NULL;
+}

src/detection/board/board_linux.c

@@ -6,9 +6,21 @@
 
 const char* ffDetectBoard(FFBoardResult* board)
 {
-    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->name);
-    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_serial", "/sys/class/dmi/id/board_serial", &board->serial);
-    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &board->vendor);
-    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &board->version);
+    if (ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->name))
+    {
+        ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_serial", "/sys/class/dmi/id/board_serial", &board->serial);
+        ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &board->vendor);
+        ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &board->version);
+    }
+    else if (ffReadFileBuffer("/proc/device-tree/compatible", &board->vendor))
+    {
+        // use model name as board name
+        uint32_t comma = ffStrbufFirstIndexC(&board->vendor, ',');
+        if (comma < board->vendor.length)
+        {
+            ffStrbufSetS(&board->name, board->vendor.chars + comma + 1);
+            ffStrbufSubstrBefore(&board->vendor, comma);
+        }
+    }
     return NULL;
 }

src/detection/bootmgr/bootmgr_windows.c

@@ -38,7 +38,7 @@ const char* ffDetectBootmgr(FFBootmgrResult* result)
 
     uint8_t buffer[2048];
     wchar_t key[16];
-    wsprintfW(key, L"Boot%04X", value);
+    swprintf(key, sizeof(key) / sizeof(*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";
@@ -46,7 +46,7 @@ const char* ffDetectBootmgr(FFBootmgrResult* result)
     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)
+    if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\SecureBoot\\State", L"UEFISecureBootEnabled", RRF_RT_REG_DWORD, NULL, &uefiSecureBootEnabled, &bufSize) == ERROR_SUCCESS)
         result->secureBoot = !!uefiSecureBootEnabled;
 
     return NULL;

src/detection/brightness/brightness_linux.c

@@ -29,7 +29,7 @@ static const char* detectWithBacklight(FFlist* result)
             continue;
 
         ffStrbufAppendS(&backlightDir, entry->d_name);
-        ffStrbufAppendS(&backlightDir, "/actual_brightness");
+        ffStrbufAppendS(&backlightDir, "/brightness");
         if(ffReadFileBuffer(backlightDir.chars, &buffer))
         {
             double actualBrightness = ffStrbufToDouble(&buffer);
@@ -101,7 +101,7 @@ DDCA_Status ddca_init(const char *libopts, int syslog_level, int opts);
 
 static const char* detectWithDdcci(FFBrightnessOptions* options, FFlist* result)
 {
-    FF_LIBRARY_LOAD(libddcutil, &instance.config.library.libDdcutil, "dlopen ddcutil failed", "libddcutil" FF_LIBRARY_EXTENSION, 5);
+    FF_LIBRARY_LOAD(libddcutil, "dlopen ddcutil failed", "libddcutil" FF_LIBRARY_EXTENSION, 5);
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_get_display_info_list2)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_open_display2)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_get_any_vcp_value_using_explicit_type)

src/detection/brightness/brightness_windows.cpp

@@ -39,7 +39,7 @@ static const char* detectWithWmi(FFlist* result)
 
 static const char* detectWithDdcci(const FFDisplayServerResult* displayServer, FFlist* result)
 {
-    FF_LIBRARY_LOAD(dxva2, NULL, "dlopen dxva2" FF_LIBRARY_EXTENSION " failed", "dxva2" FF_LIBRARY_EXTENSION, 1)
+    FF_LIBRARY_LOAD(dxva2, "dlopen dxva2" FF_LIBRARY_EXTENSION " failed", "dxva2" FF_LIBRARY_EXTENSION, 1)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(dxva2, GetPhysicalMonitorsFromHMONITOR)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(dxva2, GetMonitorBrightness)
 

src/detection/btrfs/btrfs.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "fastfetch.h"
+
+typedef struct FFBtrfsDiskUsage
+{
+    uint64_t total;
+    uint64_t used;
+    const char* type;
+    bool dup;
+} FFBtrfsDiskUsage;
+
+typedef struct FFBtrfsResult
+{
+    FFstrbuf name;
+    FFstrbuf uuid;
+    FFstrbuf devices;
+    FFstrbuf features;
+    uint32_t generation;
+    uint32_t nodeSize;
+    uint32_t sectorSize;
+    uint64_t totalSize;
+    uint64_t globalReservationUsed;
+    uint64_t globalReservationTotal;
+    FFBtrfsDiskUsage allocation[3];
+} FFBtrfsResult;
+
+const char* ffDetectBtrfs(FFlist* result /* list of FFBtrfsResult */);

src/detection/btrfs/btrfs_linux.c

@@ -0,0 +1,166 @@
+#include "btrfs.h"
+
+#include "common/io/io.h"
+
+enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") };
+
+static const char* enumerateDevices(FFBtrfsResult* item, FFstrbuf* path, FFstrbuf* buffer)
+{
+    ffStrbufAppendS(path, "devices/");
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(path->chars);
+    if(dirp == NULL)
+        return "opendir(\"/sys/fs/btrfs/UUID/devices\") == NULL";
+    const uint32_t devicesPathLen = path->length;
+
+    struct dirent* entry;
+    while ((entry = readdir(dirp)) != NULL)
+    {
+        if (entry->d_name[0] == '.')
+            continue;
+
+        if (item->devices.length)
+            ffStrbufAppendC(&item->devices, ',');
+        ffStrbufAppendS(&item->devices, entry->d_name);
+        ffStrbufAppendS(path, entry->d_name);
+        ffStrbufAppendS(path, "/size");
+
+        if (ffReadFileBuffer(path->chars, buffer))
+            item->totalSize += ffStrbufToUInt(buffer, 0) * 512;
+
+        ffStrbufSubstrBefore(path, devicesPathLen);
+    }
+
+    return NULL;
+}
+
+static const char* enumerateFeatures(FFBtrfsResult* item, FFstrbuf* path)
+{
+    ffStrbufAppendS(path, "features/");
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(path->chars);
+    if(dirp == NULL)
+        return "opendir(\"/sys/fs/btrfs/UUID/features\") == NULL";
+    const uint32_t featuresPathLen = path->length;
+
+    struct dirent* entry;
+    while ((entry = readdir(dirp)) != NULL)
+    {
+        if (entry->d_name[0] == '.')
+            continue;
+        if (item->features.length)
+            ffStrbufAppendC(&item->features, ',');
+        ffStrbufAppendS(&item->features, entry->d_name);
+
+        ffStrbufSubstrBefore(path, featuresPathLen);
+    }
+
+    return NULL;
+}
+
+static const char* detectAllocation(FFBtrfsResult* item, FFstrbuf* path, FFstrbuf* buffer)
+{
+    ffStrbufAppendS(path, "allocation/");
+    const uint32_t AllocationPathLen = path->length;
+
+    ffStrbufAppendS(path, "global_rsv_size");
+    if (ffReadFileBuffer(path->chars, buffer))
+        item->globalReservationTotal = ffStrbufToUInt(buffer, 0);
+    else
+        return "ffReadFileBuffer(\"/sys/fs/btrfs/UUID/allocation/global_rsv_size\") == NULL";
+    ffStrbufSubstrBefore(path, AllocationPathLen);
+
+    ffStrbufAppendS(path, "global_rsv_reserved");
+    if (ffReadFileBuffer(path->chars, buffer))
+        item->globalReservationUsed = ffStrbufToUInt(buffer, 0);
+    ffStrbufSubstrBefore(path, AllocationPathLen);
+    item->globalReservationUsed = item->globalReservationTotal - item->globalReservationUsed;
+
+    #define FF_BTRFS_DETECT_TYPE(index, _type) \
+    ffStrbufAppendS(path, #_type "/total_bytes"); \
+    if (ffReadFileBuffer(path->chars, buffer)) \
+        item->allocation[index].total = ffStrbufToUInt(buffer, 0); \
+    ffStrbufSubstrBefore(path, AllocationPathLen); \
+    \
+    ffStrbufAppendS(path, #_type "/bytes_used"); \
+    if (ffReadFileBuffer(path->chars, buffer)) \
+        item->allocation[index].used = ffStrbufToUInt(buffer, 0); \
+    ffStrbufSubstrBefore(path, AllocationPathLen); \
+    \
+    ffStrbufAppendS(path, #_type "/dup"); \
+    item->allocation[index].dup = ffPathExists(path->chars, FF_PATHTYPE_DIRECTORY); \
+    ffStrbufSubstrBefore(path, AllocationPathLen); \
+    \
+    item->allocation[index].type = #_type;
+
+    FF_BTRFS_DETECT_TYPE(0, data);
+    FF_BTRFS_DETECT_TYPE(1, metadata);
+    FF_BTRFS_DETECT_TYPE(2, system);
+
+    #undef FF_BTRFS_DETECT_TYPE
+
+    return NULL;
+}
+
+const char* ffDetectBtrfs(FFlist* result)
+{
+    FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateS("/sys/fs/btrfs/");
+    const uint32_t basePathLen = path.length;
+
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(path.chars);
+    if(dirp == NULL)
+        return "opendir(\"/sys/fs/btrfs\") == NULL";
+
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+
+    struct dirent* entry;
+    while ((entry = readdir(dirp)) != NULL)
+    {
+        if (entry->d_name[0] == '.')
+            continue;
+        if (strlen(entry->d_name) != uuidLen)
+            continue;
+
+        FFBtrfsResult* item = ffListAdd(result);
+        (*item) = (FFBtrfsResult){};
+        ffStrbufInitNS(&item->uuid, uuidLen, entry->d_name);
+        ffStrbufInit(&item->name);
+        ffStrbufInit(&item->devices);
+        ffStrbufInit(&item->features);
+
+        ffStrbufAppendNS(&path, uuidLen, entry->d_name);
+        ffStrbufAppendC(&path, '/');
+        const uint32_t itemPathLen = path.length;
+
+        ffStrbufAppendS(&path, "label");
+        if (ffAppendFileBuffer(path.chars, &item->name))
+            ffStrbufTrimRightSpace(&item->name);
+        ffStrbufSubstrBefore(&path, itemPathLen);
+
+        enumerateDevices(item, &path, &buffer);
+        ffStrbufSubstrBefore(&path, itemPathLen);
+
+        enumerateFeatures(item, &path);
+        ffStrbufSubstrBefore(&path, itemPathLen);
+
+        ffStrbufAppendS(&path, "generation");
+        if (ffReadFileBuffer(path.chars, &buffer))
+            item->generation = (uint32_t) ffStrbufToUInt(&buffer, 0);
+        ffStrbufSubstrBefore(&path, itemPathLen);
+
+        ffStrbufAppendS(&path, "nodesize");
+        if (ffReadFileBuffer(path.chars, &buffer))
+            item->nodeSize = (uint32_t) ffStrbufToUInt(&buffer, 0);
+        ffStrbufSubstrBefore(&path, itemPathLen);
+
+        ffStrbufAppendS(&path, "sectorsize");
+        if (ffReadFileBuffer(path.chars, &buffer))
+            item->sectorSize = (uint32_t) ffStrbufToUInt(&buffer, 0);
+        ffStrbufSubstrBefore(&path, itemPathLen);
+
+        detectAllocation(item, &path, &buffer);
+
+        // finally
+        ffStrbufSubstrBefore(&path, basePathLen);
+    }
+
+    return NULL;
+}

src/detection/btrfs/btrfs_nosupport.c

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

src/detection/camera/camera_linux.c

@@ -5,13 +5,13 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#if __has_include(<linux/videodev2.h>)
+#if FF_HAVE_LINUX_VIDEODEV2
     #include <linux/videodev2.h>
 #endif
 
 const char* ffDetectCamera(FFlist* result)
 {
-#if __has_include(<linux/videodev2.h>)
+#if FF_HAVE_LINUX_VIDEODEV2
     char path[] = "/dev/videoN";
 
     for (uint32_t i = 0; i <= 9; ++i)
@@ -43,10 +43,10 @@ const char* ffDetectCamera(FFlist* result)
         case V4L2_COLORSPACE_JPEG: ffStrbufInitStatic(&camera->colorspace, "JPEG"); break;
         case V4L2_COLORSPACE_REC709:
         case V4L2_COLORSPACE_SRGB: ffStrbufInitStatic(&camera->colorspace, "sRGB"); break;
-        case V4L2_COLORSPACE_OPRGB: ffStrbufInitStatic(&camera->colorspace, "Adobe RGB"); break;
-        case V4L2_COLORSPACE_BT2020: ffStrbufInitStatic(&camera->colorspace, "BT.2020"); break;
-        case V4L2_COLORSPACE_RAW: ffStrbufInitStatic(&camera->colorspace, "RAW"); break;
-        case V4L2_COLORSPACE_DCI_P3: ffStrbufInitStatic(&camera->colorspace, "DCI-P3"); break;
+        case 9 /* V4L2_COLORSPACE_OPRGB */: ffStrbufInitStatic(&camera->colorspace, "Adobe RGB"); break;
+        case 10 /* V4L2_COLORSPACE_BT2020 */: ffStrbufInitStatic(&camera->colorspace, "BT.2020"); break;
+        case 11 /* V4L2_COLORSPACE_RAW */: ffStrbufInitStatic(&camera->colorspace, "RAW"); break;
+        case 12 /* V4L2_COLORSPACE_DCI_P3 */: ffStrbufInitStatic(&camera->colorspace, "DCI-P3"); break;
         default: ffStrbufInit(&camera->colorspace); break;
         }
         camera->width = fmt.fmt.pix.width;

src/detection/camera/camera_windows.cpp

@@ -21,9 +21,9 @@ private:
 extern "C"
 const char* ffDetectCamera(FF_MAYBE_UNUSED FFlist* result)
 {
-    FF_LIBRARY_LOAD(mfplat, NULL, "dlopen mfplat" FF_LIBRARY_EXTENSION " failed", "mfplat" FF_LIBRARY_EXTENSION, 1)
+    FF_LIBRARY_LOAD(mfplat, "dlopen mfplat" FF_LIBRARY_EXTENSION " failed", "mfplat" FF_LIBRARY_EXTENSION, 1)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(mfplat, MFCreateAttributes)
-    FF_LIBRARY_LOAD(mf, NULL, "dlopen mf" FF_LIBRARY_EXTENSION " failed", "mf" FF_LIBRARY_EXTENSION, 1)
+    FF_LIBRARY_LOAD(mf, "dlopen mf" FF_LIBRARY_EXTENSION " failed", "mf" FF_LIBRARY_EXTENSION, 1)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(mf, MFEnumDeviceSources)
 
     const char* error = ffInitCom();

src/detection/cpu/cpu.c

@@ -36,6 +36,20 @@ const char* ffCPUAppleCodeToName(uint32_t code)
         case 6030: return "Apple M3 Pro";
         case 6031:
         case 6034: return "Apple M3 Max";
-        default: return "Apple Silicon";
+        case 8132: return "Apple M4";
+        default: return NULL;
+    }
+}
+
+const char* ffCPUQualcommCodeToName(uint32_t code)
+{
+    // https://github.com/AsahiLinux/docs/wiki/Codenames
+    switch (code)
+    {
+        case 7180: return "Qualcomm Snapdragon 7c";
+        case 7280: return "Qualcomm Snapdragon 7c+ Gen 3";
+        case 8180: return "Qualcomm Snapdragon 8cx Gen 2 5G";
+        case 8280: return "Qualcomm Snapdragon 8cx Gen 3";
+        default: return NULL;
     }
 }

src/detection/cpu/cpu.h

@@ -19,10 +19,8 @@ typedef struct FFCPUResult
     uint16_t coresLogical;
     uint16_t coresOnline;
 
-    double frequencyBase; // GHz
-    double frequencyMax; // GHz
-    double frequencyMin; // GHz
-    double frequencyBiosLimit; // GHz
+    uint32_t frequencyBase; // GHz
+    uint32_t frequencyMax; // GHz
 
     FFCPUCore coreTypes[16]; // number of P cores, E cores, etc.
 
@@ -31,3 +29,30 @@ typedef struct FFCPUResult
 
 const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu);
 const char* ffCPUAppleCodeToName(uint32_t code);
+const char* ffCPUQualcommCodeToName(uint32_t code);
+
+#if defined(__x86_64__) || defined(__i386__)
+
+#include <cpuid.h>
+
+// WARNING: CPUID may report frequencies of efficient cores
+inline static const char* ffCPUDetectSpeedByCpuid(FFCPUResult* cpu)
+{
+    uint32_t base = 0, max = 0, bus = 0, unused = 0;
+    if (!__get_cpuid(0x16, &base, &max, &bus, &unused))
+        return "Unsupported instruction";
+
+    // cpuid returns 0 MHz when hyper-v is enabled
+    if (base) cpu->frequencyBase = base;
+    if (max) cpu->frequencyMax = max;
+    return NULL;
+}
+
+#else
+
+inline static const char* ffCPUDetectSpeedByCpuid(FF_MAYBE_UNUSED FFCPUResult* cpu)
+{
+    return "Unsupported platform";
+}
+
+#endif

src/detection/cpu/cpu_apple.c

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

src/detection/cpu/cpu_arm.h

@@ -0,0 +1,361 @@
+#pragma once
+
+#include "fastfetch.h"
+
+// https://github.com/util-linux/util-linux/blob/master/sys-utils/lscpu-arm.c
+// We use the util-linux's data but not its code. Call me if it violates util-linux's GPL license.
+
+static const char* hwImplId2Vendor(uint32_t implId)
+{
+    switch (implId)
+    {
+    case 0x41: return "ARM";
+    case 0x42: return "Broadcom";
+    case 0x43: return "Cavium";
+    case 0x44: return "DEC";
+    case 0x46: return "FUJITSU";
+    case 0x48: return "HiSilicon";
+    case 0x49: return "Infineon";
+    case 0x4d: return "Motorola";
+    case 0x4e: return "NVIDIA";
+    case 0x50: return "APM";
+    case 0x51: return "Qualcomm";
+    case 0x53: return "Samsung";
+    case 0x56: return "Marvell";
+    case 0x61: return "Apple";
+    case 0x66: return "Faraday";
+    case 0x69: return "Intel";
+    case 0x6D: return "Microsoft";
+    case 0x70: return "Phytium";
+    case 0xc0: return "Ampere";
+    default: return "Unknown";
+    }
+}
+
+static const char* armPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x810: return "ARM810";
+    case 0x920: return "ARM920";
+    case 0x922: return "ARM922";
+    case 0x926: return "ARM926";
+    case 0x940: return "ARM940";
+    case 0x946: return "ARM946";
+    case 0x966: return "ARM966";
+    case 0xa20: return "ARM1020";
+    case 0xa22: return "ARM1022";
+    case 0xa26: return "ARM1026";
+    case 0xb02: return "ARM11 MPCore";
+    case 0xb36: return "ARM1136";
+    case 0xb56: return "ARM1156";
+    case 0xb76: return "ARM1176";
+    case 0xc05: return "Cortex-A5";
+    case 0xc07: return "Cortex-A7";
+    case 0xc08: return "Cortex-A8";
+    case 0xc09: return "Cortex-A9";
+    case 0xc0d: return "Cortex-A17";	/* Originally A12 */
+    case 0xc0f: return "Cortex-A15";
+    case 0xc0e: return "Cortex-A17";
+    case 0xc14: return "Cortex-R4";
+    case 0xc15: return "Cortex-R5";
+    case 0xc17: return "Cortex-R7";
+    case 0xc18: return "Cortex-R8";
+    case 0xc20: return "Cortex-M0";
+    case 0xc21: return "Cortex-M1";
+    case 0xc23: return "Cortex-M3";
+    case 0xc24: return "Cortex-M4";
+    case 0xc27: return "Cortex-M7";
+    case 0xc60: return "Cortex-M0+";
+    case 0xd01: return "Cortex-A32";
+    case 0xd02: return "Cortex-A34";
+    case 0xd03: return "Cortex-A53";
+    case 0xd04: return "Cortex-A35";
+    case 0xd05: return "Cortex-A55";
+    case 0xd06: return "Cortex-A65";
+    case 0xd07: return "Cortex-A57";
+    case 0xd08: return "Cortex-A72";
+    case 0xd09: return "Cortex-A73";
+    case 0xd0a: return "Cortex-A75";
+    case 0xd0b: return "Cortex-A76";
+    case 0xd0c: return "Neoverse-N1";
+    case 0xd0d: return "Cortex-A77";
+    case 0xd0e: return "Cortex-A76AE";
+    case 0xd13: return "Cortex-R52";
+    case 0xd15: return "Cortex-R82";
+    case 0xd16: return "Cortex-R52+";
+    case 0xd20: return "Cortex-M23";
+    case 0xd21: return "Cortex-M33";
+    case 0xd22: return "Cortex-M55";
+    case 0xd23: return "Cortex-M85";
+    case 0xd40: return "Neoverse-V1";
+    case 0xd41: return "Cortex-A78";
+    case 0xd42: return "Cortex-A78AE";
+    case 0xd43: return "Cortex-A65AE";
+    case 0xd44: return "Cortex-X1";
+    case 0xd46: return "Cortex-A510";
+    case 0xd47: return "Cortex-A710";
+    case 0xd48: return "Cortex-X2";
+    case 0xd49: return "Neoverse-N2";
+    case 0xd4a: return "Neoverse-E1";
+    case 0xd4b: return "Cortex-A78C";
+    case 0xd4c: return "Cortex-X1C";
+    case 0xd4d: return "Cortex-A715";
+    case 0xd4e: return "Cortex-X3";
+    case 0xd4f: return "Neoverse-V2";
+    case 0xd80: return "Cortex-A520";
+    case 0xd81: return "Cortex-A720";
+    case 0xd82: return "Cortex-X4";
+    case 0xd84: return "Neoverse-V3";
+    case 0xd85: return "Cortex-X925";
+    case 0xd87: return "Cortex-A725";
+    default: return NULL;
+    }
+}
+
+static const char* brcmPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x0f: return "Brahma-B15";
+    case 0x100: return "Brahma-B53";
+    case 0x516: return "ThunderX2";
+    default: return NULL;
+    }
+}
+
+static const char* decPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0xa10: return "SA110";
+    case 0xa11: return "SA1100";
+    default: return NULL;
+    }
+}
+
+static const char* caviumPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x0a0: return "ThunderX";
+    case 0x0a1: return "ThunderX-88XX";
+    case 0x0a2: return "ThunderX-81XX";
+    case 0x0a3: return "ThunderX-83XX";
+    case 0x0af: return "ThunderX2-99xx";
+    case 0x0b0: return "OcteonTX2";
+    case 0x0b1: return "OcteonTX2-98XX";
+    case 0x0b2: return "OcteonTX2-96XX";
+    case 0x0b3: return "OcteonTX2-95XX";
+    case 0x0b4: return "OcteonTX2-95XXN";
+    case 0x0b5: return "OcteonTX2-95XXMM";
+    case 0x0b6: return "OcteonTX2-95XXO";
+    case 0x0b8: return "ThunderX3-T110";
+    default: return NULL;
+    }
+}
+
+static const char* apmPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x000: return "X-Gene";
+    default: return NULL;
+    }
+}
+
+static const char* qcomPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x001: return "Oryon";
+    case 0x00f: return "Scorpion";
+    case 0x02d: return "Scorpion";
+    case 0x04d: return "Krait";
+    case 0x06f: return "Krait";
+    case 0x201: return "Kryo";
+    case 0x205: return "Kryo";
+    case 0x211: return "Kryo";
+    case 0x800: return "Falkor-V1/Kryo";
+    case 0x801: return "Kryo-V2";
+    case 0x802: return "Kryo-3XX-Gold";
+    case 0x803: return "Kryo-3XX-Silver";
+    case 0x804: return "Kryo-4XX-Gold";
+    case 0x805: return "Kryo-4XX-Silver";
+    case 0xc00: return "Falkor";
+    case 0xc01: return "Saphira";
+    default: return NULL;
+    }
+}
+
+static const char* samsungPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x001: return "Exynos-M1";
+    case 0x002: return "Exynos-M3";
+    case 0x003: return "Exynos-M4";
+    case 0x004: return "Exynos-M5";
+    default: return NULL;
+    }
+}
+
+static const char* nvidiaPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x000: return "Denver";
+    case 0x003: return "Denver 2";
+    case 0x004: return "Carmel";
+    default: return NULL;
+    }
+}
+
+static const char* marvellPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x131: return "Feroceon-88FR131";
+    case 0x581: return "PJ4/PJ4b";
+    case 0x584: return "PJ4B-MP";
+    default: return NULL;
+    }
+}
+
+static const char* applePartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x000: return "Swift";
+    case 0x001: return "Cyclone";
+    case 0x002: return "Typhoon";
+    case 0x003: return "Typhoon/Capri";
+    case 0x004: return "Twister";
+    case 0x005: return "Twister/Elba/Malta";
+    case 0x006: return "Hurricane";
+    case 0x007: return "Hurricane/Myst";
+    case 0x008: return "Monsoon";
+    case 0x009: return "Mistral";
+    case 0x00b: return "Vortex";
+    case 0x00c: return "Tempest";
+    case 0x00f: return "Tempest-M9";
+    case 0x010: return "Vortex/Aruba";
+    case 0x011: return "Tempest/Aruba";
+    case 0x012: return "Lightning";
+    case 0x013: return "Thunder";
+    case 0x020: return "Icestorm-A14";
+    case 0x021: return "Firestorm-A14";
+    case 0x022: return "Icestorm-M1";
+    case 0x023: return "Firestorm-M1";
+    case 0x024: return "Icestorm-M1-Pro";
+    case 0x025: return "Firestorm-M1-Pro";
+    case 0x026: return "Thunder-M10";
+    case 0x028: return "Icestorm-M1-Max";
+    case 0x029: return "Firestorm-M1-Max";
+    case 0x030: return "Blizzard-A15";
+    case 0x031: return "Avalanche-A15";
+    case 0x032: return "Blizzard-M2";
+    case 0x033: return "Avalanche-M2";
+    case 0x034: return "Blizzard-M2-Pro";
+    case 0x035: return "Avalanche-M2-Pro";
+    case 0x036: return "Sawtooth-A16";
+    case 0x037: return "Everest-A16";
+    case 0x038: return "Blizzard-M2-Max";
+    case 0x039: return "Avalanche-M2-Max";
+    default: return NULL;
+    }
+}
+
+static const char* faradayPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x526: return "FA526";
+    case 0x626: return "FA626";
+    default: return NULL;
+    }
+}
+
+static const char* intelPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x200: return "i80200";
+    case 0x210: return "PXA250A";
+    case 0x212: return "PXA210A";
+    case 0x242: return "i80321-400";
+    case 0x243: return "i80321-600";
+    case 0x290: return "PXA250B/PXA26x";
+    case 0x292: return "PXA210B";
+    case 0x2c2: return "i80321-400-B0";
+    case 0x2c3: return "i80321-600-B0";
+    case 0x2d0: return "PXA250C/PXA255/PXA26x";
+    case 0x2d2: return "PXA210C";
+    case 0x411: return "PXA27x";
+    case 0x41c: return "IPX425-533";
+    case 0x41d: return "IPX425-400";
+    case 0x41f: return "IPX425-266";
+    case 0x682: return "PXA32x";
+    case 0x683: return "PXA930/PXA935";
+    case 0x688: return "PXA30x";
+    case 0x689: return "PXA31x";
+    case 0xb11: return "SA1110";
+    case 0xc12: return "IPX1200";
+    default: return NULL;
+    }
+}
+
+static const char* fujitsuPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x001: return "A64FX";
+    default: return NULL;
+    }
+}
+
+static const char* hisiPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0xd01: return "TaiShan-v110";	/* used in Kunpeng-920 SoC */
+    case 0xd02: return "TaiShan-v120";	/* used in Kirin 990A and 9000S SoCs */
+    case 0xd40: return "Cortex-A76";	/* HiSilicon uses this ID though advertises A76 */
+    case 0xd41: return "Cortex-A77";	/* HiSilicon uses this ID though advertises A77 */
+    default: return NULL;
+    }
+}
+
+static const char* amperePartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0xac3: return "Ampere-1";
+    case 0xac4: return "Ampere-1a";
+    default: return NULL;
+    }
+}
+
+static const char* ftPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0x303: return "FTC310";
+    case 0x660: return "FTC660";
+    case 0x661: return "FTC661";
+    case 0x662: return "FTC662";
+    case 0x663: return "FTC663";
+    case 0x664: return "FTC664";
+    case 0x862: return "FTC862";
+    default: return NULL;
+    }
+}
+
+static const char* msPartId2name(uint32_t partId)
+{
+    switch (partId)
+    {
+    case 0xd49: return "Azure-Cobalt-100";
+    default: return NULL;
+    }
+}

src/detection/cpu/cpu_bsd.c

@@ -1,6 +1,27 @@
 #include "cpu.h"
 #include "common/sysctl.h"
-#include "detection/temps/temps_bsd.h"
+
+static const char* detectCpuTemp(double* current)
+{
+    int temp = ffSysctlGetInt("dev.cpu.0.temperature", -999999);
+    if (temp == -999999)
+        return "ffSysctlGetInt(\"dev.cpu.0.temperature\") failed";
+
+    // In tenth of degrees Kelvin
+    *current = (double) temp / 10 - 273.15;
+    return NULL;
+}
+
+static const char* detectThermalTemp(double* current)
+{
+    int temp = ffSysctlGetInt("hw.acpi.thermal.tz0.temperature", -999999);
+    if (temp == -999999)
+        return "ffSysctlGetInt(\"hw.acpi.thermal.tz0.temperature\") failed";
+
+    // In tenth of degrees Kelvin
+    *current = (double) temp / 10 - 273.15;
+    return NULL;
+}
 
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
@@ -9,7 +30,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 
     cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.ncpu", 1);
     cpu->coresLogical = cpu->coresPhysical;
-    cpu->coresOnline = cpu->coresPhysical;
+    cpu->coresOnline = (uint16_t) ffSysctlGetInt("kern.smp.cpus", cpu->coresLogical);
 
     FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
     if (ffSysctlGetString("kern.sched.topology_spec", &buffer) == NULL && buffer.length > 0)
@@ -39,44 +60,15 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
         }
     }
 
-    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;
+    ffCPUDetectSpeedByCpuid(cpu);
 
-            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->frequencyBase = (uint32_t) ffSysctlGetInt("hw.clockrate", 0);
     cpu->temperature = FF_CPU_TEMP_UNSET;
 
     if (options->temp)
     {
-        if (!ffDetectCpuTemp(&cpu->temperature))
-            ffDetectThermalTemp(&cpu->temperature);
+        if (detectCpuTemp(&cpu->temperature) != NULL)
+            detectThermalTemp(&cpu->temperature);
     }
 
     return NULL;

src/detection/cpu/cpu_linux.c

@@ -2,88 +2,272 @@
 #include "common/io/io.h"
 #include "common/processing.h"
 #include "common/properties.h"
-#include "detection/temps/temps_linux.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 
 #include <sys/sysinfo.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <dirent.h>
+
+static double parseHwmonDir(FFstrbuf* dir, FFstrbuf* buffer)
+{
+    //https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
+    uint32_t dirLength = dir->length;
+    ffStrbufAppendS(dir, "temp1_input");
+
+    if(!ffReadFileBuffer(dir->chars, buffer))
+    {
+        // Some badly implemented system put temp file in /hwmonN/device
+        ffStrbufSubstrBefore(dir, dirLength);
+        ffStrbufAppendS(dir, "device/");
+        dirLength = dir->length;
+        ffStrbufAppendS(dir, "temp1_input");
+
+        if(!ffReadFileBuffer(dir->chars, buffer))
+            return 0.0/0.0;
+    }
+
+    ffStrbufSubstrBefore(dir, dirLength);
+
+    double value = ffStrbufToDouble(buffer);// millidegree Celsius
+
+    if(value != value)
+        return 0.0/0.0;
+
+    ffStrbufAppendS(dir, "name");
+    if (!ffReadFileBuffer(dir->chars, buffer))
+        return 0.0/0.0;
+
+    ffStrbufTrimRightSpace(buffer);
+
+    if(
+        ffStrbufContainS(buffer, "cpu") ||
+        ffStrbufEqualS(buffer, "k10temp") || // AMD
+        ffStrbufEqualS(buffer, "coretemp") // Intel
+    ) return value / 1000.;
+
+    return false;
+}
+
+static double detectCPUTemp(void)
+{
+    FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
+    ffStrbufAppendS(&baseDir, "/sys/class/hwmon/");
+
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+
+    uint32_t baseDirLength = baseDir.length;
+
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir.chars);
+    if(dirp == NULL)
+        return 0.0/0.0;
+
+    struct dirent* entry;
+    while((entry = readdir(dirp)) != NULL)
+    {
+        if(entry->d_name[0] == '.')
+            continue;
+
+        ffStrbufAppendS(&baseDir, entry->d_name);
+        ffStrbufAppendC(&baseDir, '/');
+
+        double result = parseHwmonDir(&baseDir, &buffer);
+        if (result == result)
+            return result;
+
+        ffStrbufSubstrBefore(&baseDir, baseDirLength);
+    }
+
+    return 0.0/0.0;
+}
 
 #ifdef __ANDROID__
 #include "common/settings.h"
 
+static void detectQualcomm(FFCPUResult* cpu)
+{
+    // https://en.wikipedia.org/wiki/List_of_Qualcomm_Snapdragon_systems_on_chips
+
+    if (ffStrbufEqualS(&cpu->name, "SM8635"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8s Gen 3 [SM8635]");
+    else if (ffStrbufEqualS(&cpu->name, "SM8650-AC"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8 Gen 3 for Galaxy [SM8650-AC]");
+    else if (ffStrbufEqualS(&cpu->name, "SM8650"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8 Gen 3 [SM8650]");
+    else if (ffStrbufEqualS(&cpu->name, "SM8550-AC"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8 Gen 2 for Galaxy [SM8550-AC]");
+    else if (ffStrbufEqualS(&cpu->name, "SM8550"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8 Gen 2 [SM8550]");
+    else if (ffStrbufEqualS(&cpu->name, "SM8475"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8+ Gen 1 [SM8475]");
+    else if (ffStrbufEqualS(&cpu->name, "SM8450"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8 Gen 1 [SM8450]");
+
+    else if (ffStrbufEqualS(&cpu->name, "SM7675"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 7+ Gen 3 [SM7675]");
+    else if (ffStrbufEqualS(&cpu->name, "SM7635"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 7s Gen 3 [SM7635]");
+    else if (ffStrbufEqualS(&cpu->name, "SM7550"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 7 Gen 3 [SM7550]");
+    else if (ffStrbufEqualS(&cpu->name, "SM7475"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 7+ Gen 2 [SM7550]");
+    else if (ffStrbufEqualS(&cpu->name, "SM7435"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 7s Gen 2 [SM7435]");
+    else if (ffStrbufEqualS(&cpu->name, "SM7450"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 7 Gen 1 [SM7450]");
+
+    else if (ffStrbufEqualS(&cpu->name, "SM6375-AC"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 6s Gen 3 [SM6375-AC]");
+    else if (ffStrbufEqualS(&cpu->name, "SM6475"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 6 Gen 3 [SM6475]");
+    else if (ffStrbufEqualS(&cpu->name, "SM6115"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 6s Gen 1 [SM6115]");
+    else if (ffStrbufEqualS(&cpu->name, "SM6450"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 6 Gen 1 [SM6450]");
+
+    else if (ffStrbufEqualS(&cpu->name, "SM4635"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 4s Gen 2 [SM4635]");
+    else if (ffStrbufEqualS(&cpu->name, "SM4450"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 4 Gen 2 [SM4450]");
+    else if (ffStrbufEqualS(&cpu->name, "SM4375"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 4 Gen 1 [SM4375]");
+}
+
 static void detectAndroid(FFCPUResult* cpu)
 {
     if (cpu->name.length == 0)
     {
-        ffSettingsGetAndroidProperty("ro.soc.model", &cpu->name);
-        ffStrbufClear(&cpu->vendor); // We usually detect the vendor of CPU core as ARM, but instead we want the vendor of SOC
+        if (ffSettingsGetAndroidProperty("ro.soc.model", &cpu->name))
+            ffStrbufClear(&cpu->vendor); // We usually detect the vendor of CPU core as ARM, but instead we want the vendor of SOC
+        else if(ffSettingsGetAndroidProperty("ro.mediatek.platform", &cpu->name))
+            ffStrbufSetStatic(&cpu->vendor, "MTK");
     }
     if (cpu->vendor.length == 0)
     {
         if (!ffSettingsGetAndroidProperty("ro.soc.manufacturer", &cpu->vendor))
             ffSettingsGetAndroidProperty("ro.product.product.manufacturer", &cpu->vendor);
     }
+
+    if (ffStrbufEqualS(&cpu->vendor, "QTI") && ffStrbufStartsWithS(&cpu->name, "SM"))
+        detectQualcomm(cpu);
 }
 #endif
 
-static const char* parseCpuInfo(FFCPUResult* cpu, FFstrbuf* physicalCoresBuffer, FFstrbuf* cpuMHz, FFstrbuf* cpuIsa, FFstrbuf* cpuUarch)
-{
-    FF_AUTO_CLOSE_FILE FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
-    if(cpuinfo == NULL)
-        return "fopen(\"/proc/cpuinfo\", \"r\") failed";
+#if __arm__ || __aarch64__
+#include "cpu_arm.h"
 
+static void detectArmName(FILE* cpuinfo, FFCPUResult* cpu, uint32_t implId)
+{
+    FF_AUTO_FREE char* line = NULL;
+    rewind(cpuinfo);
+    size_t len = 0;
+    uint32_t lastPartId = UINT32_MAX;
+    uint32_t num = 0;
+    while(getline(&line, &len, cpuinfo) != -1)
+    {
+        if (!ffStrStartsWith(line, "CPU part\t: ")) continue;
+        uint32_t partId = (uint32_t) strtoul(line + strlen("CPU part\t: "), NULL, 16);
+        const char* name = NULL;
+        if (partId > 0) // Linux reports 0 for unknown CPUs
+        {
+            switch (implId)
+            {
+                case 0x41: name = armPartId2name(partId); break;
+                case 0x42: name = brcmPartId2name(partId); break;
+                case 0x43: name = caviumPartId2name(partId); break;
+                case 0x44: name = decPartId2name(partId); break;
+                case 0x46: name = fujitsuPartId2name(partId); break;
+                case 0x48: name = hisiPartId2name(partId); break;
+                case 0x4e: name = nvidiaPartId2name(partId); break;
+                case 0x50: name = apmPartId2name(partId); break;
+                case 0x51: name = qcomPartId2name(partId); break;
+                case 0x53: name = samsungPartId2name(partId); break;
+                case 0x56: name = marvellPartId2name(partId); break;
+                case 0x61: name = applePartId2name(partId); break;
+                case 0x66: name = faradayPartId2name(partId); break;
+                case 0x69: name = intelPartId2name(partId); break;
+                case 0x6d: name = msPartId2name(partId); break;
+                case 0x70: name = ftPartId2name(partId); break;
+                case 0xc0: name = amperePartId2name(partId); break;
+            }
+        }
+        if (lastPartId != partId)
+        {
+            if (lastPartId != UINT32_MAX)
+            {
+                if (num > 1)
+                    ffStrbufAppendF(&cpu->name, "*%u", num);
+                ffStrbufAppendS(&cpu->name, " + ");
+            }
+            if (name)
+                ffStrbufAppendS(&cpu->name, name);
+            else if (partId)
+                ffStrbufAppendF(&cpu->name, "%s-%X", cpu->vendor.chars, partId);
+            else
+                ffStrbufAppend(&cpu->name, &cpu->vendor);
+            lastPartId = partId;
+            num = 1;
+        }
+        else
+            ++num;
+    }
+    if (num > 1)
+        ffStrbufAppendF(&cpu->name, "*%u", num);
+}
+#endif
+
+static const char* parseCpuInfo(
+    FF_MAYBE_UNUSED FILE* cpuinfo,
+    FF_MAYBE_UNUSED FFCPUResult* cpu,
+    FF_MAYBE_UNUSED FFstrbuf* physicalCoresBuffer,
+    FF_MAYBE_UNUSED FFstrbuf* cpuMHz,
+    FF_MAYBE_UNUSED FFstrbuf* cpuIsa,
+    FF_MAYBE_UNUSED FFstrbuf* cpuUarch,
+    FF_MAYBE_UNUSED FFstrbuf* cpuImplementer)
+{
     FF_AUTO_FREE char* line = NULL;
     size_t len = 0;
 
-    #ifdef __aarch64__
-    FF_STRBUF_AUTO_DESTROY implementer = ffStrbufCreate();
-    #endif
-
     while(getline(&line, &len, cpuinfo) != -1)
     {
-        //Stop after the first CPU
-        if(*line == '\0' || *line == '\n')
+        //Stop after reasonable information is acquired
+        if((*line == '\0' || *line == '\n')
+            #if __arm__ || __loongarch__
+            && cpu->name.length > 0 // #1202 #1204
+            #endif
+        )
             break;
 
         (void)(
-            ffParsePropLine(line, "model name :", &cpu->name) ||
-            ffParsePropLine(line, "vendor_id :", &cpu->vendor) ||
-            ffParsePropLine(line, "cpu cores :", physicalCoresBuffer) ||
-            ffParsePropLine(line, "cpu MHz :", cpuMHz) ||
-            ffParsePropLine(line, "isa :", cpuIsa) ||
-            ffParsePropLine(line, "uarch :", cpuUarch) ||
-
-            #ifdef __aarch64__
-            (cpu->vendor.length == 0 && ffParsePropLine(line, "CPU implementer :", &implementer)) ||
+            // arm64 doesn't have "model name"; arm32 does have "model name" but its value is not useful.
+            // "Hardware" should always be used in this case
+            #if !(__arm__ || __aarch64__)
+            (cpu->name.length == 0 && ffParsePropLine(line, "model name :", &cpu->name)) ||
+            (cpu->vendor.length == 0 && ffParsePropLine(line, "vendor_id :", &cpu->vendor)) ||
+            (physicalCoresBuffer->length == 0 && ffParsePropLine(line, "cpu cores :", physicalCoresBuffer)) ||
+            (cpuMHz->length == 0 && ffParsePropLine(line, "cpu MHz :", cpuMHz)) ||
             #endif
 
+            #if !(__x86_64__ || __i386__ || __arm__ || __aarch64__)
+            (cpuIsa->length == 0 && ffParsePropLine(line, "isa :", cpuIsa)) ||
+            (cpuUarch->length == 0 && ffParsePropLine(line, "uarch :", cpuUarch)) ||
+            #endif
+
+            #if __arm__ || __aarch64__
+            (cpuImplementer->length == 0 && ffParsePropLine(line, "CPU implementer :", cpuImplementer)) ||
             (cpu->name.length == 0 && ffParsePropLine(line, "Hardware :", &cpu->name)) || //For Android devices
-            (cpu->name.length == 0 && ffParsePropLine(line, "cpu     :", &cpu->name)) || //For POWER
-            (cpu->name.length == 0 && ffParsePropLine(line, "cpu model               :", &cpu->name)) //For MIPS
+            #endif
+            #if __powerpc__ || __powerpc
+            (cpu->name.length == 0 && ffParsePropLine(line, "cpu :", &cpu->name)) || //For POWER
+            #endif
+            #if __mips__
+            (cpu->name.length == 0 && ffParsePropLine(line, "cpu model :", &cpu->name)) || //For MIPS
+            #endif
+            false
         );
     }
 
-    #ifdef __aarch64__
-    // https://github.com/util-linux/util-linux/blob/2cd89de14549d2b2c079a4f8b73f75500d229fee/sys-utils/lscpu-arm.c#L286
-    if (cpu->vendor.length == 0 && implementer.length > 2 /* 0xX */)
-    {
-        uint32_t implId = (uint32_t) strtoul(implementer.chars, NULL, 16);
-        switch (implId)
-        {
-        case 0x41: ffStrbufSetStatic(&cpu->vendor, "ARM"); break;
-        case 0x42: ffStrbufSetStatic(&cpu->vendor, "Broadcom"); break;
-        case 0x48: ffStrbufSetStatic(&cpu->vendor, "HiSilicon"); break;
-        case 0x4e: ffStrbufSetStatic(&cpu->vendor, "Nvidia"); break;
-        case 0x51: ffStrbufSetStatic(&cpu->vendor, "Qualcomm"); break;
-        case 0x53: ffStrbufSetStatic(&cpu->vendor, "Samsung"); break;
-        case 0x61: ffStrbufSetStatic(&cpu->vendor, "Apple"); break;
-        case 0x69: ffStrbufSetStatic(&cpu->vendor, "Intel"); break;
-        }
-    }
-    #endif
-
     return NULL;
 }
 
@@ -94,7 +278,7 @@ static uint32_t getFrequency(FFstrbuf* basePath, const char* cpuinfoFileName, co
     bool ok = ffReadFileBuffer(basePath->chars, buffer);
     ffStrbufSubstrBefore(basePath, baseLen);
     if (ok)
-        return (uint32_t) ffStrbufToUInt(buffer, 0);
+        return (uint32_t) (ffStrbufToUInt(buffer, 0) / 1000);
 
     if (scalingFileName)
     {
@@ -102,7 +286,7 @@ static uint32_t getFrequency(FFstrbuf* basePath, const char* cpuinfoFileName, co
         ok = ffReadFileBuffer(basePath->chars, buffer);
         ffStrbufSubstrBefore(basePath, baseLen);
         if (ok)
-            return (uint32_t) ffStrbufToUInt(buffer, 0);
+            return (uint32_t) (ffStrbufToUInt(buffer, 0) / 1000);
     }
 
     return 0;
@@ -141,38 +325,24 @@ static bool detectFrequency(FFCPUResult* cpu, const FFCPUOptions* options)
         if (ffStrStartsWith(entry->d_name, "policy") && ffCharIsDigit(entry->d_name[strlen("policy")]))
         {
             ffStrbufAppendS(&path, entry->d_name);
+
+            uint32_t fmax = getFrequency(&path, "/cpuinfo_max_freq", "/scaling_max_freq", &buffer);
+            if (fmax == 0) continue;
+
+            if (cpu->frequencyMax >= fmax)
+            {
+                if (!options->showPeCoreCount)
+                {
+                    ffStrbufSubstrBefore(&path, baseLen);
+                    continue;
+                }
+            }
+            else
+                cpu->frequencyMax = fmax;
+
             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;
-            }
-            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;
-            }
-            uint32_t fmin = getFrequency(&path, "/cpuinfo_min_freq", "/scaling_min_freq", &buffer);
-            if (fmin > 0)
-            {
-                if (cpu->frequencyMin == cpu->frequencyMin)
-                    cpu->frequencyMin = cpu->frequencyMin < fmin ? cpu->frequencyMin : fmin;
-                else
-                    cpu->frequencyMin = fmin;
-            }
+                cpu->frequencyBase = cpu->frequencyBase > fbase ? cpu->frequencyBase : fbase;
 
             if (options->showPeCoreCount)
             {
@@ -187,31 +357,14 @@ static bool detectFrequency(FFCPUResult* cpu, const FFCPUOptions* options)
             ffStrbufSubstrBefore(&path, baseLen);
         }
     }
-    cpu->frequencyBase /= 1e6;
-    cpu->frequencyMax /= 1e6;
-    cpu->frequencyMin /= 1e6;
-    cpu->frequencyBiosLimit /= 1e6;
     return true;
 }
 
-static double detectCPUTemp(void)
+FF_MAYBE_UNUSED static void parseIsa(FFstrbuf* cpuIsa)
 {
-    const FFlist* tempsResult = ffDetectTemps();
+    // Always use the last part of the ISA string. Ref: #590 #1204
+    ffStrbufSubstrAfterLastC(cpuIsa, ' ');
 
-    FF_LIST_FOR_EACH(FFTempValue, value, *tempsResult)
-    {
-        if(
-            ffStrbufFirstIndexS(&value->name, "cpu") < value->name.length ||
-            ffStrbufCompS(&value->name, "k10temp") == 0 ||
-            ffStrbufCompS(&value->name, "coretemp") == 0
-        ) return value->value;
-    }
-
-    return FF_CPU_TEMP_UNSET;
-}
-
-static void parseIsa(FFstrbuf* cpuIsa)
-{
     if(ffStrbufStartsWithS(cpuIsa, "rv"))
     {
         // RISC-V ISA string example: "rv64imafdch_zicsr_zifencei".
@@ -227,54 +380,84 @@ static void parseIsa(FFstrbuf* cpuIsa)
         }
         // The final ISA output of the above example is "rv64gch".
     }
-    if(ffStrbufStartsWithS(cpuIsa, "mips"))
-    {
-        ffStrbufSubstrAfterLastC(cpuIsa, ' ');
-    }
 }
 
-void detectAsahi(FFCPUResult* cpu)
+FF_MAYBE_UNUSED static void detectArmSoc(FFCPUResult* cpu)
 {
-    // In Asahi Linux, reading /proc/device-tree/compatible gives
-    // information on the device model. It consists of 3 NUL terminated
-    // strings, the second of which gives the actual SoC model. But it
-    // is not the marketing name, i.e. for M2 there is "apple,t8112" in
-    // the compatible string.
-    if (cpu->name.length == 0 && ffStrbufEqualS(&cpu->vendor, "Apple"))
-    {
-        char content[32];
-        ssize_t length = ffReadFileData("/proc/device-tree/compatible", sizeof(content), content);
-        if (length <= 0) return;
+    if (cpu->name.length > 0)
+        return;
 
-        // get the second NUL terminated string
-        char* modelName = memchr(content, '\0', (size_t) length) + 1;
-        if (modelName - content < length && ffStrStartsWith(modelName, "apple,t"))
+    // device-vendor,device-model\0soc-vendor,soc-model\0
+    char content[64];
+    ssize_t length = ffReadFileData("/proc/device-tree/compatible", sizeof(content), content);
+    if (length <= 2) return;
+
+    // get the second NUL terminated string
+    char* modelName = memchr(content, '\0', (size_t) length) + 1;
+    if (!modelName || modelName - content >= length) return;
+
+    if (ffStrStartsWith(modelName, "apple,t"))
+    {
+        // https://elixir.bootlin.com/linux/v6.11-rc7/source/arch/arm64/boot/dts/apple
+        const char* code = modelName + strlen("apple,t");
+        uint32_t deviceId = (uint32_t) strtoul(code, NULL, 10);
+        ffStrbufSetStatic(&cpu->name, ffCPUAppleCodeToName(deviceId));
+        if (!cpu->name.length)
         {
-            uint32_t deviceId = (uint32_t) strtoul(modelName + strlen("apple,t"), NULL, 10);
-            ffStrbufSetStatic(&cpu->name, ffCPUAppleCodeToName(deviceId));
+            ffStrbufAppendS(&cpu->name, "Apple Silicon T");
+            ffStrbufAppendS(&cpu->name, code);
+        }
+    }
+    else if (ffStrStartsWith(modelName, "qcom,"))
+    {
+        // https://elixir.bootlin.com/linux/v6.11-rc7/source/arch/arm64/boot/dts/qcom
+        if (ffStrStartsWith(modelName + strlen("qcom,"), "x"))
+        {
+            ffStrbufSetS(&cpu->name, "Qualcomm Snapdragon X Elite ");
+            for (const char* p = modelName + strlen("qcom,"); *p; ++p)
+                ffStrbufAppendC(&cpu->name, (char) toupper(*p));
+        }
+        else if (ffStrStartsWith(modelName + strlen("qcom,"), "sc"))
+        {
+            const char* code = modelName + strlen("qcom,sc");
+            uint32_t deviceId = (uint32_t) strtoul(code, NULL, 10);
+            ffStrbufSetStatic(&cpu->name, ffCPUQualcommCodeToName(deviceId));
+            if (!cpu->name.length)
+            {
+                ffStrbufAppendS(&cpu->name, "Qualcomm Snapdragon SC");
+                ffStrbufAppendS(&cpu->name, code);
+            }
         }
     }
 }
 
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
+    FF_AUTO_CLOSE_FILE FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
+    if(cpuinfo == NULL)
+        return "fopen(\"/proc/cpuinfo\", \"r\") failed";
+
     cpu->temperature = options->temp ? detectCPUTemp() : FF_CPU_TEMP_UNSET;
 
     FF_STRBUF_AUTO_DESTROY physicalCoresBuffer = ffStrbufCreate();
     FF_STRBUF_AUTO_DESTROY cpuMHz = ffStrbufCreate();
     FF_STRBUF_AUTO_DESTROY cpuIsa = ffStrbufCreate();
     FF_STRBUF_AUTO_DESTROY cpuUarch = ffStrbufCreate();
+    FF_STRBUF_AUTO_DESTROY cpuImplementerStr = ffStrbufCreate();
 
-    const char* error = parseCpuInfo(cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch);
+    const char* error = parseCpuInfo(cpuinfo, cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch, &cpuImplementerStr);
     if (error) return error;
 
     cpu->coresLogical = (uint16_t) get_nprocs_conf();
     cpu->coresOnline = (uint16_t) get_nprocs();
     cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, cpu->coresLogical);
 
-    if (!detectFrequency(cpu, options) || cpu->frequencyBase != cpu->frequencyBase)
-        cpu->frequencyBase = ffStrbufToDouble(&cpuMHz) / 1000;
+    // Ref https://github.com/fastfetch-cli/fastfetch/issues/1194#issuecomment-2295058252
+    ffCPUDetectSpeedByCpuid(cpu);
+    if (!detectFrequency(cpu, options) || cpu->frequencyBase == 0)
+        cpu->frequencyBase = (uint32_t) ffStrbufToUInt(&cpuMHz, 0);
 
+    #if !(__x86_64__ || __i386__ || __arm__ || __aarch64__)
     if(cpuUarch.length > 0)
     {
         if(cpu->name.length > 0)
@@ -289,84 +472,21 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
             ffStrbufAppendC(&cpu->name, ' ');
         ffStrbufAppend(&cpu->name, &cpuIsa);
     }
-
-    #ifdef __ANDROID__
-    detectAndroid(cpu);
     #endif
 
-    #if defined(__linux__) && defined(__aarch64__)
-    detectAsahi(cpu);
+    #if __arm__ || __aarch64__
+    uint32_t cpuImplementer = (uint32_t) strtoul(cpuImplementerStr.chars, NULL, 16);
+    ffStrbufSetStatic(&cpu->vendor, hwImplId2Vendor(cpuImplementer));
+
+    #if __ANDROID__
+    detectAndroid(cpu);
+    #elif __aarch64__
+    detectArmSoc(cpu);
     #endif
 
     if (cpu->name.length == 0)
-    {
-        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
-        if (ffProcessAppendStdOut(&buffer, (char *const[]) { "lscpu", NULL }) == NULL)
-        {
-            char* pstart = buffer.chars;
-
-            if (cpu->vendor.length == 0)
-            {
-                pstart = strstr(pstart, "Vendor ID:");
-                if (pstart)
-                {
-                    pstart += strlen("Vendor ID:");
-                    while (isspace(*pstart)) ++pstart;
-                    if (*pstart)
-                    {
-                        char* pend = strchr(pstart, '\n');
-                        if (pend != NULL)
-                            ffStrbufAppendNS(&cpu->vendor, (uint32_t) (pend - pstart), pstart);
-                        else
-                        {
-                            ffStrbufAppendS(&cpu->vendor, pstart);
-                        }
-                        pstart = pend + 1;
-                        if (pstart >= buffer.chars + buffer.length)
-                            return NULL;
-                    }
-                }
-                else
-                {
-                    pstart = buffer.chars;
-                }
-            }
-
-            while ((pstart = strstr(pstart, "Model name:")))
-            {
-                pstart += strlen("Model name:");
-                while (isspace(*pstart)) ++pstart;
-                if (*pstart == '\0')
-                    break;
-
-                if (cpu->name.length > 0)
-                    ffStrbufAppendS(&cpu->name, " + ");
-
-                if (*pstart == '-')
-                {
-                    if (cpu->vendor.length > 0)
-                        ffStrbufAppend(&cpu->name, &cpu->vendor);
-                    else
-                        ffStrbufAppendS(&cpu->name, "Unknown");
-                    ++pstart;
-                    continue;
-                }
-
-                char* pend = strchr(pstart, '\n');
-                if (pend != NULL)
-                    ffStrbufAppendNS(&cpu->name, (uint32_t) (pend - pstart), pstart);
-                else
-                {
-                    ffStrbufAppendS(&cpu->name, pstart);
-                    break;
-                }
-
-                pstart = pend + 1;
-                if (pstart >= buffer.chars + buffer.length)
-                    return NULL;
-            }
-        }
-    }
+        detectArmName(cpuinfo, cpu, cpuImplementer);
+    #endif
 
     return NULL;
 }

src/detection/cpu/cpu_sunos.c

@@ -29,10 +29,10 @@ const char* ffDetectCPUImpl(FF_MAYBE_UNUSED const FFCPUOptions* options, FFCPURe
         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.;
-    }
+    ffCPUDetectSpeedByCpuid(cpu);
+    kstat_named_t* kn = kstat_data_lookup(ks, "clock_MHz");
+    if (kn->value.ui32 > cpu->frequencyBase)
+        cpu->frequencyBase = kn->value.ui32;
 
     ks = kstat_lookup(kc, "unix", -1, "system_misc");
     if (ks && kstat_read(kc, ks, NULL) >= 0)

src/detection/cpu/cpu_windows.c

@@ -1,5 +1,4 @@
 #include "cpu.h"
-#include "detection/temps/temps_windows.h"
 #include "util/windows/registry.h"
 #include "util/windows/nt.h"
 #include "util/mallocHelper.h"
@@ -54,31 +53,6 @@ typedef struct FFSmbiosProcessorInfo
 static_assert(offsetof(FFSmbiosProcessorInfo, ThreadEnabled) == 0x30,
     "FFSmbiosProcessorInfo: Wrong struct alignment");
 
-#if defined(__x86_64__) || defined(__i386__)
-
-#include <cpuid.h>
-
-inline static const char* detectSpeedByCpuid(FFCPUResult* cpu)
-{
-    uint32_t base = 0, max = 0, bus = 0, unused = 0;
-    if (!__get_cpuid(0x16, &base, &max, &bus, &unused))
-        return "Unsupported instruction";
-
-    // cpuid returns 0 MHz when hyper-v is enabled
-    if (base) cpu->frequencyBase = base / 1000.0;
-    if (max) cpu->frequencyMax = max / 1000.0;
-    return NULL;
-}
-
-#else
-
-inline static const char* detectSpeedByCpuid(FF_MAYBE_UNUSED FFCPUResult* cpu)
-{
-    return "Unsupported platform";
-}
-
-#endif
-
 static const char* detectMaxSpeedBySmbios(FFCPUResult* cpu)
 {
     const FFSmbiosHeaderTable* smbiosTable = ffGetSmbiosHeaderTable();
@@ -97,7 +71,7 @@ static const char* detectMaxSpeedBySmbios(FFCPUResult* cpu)
             return "No active CPU is found in SMBIOS data";
     }
 
-    double speed = data->MaxSpeed / 1000.0;
+    uint32_t speed = data->MaxSpeed;
     // Sometimes SMBIOS reports invalid value. We assume that max speed is small than 2x of base
     if (speed < cpu->frequencyBase || speed > cpu->frequencyBase * 2)
         return "Possible invalid CPU max speed in SMBIOS data. See #800";
@@ -159,7 +133,7 @@ static const char* detectByRegistry(FFCPUResult* cpu)
 
     uint32_t mhz;
     if(ffRegReadUint(hKey, L"~MHz", &mhz, NULL))
-        cpu->frequencyBase = mhz / 1000.0;
+        cpu->frequencyBase = mhz;
 
     return NULL;
 }
@@ -180,11 +154,13 @@ static const char* detectCoreTypes(FFCPUResult* cpu)
         ++cpu->coreTypes[ifreq].count;
     }
 
-    if (cpu->frequencyBase != cpu->frequencyBase)
-        cpu->frequencyBase = pinfo->MaxMhz / 1000.0;
+    if (cpu->frequencyBase == 0)
+        cpu->frequencyBase = pinfo->MaxMhz;
     return NULL;
 }
 
+const char* detectThermalTemp(double* current, double* critical);
+
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
     detectNCores(cpu);
@@ -193,14 +169,14 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     if (error)
         return error;
 
-    detectSpeedByCpuid(cpu);
+    ffCPUDetectSpeedByCpuid(cpu);
     if (options->showPeCoreCount) detectCoreTypes(cpu);
 
-    if (cpu->frequencyMax != cpu->frequencyMax)
+    if (cpu->frequencyMax == 0)
         detectMaxSpeedBySmbios(cpu);
 
     if(options->temp)
-        ffDetectSmbiosTemp(&cpu->temperature, NULL);
+        detectThermalTemp(&cpu->temperature, NULL);
 
     return NULL;
 }