Merge pull request #677 from fastfetch-cli/dev

Release: v2.5.0

.codespellrc

@@ -0,0 +1,5 @@
+[codespell]
+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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
+title: '[BUG] '
 labels: bug
 assignees: ''
 
@@ -24,12 +24,9 @@ The content of the configuration file you use (if any)
 //paste here
 ```
 
-Output of `env NO_CONFIG=1 fastfetch --load-config all --show-errors --stat --multithreading false --disable-linewrap false --hide-cursor false`:
+Output of `fastfetch -c ci.jsonc --format json`:
 <!--
 Note that this output will contain you public IP. If it is not relevant for the issue, feel free to remove it before uploading.
-
-If you get the following error: `Error: couldn't find config: [...]`, copy the files in [presets](../../presets/) to `/usr/share/fastfetch/presets/` or `~/.local/share/fastfetch/presets/`.
-If this isn't possible (or too much work) for you, post the output of `env NO_CONFIG=1 fastfetch --show-errors --stat --multithreading false --disable-linewrap false --hide-cursor false && fastfetch --version`. 
 -->
 
 ```

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,12 +1,14 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
+title: '[FEAT] '
 labels: enhancement
 assignees: ''
 
 ---
 
+<!-- Before requesting a new feature, please try `fastfetch -c all.jsonc` to see if it has been supported -->
+
 # Current state:
 
 # Wanted state:

.github/ISSUE_TEMPLATE/logo_request.md

@@ -1,7 +1,7 @@
 ---
 name: Logo request
 about: Request a new logo
-title: ''
+title: '[LOGO] '
 labels: logo request
 assignees: ''
 
@@ -9,10 +9,10 @@ assignees: ''
 
 # OS
 ```
-paste content of /etc/os-release here. If this file doesn't exist, describe a way to identify the distro.
+Paste content of /etc/os-release here. If this file doesn't exist, describe a way to identify the distro.
 ```
 
 # Ascii
 ```
-paste ascii art here. If you leave this empty, i will try to find the logo myself.
+Paste ascii art here.
 ```

.github/workflows/ci.yml

@@ -5,6 +5,20 @@ on:
   - pull_request
 
 jobs:
+  spellcheck:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install codespell
+        shell: bash
+        run: sudo apt update && sudo apt install -y codespell
+
+      - name: Run Spellchecker
+        run: codespell
+
   linux-buildtest:
     name: Linux build test
     permissions:
@@ -32,13 +46,13 @@ jobs:
         run: uname -a
 
       - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y musl-dev musl-tools linux-headers-generic libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev directx-headers-dev
+        run: sudo apt-get update && sudo apt-get install -y musl-dev musl-tools linux-headers-generic libpci-dev 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 directx-headers-dev libdrm-dev
 
       - name: configure project
         env:
           CC: ${{ matrix.compiler.cc }}
           CXX: ${{ matrix.compiler.cxx }}
-        run: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_LIBPCI=${{ matrix.enableFeatures }} -DENABLE_VULKAN=${{ matrix.enableFeatures }} -DENABLE_WAYLAND=${{ matrix.enableFeatures }} -DENABLE_XCB_RANDR=${{ matrix.enableFeatures }} -DENABLE_XCB=${{ matrix.enableFeatures }} -DENABLE_XRANDR=${{ matrix.enableFeatures }} -DENABLE_X11=${{ matrix.enableFeatures }} -DENABLE_GIO=${{ matrix.enableFeatures }} -DENABLE_DCONF=${{ matrix.enableFeatures }} -DENABLE_DBUS=${{ matrix.enableFeatures }} -DENABLE_XFCONF=${{ matrix.enableFeatures }} -DENABLE_SQLITE3=${{ matrix.enableFeatures }} -DENABLE_RPM=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK7=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK6=${{ matrix.enableFeatures }} -DENABLE_CHAFA=${{ matrix.enableFeatures }} -DENABLE_ZLIB=${{ matrix.enableFeatures }} -DENABLE_EGL=${{ matrix.enableFeatures }} -DENABLE_GLX=${{ matrix.enableFeatures }} -DENABLE_OSMESA=${{ matrix.enableFeatures }} -DENABLE_OPENCL=${{ matrix.enableFeatures }} -DENABLE_LIBNM=${{ matrix.enableFeatures }} -DENABLE_PULSE=${{ matrix.enableFeatures }} -DENABLE_DIRECTX_HEADERS=${{ matrix.enableFeatures }} .
+        run: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_LIBPCI=${{ matrix.enableFeatures }} -DENABLE_VULKAN=${{ matrix.enableFeatures }} -DENABLE_WAYLAND=${{ matrix.enableFeatures }} -DENABLE_XCB_RANDR=${{ matrix.enableFeatures }} -DENABLE_XCB=${{ matrix.enableFeatures }} -DENABLE_XRANDR=${{ matrix.enableFeatures }} -DENABLE_X11=${{ matrix.enableFeatures }} -DENABLE_GIO=${{ matrix.enableFeatures }} -DENABLE_DCONF=${{ matrix.enableFeatures }} -DENABLE_DBUS=${{ matrix.enableFeatures }} -DENABLE_XFCONF=${{ matrix.enableFeatures }} -DENABLE_SQLITE3=${{ matrix.enableFeatures }} -DENABLE_RPM=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK7=${{ matrix.enableFeatures }} -DENABLE_IMAGEMAGICK6=${{ matrix.enableFeatures }} -DENABLE_CHAFA=${{ matrix.enableFeatures }} -DENABLE_ZLIB=${{ matrix.enableFeatures }} -DENABLE_EGL=${{ matrix.enableFeatures }} -DENABLE_GLX=${{ matrix.enableFeatures }} -DENABLE_OSMESA=${{ matrix.enableFeatures }} -DENABLE_OPENCL=${{ matrix.enableFeatures }} -DENABLE_LIBNM=${{ matrix.enableFeatures }} -DENABLE_PULSE=${{ matrix.enableFeatures }} -DENABLE_DIRECTX_HEADERS=${{ matrix.enableFeatures }} -DENABLE_DRM=${{ matrix.enableFeatures }} .
 
       - name: build project
         run: cmake --build .
@@ -50,10 +64,10 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci
+        run: time ./fastfetch -c presets/ci.jsonc
 
       - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
 
       - name: run flashfetch
         run: time ./flashfetch
@@ -74,12 +88,12 @@ jobs:
         run: uname -a
 
       - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev directx-headers-dev
+        run: sudo apt-get update && sudo apt-get install -y libpci-dev 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
 
       - name: install linuxbrew packages
         run: |
           /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          /home/linuxbrew/.linuxbrew/bin/brew install imagemagick --ignore-dependencies
+          /home/linuxbrew/.linuxbrew/bin/brew install imagemagick ddcutil --ignore-dependencies
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
@@ -99,10 +113,10 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci
+        run: time ./fastfetch -c presets/ci.jsonc
 
       - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
 
       - name: run flashfetch
         run: time ./flashfetch
@@ -118,7 +132,7 @@ jobs:
         run: echo "ffversion=$(./fastfetch --version-raw)" >> $GITHUB_OUTPUT
 
       - name: upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: fastfetch-linux
           path: ./fastfetch-*.*
@@ -139,7 +153,7 @@ jobs:
       - name: install required packages
         run: |
           brew update
-          brew install vulkan-loader vulkan-headers molten-vk imagemagick chafa
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install vulkan-loader vulkan-headers molten-vk imagemagick chafa
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
@@ -159,10 +173,10 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci
+        run: time ./fastfetch -c presets/ci.jsonc
 
       - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
 
       - name: run flashfetch
         run: time ./flashfetch
@@ -174,7 +188,7 @@ jobs:
         run: ctest
 
       - name: upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: fastfetch-macos
           path: ./fastfetch-*.*
@@ -190,25 +204,25 @@ jobs:
         uses: actions/checkout@v4
 
       - name: run VM
-        uses: cross-platform-actions/action@v0.21.1
+        uses: cross-platform-actions/action@master
         with:
           operating_system: freebsd
           version: '13.2'
           run: |
             uname -a
             sudo pkg update
-            sudo pkg install -y cmake git pkgconf binutils pciutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 glib dconf dbus sqlite3-tcl xfce4-conf ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd pulseaudio
+            sudo pkg install -y cmake git pkgconf binutils pciutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd pulseaudio
             cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
             cmake --build . --target package --verbose
             ./fastfetch --list-features
-            time ./fastfetch -c presets/ci
-            time ./fastfetch -c presets/ci --format json
+            time ./fastfetch
+            time ./fastfetch --format json
             time ./flashfetch
             ldd fastfetch
             ctest
 
       - name: upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: fastfetch-freebsd
           path: ./fastfetch-*.*
@@ -249,10 +263,10 @@ jobs:
         run: ./fastfetch --list-features
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci
+        run: time ./fastfetch -c presets/ci.jsonc
 
       - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
 
       - name: run flashfetch
         run: time ./flashfetch
@@ -270,7 +284,7 @@ jobs:
         run: 7z a -t7z -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-Win64.7z *.dll fastfetch.exe flashfetch.exe presets
 
       - name: upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: fastfetch-win64
           path: ./fastfetch-*-Win64.*
@@ -316,10 +330,10 @@ jobs:
         run: cp /clang32/bin/{OpenCL,vulkan-1}.dll .
 
       - name: run fastfetch
-        run: time ./fastfetch -c presets/ci
+        run: time ./fastfetch -c presets/ci.jsonc
 
       - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
 
       - name: run flashfetch
         run: time ./flashfetch
@@ -337,7 +351,7 @@ jobs:
         run: 7z a -t7z -mx9 -bd -y fastfetch-$(./fastfetch --version-raw)-Win32.7z *.dll fastfetch.exe flashfetch.exe presets
 
       - name: upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: fastfetch-win32
           path: ./fastfetch-*-Win32.*
@@ -355,15 +369,16 @@ jobs:
     permissions:
       contents: write
     steps:
-      - name: download artifacts
-        uses: actions/download-artifact@v3
-
       - name: get latest release version
         id: get_version_release
         uses: pozetroninc/github-action-get-latest-release@master
         with:
           repository: ${{ github.repository }}
 
+      - name: download artifacts
+        if: needs.linux.outputs.ffversion != steps.get_version_release.outputs.release
+        uses: actions/download-artifact@v4
+
       - name: create release
         if: needs.linux.outputs.ffversion != steps.get_version_release.outputs.release
         uses: ncipollo/release-action@v1
@@ -371,4 +386,28 @@ jobs:
           tag: ${{ needs.linux.outputs.ffversion }}
           commit: ${{ github.sha }}
           artifactErrorsFailBuild: true
-          artifacts: fastfetch-linux/*,fastfetch-macos/*,fastfetch-freebsd/*,fastfetch-win64/*,fastfetch-win32/*
+          artifacts: fastfetch-*/fastfetch-*
+          body: "Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ needs.linux.outputs.ffversion }}/CHANGELOG.md) for details."
+
+      - name: download source tarballs
+        if: needs.linux.outputs.ffversion != steps.get_version_release.outputs.release
+        run: |
+          for i in 1 2 3 4 5; do curl -L --remote-name-all --output-dir fastfetch-source --create-dirs https://github.com/${{ github.repository }}/archive/refs/tags/${{ needs.linux.outputs.ffversion }}.{tar.gz,zip} && break || sleep 5; done
+          ls fastfetch-*/*
+
+      - name: generate release notes
+        if: needs.linux.outputs.ffversion != steps.get_version_release.outputs.release
+        run: |
+          echo "Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ needs.linux.outputs.ffversion }}/CHANGELOG.md) for details." > fastfetch-release-notes.md
+          echo -e "\n---\n\n<details><summary>SHA256SUMs</summary><br>\n\n\`\`\`" >> fastfetch-release-notes.md
+          sha256sum fastfetch-*/* >> fastfetch-release-notes.md
+          echo -e "\`\`\`\n</details>" >> fastfetch-release-notes.md
+
+      - name: update release body
+        if: needs.linux.outputs.ffversion != steps.get_version_release.outputs.release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ needs.linux.outputs.ffversion }}
+          commit: ${{ github.sha }}
+          bodyFile: fastfetch-release-notes.md
+          allowUpdates: true

.gitignore

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

CHANGELOG.md

@@ -1,3 +1,130 @@
+# 2.5.0
+
+Changes:
+* `--gpu-use-nvml` has been renamed to `--gpu-driver-specific` due to using of `IGCL` and `AGS`
+* We now detect external partitions more conservatively in Linux. USB partitions will not be detected as external always ( eg. The Linux kernel itself is installed in a USB drive )
+
+Features:
+* Support more authentication type detection for macOS Sonoma (Wifi, macOS)
+* Default preset names to `.jsonc`. For example, `fastfetch -c all` will load `presets/all.jsonc` (#666)
+* Use Intel Graphics Control Library (IGCL) to detect more GPU information. Windows only (GPU, Windows)
+* Improve support of Asahi Linux (Brightness / CPU / GPU / Disk, Linux)
+* Support more properties of physical disks (PhysicalDisk)
+* Support SSD temperature detection with `--physicaldisk-temp` (PhysicalDisk)
+* Support partition label detection (Disk, FreeBSD)
+* Support platform specific graphic API version detection (GPU, macOS / Windows)
+
+Bugfixes:
+* Fix Windows partition detection for WSL2 (Linux, Disk)
+* Fix Btrfs subvolumes being detected as external partitions some times (Linux, Disk)
+* Fix battery cycle counts in some places (Battery)
+* Fix CodeWhisperer compatibility (#676, Terminal, macOS)
+
+# 2.4.0
+
+**We are deprecating flags based config files (will be removed in v3.0.0). We suggest you migrate to json based config files.** One may use `-c /path/to/config.conf --gen-config` to migrate existing flag based config files.
+
+Changes:
+* All flag based presets are removed
+
+Features:
+* Improve performance of detecting rpm and pkg package count (Packages, Linux / FreeBSD)
+* Support Apple M3X temperature detection (CPU / GPU, macOS)
+* `--ds-force-drm` support a new option `sysfs-only`
+* Improve xfce4 version detection
+* Detect WM and DE by enumerating running processes (WM / DE, FreeBSD)
+* Add a new module `Physical Disk`, which detects product name, full size, serial number and so on.
+
+Bugfixes:
+* Fix crashes sometimes when `--logo-padding-top` is not set (Logo)
+* Fix memory usage counting algorithm (Memory, macOS)
+* Fix the behavior of `--no-buffer` in Windows
+* Fix possible segfault in some devices (Display, Linux)
+* Fix segfaults on first use of new images with Sixel flag (Image) 
+
+Logo:
+* Remove unnecessary escaping for Adelie logo
+* Add EshanizedOS
+
+# 2.3.4
+
+Bugfixes:
+* Fix `--help` doesn't work when built without python
+
+Features:
+* Use `MemAvailable` if available (Memory, Linux)
+* Improve performance of detecting dpkg package count (Packages, Linux)
+
+# 2.3.3
+
+Bugfixes:
+* Fix `--help` doesn't work in Windows and some other platforms
+
+# 2.3.2
+
+Bugfixes:
+* Fix fish completion script, and install the script correctly
+
+Logo:
+* Fix Xray-OS logo name
+
+# 2.3.1
+
+Bugfixes:
+* Fix man page install location
+
+# 2.3.0
+
+**We are deprecating flags based config files (will be removed in v3.0.0). We suggest you migrate to json based config files.**
+
+Config related changes:
+* The deprecated flag `--gen-config conf` is removed
+* Flag `--gen-config` now does the same thing as `--migrate-config`, which can be used as config migration and default config file generation. Flag `--migrate-config` is removed
+* Fastfetch now searches for config files in the order of `fastfetch --list-config-paths`, and won't load other config if one is found.
+* The undocumented flag `--load-user-config` is removed. As an alternative, `--config none` can be used to disable loading config files.
+* `--config` (previously named `--load-config`) is now supported for command line arguments only. If specified, other config files won't be loaded, which works like other programs.
+* Config files will always be loaded before other command line flags being parsed. That is to say, command line flags will always override options defined in config files.
+* the value of GPUType `integrated` contained a typo and was fixed. Existing config files may need to be updated.
+
+Features:
+* Support Oils and elvish shell version detection (Shell)
+* Support Windows Server Core (Windows)
+* Better ddcutil 2.x compatibility (Brightness, Linux)
+* Add completion support for fish (natively) and nushell (via [carapace-bin](https://github.com/rsteube/carapace-bin))
+* Support nix in macOS (Packages, macOS)
+* Print module description for `--list-modules`
+* Support `alacritty.toml` (TerminalFont)
+* Support board detection on macOS. It simplily prints machine model identifier as for now (Board, macOS)
+* Add general method to query product name (Host, macOS)
+* Use `libdrm` as a better fall back for detecting displays, which correctly detects current mode; supports refresh rate detection and maybe also faster than using `/sys/class/drm` (Display, Linux)
+* Support physical disk size detection (DiskIO)
+* Support physical disk name and type detection (DiskIO, FreeBSD)
+
+Bugfixes:
+* End `va_list` before returning (@VoltrexKeyva)
+* Don't use background color when printing blocks (Color)
+* Fix lots of typos
+* Fix compatibility with Linux containers (Linux)
+* Don't report disabled monitors when using DRM (Linux)
+* Fix bad performance in some cases when using X11 (Display, Linux)
+* Fix some memory leaks
+* Fix used swap space detection (Swap, FreeBSD)
+* Don't leak fds to child processes (Linux)
+* Fix possible issues when reading procfs (Linux, @apocelipes)
+
+Logos:
+* Add Adelie, Ironclad
+* Update parch
+
+# 2.2.3
+
+Features:
+* Update the latest mac models (Host, macOS)
+
+Bugfixes:
+* Fix local ips detection on Android. Regression from `2.0.0` (LocalIP, Android)
+* Fix terminal detection on NixOS (Terminal)
+
 # 2.2.2
 
 Changes:
@@ -10,11 +137,11 @@ Features:
 * Improve detection of `Battery`
     * Detect cycle count on supported platforms
     * Detect temperature on Linux when supported
-    * Status detection on macOS has been adjusted to be consistant with other platforms
+    * Status detection on macOS has been adjusted to be consistent with other platforms
 * Linux binaries are built with imagemagick7 support
 
 Bugfixes:
-* Fix unitialized variables (#609)
+* Fix uninitialized variables (#609)
 * Fix spelling of `--preserve-aspect-ratio` (#614)
 
 Logos:
@@ -40,7 +167,7 @@ Changes:
 * Display keys `percent*` and `size*` in JSON config are restructured. e.g. `{ "sizeNdigits": 1 }` is now `{ "size": { "ndigits": 1 } }`
 * With the introduction of `--migrate-config`, the old flag based config file is deprecated, and will be removed in 3.0.0 (next major version)
 * Support of `--gen-config conf` is deprecated accordingly, and will be removed in 2.3.0 (next minor version)
-* The global flag `--allow-slow-operations` is splitted into some explicit flags in differnet modules
+* The global flag `--allow-slow-operations` is split into some explicit flags in different modules
     * `--packages-winget`: control whether `winget` packages count should be detected. Note it's a very slow operation, please enable it with caution.
     * `--chassis-use-wmi`: control whether `WMI` query should be used to detect chassis type, which detects more information, but slower. This flag only affects `--chassis-format` and `--format json`.
     * `--battery-use-setup-api`: control whether `SetupAPI` should be used on Windows to detect battery info, which supports multi batteries, but slower.
@@ -113,9 +240,9 @@ This release introduces a new output format: JSON result
 
 Changes:
 * Users module detects and prints user login time by default. Specifying `--users-compact` to disable it
-* Fastfetch now requires yyjson 0.8.0 or later, which is embeded in fastfetch source tree. If you build fastfetch with `-DENABLE_SYSTEM_YYJSON` cmake option, you must upgrade your yyjson package
+* Fastfetch now requires yyjson 0.8.0 or later, which is embedded in fastfetch source tree. If you build fastfetch with `-DENABLE_SYSTEM_YYJSON` cmake option, you must upgrade your yyjson package
 * Reduced information supported by `--terminal-format`, `--shell-format`
-* Some config presets (`devinfo` and `verbose`) are obseleted and removed. They are barely maintained and can be replaced with `--format json` now.
+* Some config presets (`devinfo` and `verbose`) are obsolete and removed. They are barely maintained and can be replaced with `--format json` now.
 * Custom strings in `--module-key` and `--module-format` are no longer trimmed.
 * `/boot` is hidden by default (FreeBSD, Disk)
 
@@ -195,7 +322,7 @@ Features:
 # 2.0.2
 
 Bugfixes:
-* Workarund [a compiler bug of GCC](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85282) (Windows)
+* Workaround [a compiler bug of GCC](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85282) (Windows)
 * Fix presets not detected by file name (#529)
 
 Logo:
@@ -207,7 +334,7 @@ First stable release of Fastfetch V2
 
 Changes:
 * Unescape strings only when parsing `.conf` files
-    * Previously: `$ NO_CONFIG=1 fastfetch --os-key \\\\ -s os -l none` prints `\: *`. Note the backslashs are unescaped twice (once by shell and once by fastfetch).
+    * Previously: `$ NO_CONFIG=1 fastfetch --os-key \\\\ -s os -l none` prints `\: *`. Note the backslashes are unescaped twice (once by shell and once by fastfetch).
     * Now: `$ NO_CONFIG=1 fastfetch --os-key \\\\ -s os -l none` prints `\\: *`
 * Remove option shortcut `-c` (alias of `--color`), which is more commonly used as alias of `--config`
 * Rename `--recache` to `--logo-recache` (which is used for regenerate image logo cache). Remove option shortcut `-r` (alias of `--recache`).
@@ -263,7 +390,7 @@ Features:
 * Better CPU and Host detection for Android (Android)
 * Support yakuake terminal version & font detection (Terminal, Linux)
 * Add new option `--bright-color` which can be used to disable the default bright color of keys, title and ASCII logo.
-* Add module `Monitor` which prints physical parameters (native resolutions and demensions) of connected monitors
+* Add module `Monitor` which prints physical parameters (native resolutions and dimensions) of connected monitors
 * Support path with environment variables for `--logo-source` and `--load-config`.
 
 Bugfixes:
@@ -351,7 +478,7 @@ Bugfixes:
 * Fix Windows drives detection in WSL (Disk)
 
 Changes:
-* In order to make Icons module consistant between different platforms, `--icons-format` no longer supports individual GTK / QT icon params.
+* In order to make Icons module consistent between different platforms, `--icons-format` no longer supports individual GTK / QT icon params.
 * `--theme-format` no longer supports individual GTK / plasma theme params.
 * `--local-ip-*` and `--public-ip-*` have been changed to `--localip-*` and `--publicip-*`
 * `--localip-compact-type` is no longer supported. Fastfetch now display IPs as `--localip-compat-type multiline` by default, with `--local-compact true` can be set as an alias of `--localip-compact-type oneline`
@@ -374,7 +501,7 @@ Bugfixes:
 * Fix iTerm being detected as iTermServer-* sometimes
 * Fix sound device volume being incorrectly detected as muted sometimes (Sound)
 * Fix memleaks reported by LeakSanitizer (Linux)
-* Fix potential memory curruption bug in unicode.c (Windows)
+* Fix potential memory corruption bug in unicode.c (Windows)
 
 Logo:
 * Update Windows 11 ASCII logo to look more visually consistent (#445)
@@ -410,7 +537,7 @@ Bugfixes:
 * Fix compiling errors (Windows)
 
 Improvements:
-* Improve preformance (WmTheme amd Font, Windows and macOS)
+* Improve performance (WmTheme amd Font, Windows and macOS)
 * Enable nonblocking public-ip / weather detection (Android)
 
 # 1.10.2
@@ -455,7 +582,7 @@ Other:
 
 * Simplified wmtheme output format (Windows)
 * Improved GPU detection performance on Windows 11
-* Lastest Mac model identifier support (macOS)
+* Latest Mac model identifier support (macOS)
 
 # 1.9.1
 
@@ -537,7 +664,7 @@ Bugfixes:
 This release introduces Windows support! Fastfetch now fully support all major desktop OSes (Linux, macOS, Windows and FreeBSD)
 
 Notable Changes:
-* Bios / Board / Chassis modules are splitted against Host module for performance reasons
+* Bios / Board / Chassis modules are split against Host module for performance reasons
 * Caching is removed. Option `--nocache` is removed accordingly
 
 Features:
@@ -546,7 +673,7 @@ Features:
 * Adds a new flag `--stat`, which prints time usage for individual modules
 * Adds Wifi module which supports Windows and macOS
 * Adds data source option for logo printing
-* Detects Homebrew Cellar and Cask seperately
+* Detects Homebrew Cellar and Cask separately
 * Detects WSL version
 * Detects disk based on mount point
 * Exposes more chafa configs

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.2.2
+    VERSION 2.5.0
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -49,6 +49,7 @@ cmake_dependent_option(ENABLE_XCB_RANDR "Enable xcb-randr" ON "LINUX OR BSD" OFF
 cmake_dependent_option(ENABLE_XCB "Enable xcb" ON "LINUX OR BSD" OFF)
 cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX OR BSD" OFF)
 cmake_dependent_option(ENABLE_X11 "Enable x11" ON "LINUX OR BSD" OFF)
+cmake_dependent_option(ENABLE_DRM "Enable libdrm" ON "LINUX OR BSD" OFF)
 cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX OR BSD" OFF)
 cmake_dependent_option(ENABLE_DCONF "Enable dconf" ON "LINUX OR BSD" OFF)
 cmake_dependent_option(ENABLE_DBUS "Enable dbus-1" ON "LINUX OR BSD" OFF)
@@ -71,7 +72,7 @@ cmake_dependent_option(ENABLE_DIRECTX_HEADERS "Enable DirectX headers for WSL" O
 cmake_dependent_option(ENABLE_THREADS "Enable multithreading" ON "Threads_FOUND" OFF)
 cmake_dependent_option(ENABLE_PCI_MEMORY "Enable detecting GPU memory size with libpci" OFF "LINUX OR BSD" OFF)
 
-option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embeded) yyjson library" OFF)
+option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded) yyjson library" OFF)
 option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF)
 option(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
@@ -204,19 +205,35 @@ endif()
 # Text data #
 #############
 
-function(fastfetch_load_text FILENAME OUTVAR)
-    file(READ "${FILENAME}" TEMP)
-    string(REGEX REPLACE "\n$" "" TEMP "${TEMP}") # Remove trailing newline
+function(fastfetch_encode_c_string STR OUTVAR)
+    string(REGEX REPLACE "\n$" "" TEMP "${STR}")  # Remove trailing newline
+    string(REPLACE "\\" "\\\\" TEMP "${TEMP}")    # Escape backslashes
     string(REPLACE "\n" "\\n" TEMP "${TEMP}")     # Replace newlines with \n
     string(REPLACE "\"" "\\\"" TEMP "${TEMP}")    # Replace quotes with \"
-    string(REPLACE "$\\" "" TEMP "${TEMP}")       # Remove $\, so we can unescape some things
-    set("${OUTVAR}" "${TEMP}" PARENT_SCOPE)
+    set(${OUTVAR} "\"${TEMP}\"" PARENT_SCOPE)
+endfunction(fastfetch_encode_c_string)
+
+function(fastfetch_load_text FILENAME OUTVAR)
+    file(READ "${FILENAME}" TEMP)
+    fastfetch_encode_c_string("${TEMP}" TEMP)
+    set(${OUTVAR} "${TEMP}" PARENT_SCOPE)
 endfunction(fastfetch_load_text)
 
+find_package(Python)
+if(Python_FOUND)
+    execute_process(COMMAND ${Python_EXECUTABLE} -c "import json,sys;json.dump(json.load(sys.stdin),sys.stdout,separators=(',',':'))"
+                    INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/src/data/help.json"
+                    OUTPUT_VARIABLE DATATEXT_JSON_HELP)
+    if(DATATEXT_JSON_HELP STREQUAL "")
+        message(ERROR "DATATEXT_JSON_HELP is empty, which should not happen!")
+    endif()
+else()
+    message(STATUS "Python3 is not found, 'help.json' will not be minified")
+    file(READ "src/data/help.json" DATATEXT_JSON_HELP)
+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/config_system.txt DATATEXT_CONFIG_SYSTEM)
-fastfetch_load_text(src/data/config_user.txt DATATEXT_CONFIG_USER)
-fastfetch_load_text(src/data/config_user.jsonc DATATEXT_CONFIG_USER_JSONC)
 fastfetch_load_text(src/data/help.txt DATATEXT_HELP)
 fastfetch_load_text(src/data/help_color.txt DATATEXT_HELP_COLOR)
 fastfetch_load_text(src/data/help_format.txt DATATEXT_HELP_FORMAT)
@@ -228,23 +245,17 @@ if(APPLE)
     configure_file(src/util/apple/Info.plist.in Info.plist @ONLY)
 endif()
 
+string(TIMESTAMP FASTFETCH_BUILD_DATE "%d %B %Y")
+configure_file(doc/fastfetch.1.in fastfetch.1 @ONLY)
+
 ####################
 # Ascii image data #
 ####################
 
-function(fastfetch_load_raw_text FILENAME OUTVAR)
-    file(READ "${FILENAME}" TEMP)
-    string(REGEX REPLACE "\n$" "" TEMP "${TEMP}") # Remove trailing newline
-    string(REPLACE "\\" "\\\\" TEMP "${TEMP}")    # Escape backslashes
-    string(REPLACE "\n" "\\n" TEMP "${TEMP}")     # Replace newlines with \n
-    string(REPLACE "\"" "\\\"" TEMP "${TEMP}")    # Replace quotes with \"
-    set(${OUTVAR} "\"${TEMP}\"" PARENT_SCOPE)
-endfunction(fastfetch_load_raw_text)
-
 file(GLOB LOGO_FILES "src/logo/ascii/*.txt")
-set(LOGO_BUILTIN_H "#pragma once\n\n")
+set(LOGO_BUILTIN_H "#pragma once\n#pragma GCC diagnostic ignored \"-Wtrigraphs\"\n\n")
 foreach(file ${LOGO_FILES})
-    fastfetch_load_raw_text("${file}" content)
+    fastfetch_load_text("${file}" content)
     get_filename_component(file "${file}" NAME_WLE)
     string(TOUPPER "${file}" file)
     string(REGEX REPLACE "\\$\\{c([0-9]+)\\}" "$\\1" content "${content}")
@@ -329,6 +340,7 @@ set(LIBFASTFETCH_SRC
     src/modules/opengl/opengl.c
     src/modules/os/os.c
     src/modules/packages/packages.c
+    src/modules/physicaldisk/physicaldisk.c
     src/modules/processes/processes.c
     src/modules/player/player.c
     src/modules/poweradapter/poweradapter.c
@@ -383,8 +395,10 @@ if(LINUX)
         src/detection/cursor/cursor_linux.c
         src/detection/bluetooth/bluetooth_linux.c
         src/detection/disk/disk_linux.c
+        src/detection/physicaldisk/physicaldisk_linux.c
         src/detection/diskio/diskio_linux.c
         src/detection/displayserver/linux/displayserver_linux.c
+        src/detection/displayserver/linux/drm.c
         src/detection/displayserver/linux/wayland.c
         src/detection/displayserver/linux/wmde.c
         src/detection/displayserver/linux/xcb.c
@@ -441,6 +455,7 @@ elseif(ANDROID)
         src/detection/cursor/cursor_nosupport.c
         src/detection/cpuusage/cpuusage_linux.c
         src/detection/disk/disk_linux.c
+        src/detection/physicaldisk/physicaldisk_linux.c
         src/detection/diskio/diskio_linux.c
         src/detection/displayserver/displayserver_android.c
         src/detection/font/font_nosupport.c
@@ -494,8 +509,10 @@ elseif(BSD)
         src/detection/cpuusage/cpuusage_bsd.c
         src/detection/cursor/cursor_linux.c
         src/detection/disk/disk_bsd.c
+        src/detection/physicaldisk/physicaldisk_bsd.c
         src/detection/diskio/diskio_bsd.c
         src/detection/displayserver/linux/displayserver_linux.c
+        src/detection/displayserver/linux/drm.c
         src/detection/displayserver/linux/wayland.c
         src/detection/displayserver/linux/wmde.c
         src/detection/displayserver/linux/xcb.c
@@ -516,7 +533,7 @@ elseif(BSD)
         src/detection/netio/netio_bsd.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_linux.c
-        src/detection/packages/packages_linux.c
+        src/detection/packages/packages_bsd.c
         src/detection/poweradapter/poweradapter_nosupport.c
         src/detection/processes/processes_bsd.c
         src/detection/gtk_qt/qt.c
@@ -546,17 +563,19 @@ elseif(APPLE)
         src/detection/battery/battery_apple.c
         src/detection/bios/bios_apple.c
         src/detection/bluetooth/bluetooth_apple.m
-        src/detection/board/board_nosupport.c
+        src/detection/board/board_apple.c
         src/detection/brightness/brightness_apple.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_apple.c
         src/detection/cpuusage/cpuusage_apple.c
         src/detection/cursor/cursor_apple.m
         src/detection/disk/disk_bsd.c
+        src/detection/physicaldisk/physicaldisk_apple.c
         src/detection/diskio/diskio_apple.c
         src/detection/displayserver/displayserver_apple.c
         src/detection/font/font_apple.m
         src/detection/gpu/gpu_apple.c
+        src/detection/gpu/gpu_apple.m
         src/detection/host/host_apple.c
         src/detection/lm/lm_nosupport.c
         src/detection/icons/icons_nosupport.c
@@ -606,11 +625,14 @@ elseif(WIN32)
         src/detection/cpuusage/cpuusage_windows.c
         src/detection/cursor/cursor_windows.c
         src/detection/disk/disk_windows.c
+        src/detection/physicaldisk/physicaldisk_windows.c
         src/detection/diskio/diskio_windows.c
         src/detection/displayserver/displayserver_windows.c
         src/detection/font/font_windows.c
         src/detection/gpu/gpu_windows.c
         src/detection/gpu/gpu_nvidia.c
+        src/detection/gpu/gpu_intel.c
+        src/detection/gpu/gpu_amd.c
         src/detection/host/host_windows.c
         src/detection/icons/icons_windows.c
         src/detection/libc/libc_windows.cpp
@@ -779,6 +801,10 @@ ff_lib_enable(X11
     "x11"
     "X11"
 )
+ff_lib_enable(DRM
+    "libdrm"
+    "Libdrm"
+)
 ff_lib_enable(GIO
     "gio-2.0"
     "GIO"
@@ -880,6 +906,7 @@ elseif(APPLE)
         PRIVATE "-framework CoreWLAN"
         PRIVATE "-framework IOBluetooth"
         PRIVATE "-framework IOKit"
+        PRIVATE "-framework Metal"
         PRIVATE "-framework OpenGL"
         PRIVATE "-framework OpenCL"
         PRIVATE "-framework SystemConfiguration"
@@ -893,26 +920,23 @@ elseif(APPLE)
 elseif(WIN32)
     target_compile_definitions(libfastfetch PRIVATE -D_WIN32_WINNT=0x0601)
     target_link_libraries(libfastfetch
-        PRIVATE "bthprops"
         PRIVATE "dwmapi"
         PRIVATE "gdi32"
         PRIVATE "iphlpapi"
         PRIVATE "ole32"
         PRIVATE "oleaut32"
-        PRIVATE "opengl32"
         PRIVATE "ws2_32"
         PRIVATE "ntdll"
         PRIVATE "version"
         PRIVATE "setupapi"
         PRIVATE "hid"
         PRIVATE "wtsapi32"
-        PRIVATE "dxva2"
     )
 elseif(BSD)
     target_link_libraries(libfastfetch
         PRIVATE "m"
         PRIVATE "usbhid"
-        PRIVATE "devstat"
+        PRIVATE "geom"
     )
 elseif(ANDROID)
     CHECK_LIBRARY_EXISTS(-l:libandroid-wordexp.a wordexp "" HAVE_LIBANDROID_WORDEXP_STATIC)
@@ -1029,6 +1053,12 @@ install(
     RENAME "${CMAKE_PROJECT_NAME}"
 )
 
+install(
+    FILES "${CMAKE_SOURCE_DIR}/completions/fish"
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/fish/vendor_completions.d"
+    RENAME "${CMAKE_PROJECT_NAME}.fish"
+)
+
 install(
     DIRECTORY "${CMAKE_SOURCE_DIR}/presets"
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}"
@@ -1039,6 +1069,11 @@ install(
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${CMAKE_PROJECT_NAME}"
 )
 
+install(
+    FILES "${PROJECT_BINARY_DIR}/fastfetch.1"
+    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
+)
+
 ##################
 # package target #
 ##################

DEVELOPMENT.md

@@ -16,7 +16,7 @@ Here i just add things that are easy to forget.
 - [ ] ZSH completions
 - [ ] Fish completions
 - [ ] Make CPU usage detection much faster and more accurate
-- [ ] Detect CPU usage in a common detection methode and expose it both to the cpuUsage module and the cpu format string
+- [ ] Detect CPU usage in a common detection method and expose it both to the cpuUsage module and the cpu format string
 - [ ] Per session caching
 
 ### General

README.md

@@ -1,13 +1,13 @@
 # Fastfetch
 
-![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/fastfetch-cli/fastfetch/ci.yml)
-![GitHub license](https://img.shields.io/github/license/fastfetch-cli/fastfetch)
-![GitHub contributors](https://img.shields.io/github/contributors/fastfetch-cli/fastfetch)
-![GitHub top language](https://img.shields.io/github/languages/top/fastfetch-cli/fastfetch?logo=c&label=)
-![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/fastfetch-cli/fastfetch)  
-![homebrew downloads](https://img.shields.io/homebrew/installs/dm/fastfetch?logo=homebrew)
-![GitHub all releases](https://img.shields.io/github/downloads/fastfetch-cli/fastfetch/total?logo=github)  
-![GitHub release (with filter)](https://img.shields.io/github/v/release/fastfetch-cli/fastfetch?logo=github)
+[![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/fastfetch-cli/fastfetch/ci.yml)](https://github.com/fastfetch-cli/fastfetch/actions)
+[![GitHub license](https://img.shields.io/github/license/fastfetch-cli/fastfetch)](https://github.com/fastfetch-cli/fastfetch/blob/dev/LICENSE)
+[![GitHub contributors](https://img.shields.io/github/contributors/fastfetch-cli/fastfetch)](https://github.com/fastfetch-cli/fastfetch/graphs/contributors)
+[![GitHub top language](https://img.shields.io/github/languages/top/fastfetch-cli/fastfetch?logo=c&label=)](https://github.com/fastfetch-cli/fastfetch/blob/dev/CMakeLists.txt#L5)
+[![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/fastfetch-cli/fastfetch)](https://github.com/fastfetch-cli/fastfetch/commits)  
+[![homebrew downloads](https://img.shields.io/homebrew/installs/dm/fastfetch?logo=homebrew)](https://formulae.brew.sh/formula/fastfetch#default)
+[![GitHub all releases](https://img.shields.io/github/downloads/fastfetch-cli/fastfetch/total?logo=github)](https://github.com/fastfetch-cli/fastfetch/releases)  
+[![GitHub release (with filter)](https://img.shields.io/github/v/release/fastfetch-cli/fastfetch?logo=github)](https://github.com/fastfetch-cli/fastfetch/releases)
 [![latest packaged version(s)](https://repology.org/badge/latest-versions/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
 [![Packaging status](https://repology.org/badge/tiny-repos/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
 
@@ -27,10 +27,14 @@ There are [screenshots on different platforms](https://github.com/fastfetch-cli/
 
 ### Linux
 
-* Debian / Ubuntu: Download `fastfetch-<version>-Linux.deb` from [Github release page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and `sudo apt install fastfetch-<version>-Linux.deb`
+* Debian / Ubuntu: Download `fastfetch-<version>-Linux.deb` from [Github release page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and `dpkg -i fastfetch-<version>-Linux.deb`
 * Arch Linux: `sudo pacman -S fastfetch`
 * Fedora: `sudo dnf install fastfetch`
 * Gentoo: `sudo emerge --ask app-misc/fastfetch`
+* NixOS: `sudo nix-shell -p fastfetch`
+* openSUSE: `sudo zypper install fastfetch`
+
+Replace sudo with doas depending on what you use.
 
 [See also if fastfetch has been packaged for your favorite Linux distro](#Packaging)
 
@@ -62,7 +66,7 @@ See Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building
 * 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`
 * 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 --migrate-config`
+* Generate config file based on command line arguments: `fastfetch --arg1 --arg2 --gen-config`
 
 ## Customization
 
@@ -85,7 +89,19 @@ Logos can be heavily customized too; see the [logo documentation](https://github
 ## FAQ
 
 Q: Why do you need a very performant version of neofetch?
-> I like putting neofetch in my ~/.bashrc to have a system overwiew whenever I use the terminal, but the slow speed annoyed me, so I created this. Also neofetch didn't output everything correctly (e.g Font is displayed as "[Plasma], Noto Sans, 10 [GTK2/3]") and writing my own tool gave me the possibility to fine tune it to run perfectly on at least my configuration.
+> I like putting neofetch in my ~/.bashrc to have a system overview whenever I use the terminal, but the slow speed annoyed me, so I created this. Also neofetch didn't output everything correctly (e.g Font is displayed as "[Plasma], Noto Sans, 10 [GTK2/3]") and writing my own tool gave me the possibility to fine tune it to run perfectly on at least my configuration.
 
 Q: It does not display [*] correctly for me, what can I do?
 > This is most likely because your system is not implemented (yet). At the moment I am focusing more on making the core app better, than adding more configurations. Feel free to open a pull request if you want to add support for your configuration
+
+## Star History
+
+Give it a star to support us!
+
+<a href="https://star-history.com/#fastfetch-cli/fastfetch&Date">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=fastfetch-cli/fastfetch&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=fastfetch-cli/fastfetch&type=Date" />
+    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=fastfetch-cli/fastfetch&type=Date" />
+  </picture>
+</a>

completions/bash

@@ -5,7 +5,7 @@ __fastfetch_complete_help()
     local __ff_helps=(
         "color"
         "format"
-        "load-config"
+        "config"
         "os-format"
         "host-format"
         "kernel-format"
@@ -66,7 +66,7 @@ __fastfetch_complete_path()
 
 __fastfetch_complete_logo()
 {
-    COMPREPLY=($(compgen -W "$(fastfetch --list-logos-autocompletion)" -- "$CURRENT_WORD"))
+    COMPREPLY=($(compgen -W "$(fastfetch --list-logos autocompletion)" -- "$CURRENT_WORD"))
 }
 
 __fastfetch_complete_logo_type()
@@ -182,7 +182,6 @@ __fastfetch_completion()
         "--cpu-temp"
         "--gpu-temp"
         "--battery-temp"
-        "--display-detect-name"
         "--display-precise-refresh-rate"
         "--localip-show-ipv4"
         "--localip-show-ipv6"
@@ -218,10 +217,9 @@ __fastfetch_completion()
         "--logo-color-6"
         "--logo-color-7"
         "--logo-color-8"
+        "--logo-color-9"
         "--logo-width"
         "--logo-height"
-        "--logo-color-9"
-        "-c"
         "--color"
         "--color-keys"
         "--color-title"
@@ -360,7 +358,8 @@ __fastfetch_completion()
     )
 
     local FF_OPTIONS_PATH=(
-        "--load-config"
+        "-c"
+        "--config"
         "--os-file"
         "--lib-pci"
         "--lib-vulkan"

completions/fish

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

doc/fastfetch.1.in

@@ -0,0 +1,134 @@
+.TH FASTFETCH 1 "@FASTFETCH_BUILD_DATE@" "@CMAKE_PROJECT_NAME@ @CMAKE_PROJECT_VERSION@"
+
+.SH NAME
+fastfetch \- a neofetch\-like tool for fetching system information and
+displaying them in a pretty way
+
+.SH SYNOPSIS
+
+.B fastfetch
+.I [options...]
+
+.SH DESCRIPTION
+
+Fastfetch is a neofetch\-like tool for fetching system information and
+displaying them in a pretty way. It is written mainly in C, with performance
+and customizability in mind.
+Currently, Linux, Android, FreeBSD, MacOS and Windows 7+ are supported.
+
+.SH "EXIT STATUS"
+
+On successful execution, fastfetch returns zero. If any error happened,
+the exit code will be non\-zero.
+
+.SH OPTIONS
+
+.SS "Informative Options"
+.TP
+
+.B \-h, \-\-help \fI [command]
+Show help output, displaying all available options or help for given command
+.TP
+
+.B \-v, \-\-version
+Show version of fastfetch
+.TP
+
+.B \-\-list\-config\-paths
+List search paths of config files
+.TP
+
+.B \-\-list\-data\-paths
+List search paths of presets and logos
+.TP
+
+.B \-\-list\-logos
+List available logos, they can be loaded with \fI \-\-logo
+.TP
+
+.B \-\-list\-modules
+List available modules
+.TP
+
+.B \-\-list\-presets
+List available presets, they can be loaded with \fI \-\-config
+.TP
+
+.B \-\-list\-features
+List the supported features fastfetch was compiled with
+.TP
+
+.B \-\-print\-logos
+Print available logos
+.TP
+
+.B \-\-print\-structure
+Print the default structure
+
+
+.SS "Display Options"
+.TP
+
+.B \-l, \-\-logo \fI <logo>
+Set the logo to display
+.TP
+
+.B \-s, \-\-structure \fI <structure>
+Set the structure of the fetch. For details about the structure,
+see the CONFIGURATION section.
+
+
+.SS "Config Options"
+.TP
+
+.B \-c, \-\-config \fI <config>
+Use the specified config file or preset. If "none", disable further config
+loading. For details about config files, see the CONFIGURATION section
+.TP
+
+.B \-\-gen\-config \fI [file]
+Generate a config file with options specified on the command line.
+If \fI file \fR is specified, the configuration will written to the
+file, otherwise it will be written to stdout.
+.TP
+
+.B \-\-gen\-config\-force \fI [file]
+Same as \fB \-\-gen\-config\fR, but overwrites existing config
+.TP
+
+
+To list all options, use \fB \-\-help\fR this will also print all available module options.
+
+.SH CONFIGURATION
+.SS "Fetch Structure"
+The structure of a fetch describes the modules that should be included in
+the output. It consists of a string of modules, separated by a colon (:).
+To list all available modules, use \fB \-\-list\-modules \fR
+
+.SS "Config Files"
+
+fastfetch supports two types of config files. The legacy
+configuration files and a JSONC based format.
+
+A JSONC config file is a JSON file that also supports comments with (//). Those
+files must have the extension '.jsonc'. You can migrate a legacy config
+file to the JSONC format by using \fB\-\-gen\-config\fR.
+
+The specified configuration/preset files are searched in the following order:
+
+1. relative to the current working directory
+
+2. relative to ~/.local/share/fastfetch/presets/
+
+3. relative to /usr/share/fastfetch/presets/
+
+When both a '.jsonc' and a '.conf' file with the same name is found,
+the '.jsonc' file is preferred.
+
+Fastfetch provides some default presets. List them with \fB \-\-print\-available\-presets\fR.
+
+.SH "SEE ALSO"
+.BR neofetch (1)
+
+.SH BUGS
+Please report bugs to:\fI https://github.com/fastfetch\-cli/fastfetch/issues \fR

doc/json_schema.json

@@ -251,8 +251,24 @@
                     "description": "Set the path to the file containing OS information. Linux only"
                 },
                 "dsForceDrm": {
-                    "type": "boolean",
-                    "description": "Force display detection to use `/sys/class/drm`. Linux only",
+                    "description": "Force display detection to use DRM. Linux only",
+                    "oneOf": [
+                        {
+                            "type": "bool",
+                            "const": false,
+                            "description": "Try `wayland`, then `x11`, then `drm`"
+                        },
+                        {
+                            "type": "string",
+                            "description": "Use `/sys/class/drm` only.",
+                            "const": "sysfs-only"
+                        },
+                        {
+                            "type": "bool",
+                            "const": true,
+                            "description": "Try `libdrm` first, then `sysfs` if libdrm failed"
+                        }
+                    ],
                     "default": false
                 },
                 "wmiTimeout": {
@@ -470,6 +486,10 @@
                     "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)"
                 },
+                "drm": {
+                    "type": "string",
+                    "description": "Used for fast resolution and refresh rate detection (Linux)"
+                },
                 "gio": {
                     "type": "string",
                     "description": "Needed for values that are only stored GSettings (Linux, FreeBSD)"
@@ -580,6 +600,7 @@
                             "opengl",
                             "os",
                             "packages",
+                            "physicaldisk",
                             "player",
                             "poweradapter",
                             "processes",
@@ -729,15 +750,15 @@
                                             },
                                             {
                                                 "const": "theme",
-                                                "description": "Print current theme information"
+                                                "description": "Print current theme of desktop environment"
                                             },
                                             {
                                                 "const": "uptime",
-                                                "description": "Print system uptime"
+                                                "description": "Print how long system has been running"
                                             },
                                             {
                                                 "const": "users",
-                                                "description": "List users currently logged in"
+                                                "description": "Print users currently logged in"
                                             },
                                             {
                                                 "const": "version",
@@ -844,7 +865,7 @@
                                 "properties": {
                                     "type": {
                                         "const": "brightness",
-                                        "description": "Print current brightness / luminance of your monitors"
+                                        "description": "Print current brightness level of your monitors"
                                     },
                                     "ddcciSleep": {
                                         "type": "integer",
@@ -1033,7 +1054,7 @@
                                     "preciseRefreshRate": {
                                         "description": "Set if decimal refresh rates should not be rounded into integers when printing",
                                         "type": "boolean",
-                                        "default": true
+                                        "default": false
                                     },
                                     "key": {
                                         "$ref": "#/$defs/key"
@@ -1059,7 +1080,7 @@
                                     },
                                     "folders": {
                                         "type": "string",
-                                        "description": "A colon (semicolon on Windows) separated list of folder paths for the disk output\nDefault: \"/:/home\" (\"C:\\\\;D:\\\\ ...\" on Windows)"
+                                        "description": "A colon (semicolon on Windows) separated list of folder paths for the disk output\nDefault: auto detection using mount-points"
                                     },
                                     "showExternal": {
                                         "type": "boolean",
@@ -1170,8 +1191,8 @@
                                         "type": "boolean",
                                         "default": false
                                     },
-                                    "useNvml": {
-                                        "description": "Use nvml (NVIDIA Management Library) to detect more detailed GPU information (memory usage, CUDA core count, etc)",
+                                    "driverSpecific": {
+                                        "description": "Use driver specific method to detect more detailed GPU information (memory usage, core count, etc)",
                                         "type": "boolean",
                                         "default": false
                                     },
@@ -1349,6 +1370,37 @@
                                     }
                                 }
                             },
+                            {
+                                "title": "Physical Disk",
+                                "properties": {
+                                    "type": {
+                                        "description": "Print physical disk information",
+                                        "const": "physicaldisk"
+                                    },
+                                    "namePrefix": {
+                                        "description": "Show disks with given name prefix only",
+                                        "type": "string"
+                                    },
+                                    "temp": {
+                                        "description": "Detect and display SSD temperature if supported",
+                                        "type": "boolean",
+                                        "default": false
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                },
+                                "additionalProperties": false
+                            },
                             {
                                 "title": "Public IP",
                                 "properties": {

presets/all

@@ -1 +0,0 @@
---structure Title:Separator:OS:Host:Bios:Board:Chassis:Kernel:Uptime:Processes:Packages:Shell:Display:Brightness:Monitor:LM:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Wallpaper:Terminal:TerminalFont:TerminalSize:CPU:CPUUsage:GPU:Memory:Swap:Disk:Battery:PowerAdapter:Player:Media:PublicIP:LocalIP:Wifi:DateTime:Locale:Vulkan:OpenGL:OpenCL:Users:Bluetooth:Sound:Gamepad:Weather:NetIO:DiskIO:Version:Break:Colors

presets/all.jsonc

@@ -53,6 +53,7 @@
         "weather",
         "netio",
         "diskio",
+        "physicaldisk",
         "version",
         "break",
         "colors"

presets/btw

@@ -1,3 +0,0 @@
---logo arch
---os-format "Arch Linux ({12})"
---packages-format "{} (pacman)"

presets/ci

@@ -1,7 +0,0 @@
--c all
---pipe
---show-errors
---no-buffer
---publicip-timeout 1000
---weather-timeout 1000
---stat

presets/ci.jsonc

@@ -0,0 +1,70 @@
+{
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "display": {
+    "stat": true,
+    "pipe": true,
+    "showErrors": true,
+    "noBuffer": true
+  },
+  "modules": [
+    "title",
+    "separator",
+    "os",
+    "host",
+    "bios",
+    "board",
+    "chassis",
+    "kernel",
+    "uptime",
+    "processes",
+    "packages",
+    "shell",
+    "display",
+    "brightness",
+    "monitor",
+    "lm",
+    "de",
+    "wm",
+    "wmtheme",
+    "theme",
+    "icons",
+    "font",
+    "cursor",
+    "wallpaper",
+    "terminal",
+    "terminalfont",
+    "terminalsize",
+    "cpu",
+    "cpuusage",
+    "gpu",
+    "memory",
+    "swap",
+    "disk",
+    "battery",
+    "poweradapter",
+    "player",
+    "media",
+    "publicip",
+    "localip",
+    "wifi",
+    "datetime",
+    "locale",
+    "vulkan",
+    "opengl",
+    "opencl",
+    "users",
+    "bluetooth",
+    "sound",
+    "gamepad",
+    {
+      "type": "weather",
+      "timeout": 1000
+    },
+    "netio",
+    "diskio",
+    "physicaldisk",
+    "version",
+    "break",
+    "colors"
+  ]
+}

presets/examples/1

@@ -1 +0,0 @@
-# Load with --load-config examples/1

presets/examples/2

@@ -1,24 +0,0 @@
-# Load with --load-config examples/2
-# Note that you must replace the image path to an existing image to display it.
-
---kitty /home/linus/Bilder/Gentoo.png
---logo-width 28
-
---separator "  "
-
---set-keyless HardwareStart=┌───────── \e[1mHardware Information\e[0m ─────────┐
---set-keyless SoftwareStart=├───────── \e[1mSoftware Information\e[0m ─────────┤
---set-keyless InformationEnd=└────────────────────────────────────────┘
---set-keyless Colors=    \e[38m \e[37m \e[36m \e[35m \e[34m \e[33m \e[32m \e[31m
---structure HardwareStart:Host:CPU:GPU:SoftwareStart:OS:Kernel:WM:Shell:Terminal:TerminalFont:Packages:InformationEnd:Colors
-
---host-key "  "
---cpu-key "  "
---gpu-key "  ﬙"
---os-key "  "
---kernel-key "  "
---wm-key "  "
---shell-key "  "
---terminal-key "  "
---terminalfont-key "  "
---packages-key "  "

presets/examples/3

@@ -1,7 +0,0 @@
-# Load with --load-config example/3
-
---logo debian_small
---structure Vulkan:OpenGL:OpenCL:Memory:Disk:LocalIP
---binary-prefix si
---localip-show-loop false
---disk-folders /:/home:/boot:/efi

presets/examples/4

@@ -1,7 +0,0 @@
-# Load with --load-config examples/4
-
---color blue
---logo arch_small
---logo-padding-right 1
---separator "  "
---structure DateTime:Break:Player:Media

presets/examples/5

@@ -1,11 +0,0 @@
-# Load with --load-config examples/5
-
---logo none
---color reset_magenta
---structure Theme:Icons:Font:Cursor
---theme-key T
---theme-format {7}
---icons-key I
---icons-format {5}
---font-key F
---cursor-key C

presets/hardware

@@ -1,4 +0,0 @@
---structure Host:Display:CPU:GPU:Memory:Disk:Battery
---memory-format "{?2}{2}{?}"
---disk-format "{?2}{2}{?}"
---battery-format "{?1}{1} {?}{?2}{2} {?}{?3}({3}){?}"

presets/neofetch

@@ -1,9 +0,0 @@
---structure "Title:Separator:OS:Host:Kernel:Uptime:Packages:Shell:Display:DE:WM:WMTheme:Theme:Icons:Terminal:TerminalFont:CPU:GPU:Memory:Break:Colors"
---host-format "{/2}{-}{/}{2}{?3} {3}{?}"
---os-format "{3} {12}"
---display-key Resolution
---display-compact-type original
---de-format "{2} {3}"
---theme-format "{?1}{1}{?3} {3}{?} [Plasma], {?}{7}"
---terminalfont-format "{/2}{-}{/}{2}{?3} {3}{?}"
---memory-format "{/1}{-}{/}{/2}{-}{/}{} / {}"

presets/paleofetch

@@ -1,5 +0,0 @@
---structure Title:Separator:OS:Host:Kernel:Uptime:Battery:Break:Packages:Shell:Display:Terminal:Break:CPU:GPU:Memory:Break:Colors
---host-format "{/2}{-}{/}{2}{?3} {3}{?}"
---battery-format "{/4}{-}{/}{4}%{?5} [{5}]{?}"
---display-key "Display"
---gpu-key "GPU"

presets/software

@@ -1 +0,0 @@
---structure OS:Kernel:Shell:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont

src/3rdparty/ags/amd_ags.h

@@ -0,0 +1,383 @@
+//
+// Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+
+/// \file
+/// \mainpage
+/// AGS Library Overview
+/// --------------------
+/// This document provides an overview of the AGS (AMD GPU Services) library. The AGS library provides software developers with the ability to query
+/// AMD GPU software and hardware state information that is not normally available through standard operating systems or graphic APIs.
+///
+/// The latest version of the API is publicly hosted here: https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/.
+/// It is also worth checking http://gpuopen.com/gaming-product/amd-gpu-services-ags-library/ for any updates and articles on AGS.
+/// \internal
+/// Online documentation is publicly hosted here: http://gpuopen-librariesandsdks.github.io/ags/
+/// \endinternal
+///
+/// ---------------------------------------
+/// What's new in AGS 6.2 since version 6.1
+/// ---------------------------------------
+/// AGS 6.2 includes the following updates:
+/// * Shader clock intrinsics
+/// * Minor improvements and fixes
+///
+/// ---------------------------------------
+/// What's new in AGS 6.1 since version 6.0
+/// ---------------------------------------
+/// AGS 6.1 includes the following updates:
+/// * RDNA3 detection
+///
+/// ---------------------------------------
+/// What's new in AGS 6.0 since version 5.4.2
+/// ---------------------------------------
+/// AGS 6.0 includes the following updates:
+/// * DX12 ray tracing hit token for RDNA2 hardware.
+/// * Shader intrinsic that exposes ReadLaneAt in DX12.
+/// * Shader intrinsics that expose explicit float conversions in DX12.
+/// * Refactored and revised API to minimize user error.
+/// * Added agsGetVersionNumber.
+/// * Detection for external GPUs.
+/// * Detection of RDNA2 architecture.
+/// * Grouped the more established intrinsics together into per year support.
+/// * Function pointer typedefs for the API
+///
+/// ---------------------------------------
+/// What's new in AGS 5.4.2 since version 5.4.1
+/// ---------------------------------------
+/// AGS 5.4.2 includes the following updates:
+/// * sharedMemoryInBytes has been reinstated.
+/// * Clock speed returned for APUs.
+///
+/// ---------------------------------------
+/// What's new in AGS 5.4.1 since version 5.4.0
+/// ---------------------------------------
+/// AGS 5.4.1 includes the following updates:
+/// * AsicFamily_Count to help with code maintenance.
+/// * Visual Studio 2019 support.
+/// * x86 support
+/// * BaseInstance and BaseVertex intrinsics along with corresponding caps bits.
+/// * GetWaveSize intrinsic along with corresponding caps bits.
+///
+/// ---------------------------------------
+/// What's new in AGS 5.4 since version 5.3
+/// ---------------------------------------
+/// AGS 5.4 includes the following updates:
+/// * A more detailed description of the GPU architecture, now including RDNA GPUs.
+/// * Radeon 7 core and memory speeds returned.
+/// * Draw index and Atomic U64 intrinsics for both DX11 and DX12.
+///
+/// ---------------------------------------
+/// What's new in AGS 5.3 since version 5.2
+/// ---------------------------------------
+/// AGS 5.3 includes the following updates:
+/// * DX11 deferred context support for Multi Draw Indirect and UAV Overlap extensions.
+/// * A Radeon Software Version helper to determine whether the installed driver meets your game's minimum driver version requirements.
+/// * Freesync HDR Gamma 2.2 mode which uses a 1010102 swapchain and can be considered as an alternative to using the 64 bit swapchain required for Freesync HDR scRGB.
+///
+/// Using the AGS library
+/// ---------------------
+/// It is recommended to take a look at the source code for the samples that come with the AGS SDK:
+/// * AGSSample
+/// * CrossfireSample
+/// * EyefinitySample
+/// The AGSSample application is the simplest of the three examples and demonstrates the code required to initialize AGS and use it to query the GPU and Eyefinity state.
+/// The CrossfireSample application demonstrates the use of the new API to transfer resources on GPUs in Crossfire mode. Lastly, the EyefinitySample application provides a more
+/// extensive example of Eyefinity setup than the basic example provided in AGSSample.
+/// There are other samples on Github that demonstrate the DirectX shader extensions, such as the Barycentrics11 and Barycentrics12 samples.
+///
+/// To add AGS support to an existing project, follow these steps:
+/// * Link your project against the correct import library. Choose from either the 32 bit or 64 bit version.
+/// * Copy the AGS dll into the same directory as your game executable.
+/// * Include the amd_ags.h header file from your source code.
+/// * Include the AGS hlsl files if you are using the shader intrinsics.
+/// * Declare a pointer to an AGSContext and make this available for all subsequent calls to AGS.
+/// * On game initialization, call \ref agsInitialize passing in the address of the context. On success, this function will return a valid context pointer.
+///
+/// Don't forget to cleanup AGS by calling \ref agsDeInitialize when the app exits, after the device has been destroyed.
+
+#ifndef AMD_AGS_H
+#define AMD_AGS_H
+
+#define AMD_AGS_VERSION_MAJOR 6             ///< AGS major version
+#define AMD_AGS_VERSION_MINOR 2             ///< AGS minor version
+#define AMD_AGS_VERSION_PATCH 0             ///< AGS patch version
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/// \defgroup Defines AGS defines
+/// @{
+#if defined (AGS_GCC)
+#define AMD_AGS_API
+#else
+#define AMD_AGS_API __declspec(dllexport)   ///< AGS exported functions
+#endif
+
+#define AGS_MAKE_VERSION( major, minor, patch ) ( ( major << 22 ) | ( minor << 12 ) | patch ) ///< Macro to create the app and engine versions for the fields in \ref AGSDX12ExtensionParams and \ref AGSDX11ExtensionParams and the Radeon Software Version
+#define AGS_UNSPECIFIED_VERSION 0xFFFFAD00                                                    ///< Use this to specify no version
+#define AGS_CURRENT_VERSION AGS_MAKE_VERSION( AMD_AGS_VERSION_MAJOR, AMD_AGS_VERSION_MINOR, AMD_AGS_VERSION_PATCH ) ///< Macro to return the current AGS version as defined by the AGS header file
+/// @}
+
+/// \defgroup enums General enumerations
+/// @{
+
+/// The return codes
+typedef enum AGSReturnCode
+{
+    AGS_SUCCESS,                    ///< Successful function call
+    AGS_FAILURE,                    ///< Failed to complete call for some unspecified reason
+    AGS_INVALID_ARGS,               ///< Invalid arguments into the function
+    AGS_OUT_OF_MEMORY,              ///< Out of memory when allocating space internally
+    AGS_MISSING_D3D_DLL,            ///< Returned when a D3D dll fails to load
+    AGS_LEGACY_DRIVER,              ///< Returned if a feature is not present in the installed driver
+    AGS_NO_AMD_DRIVER_INSTALLED,    ///< Returned if the AMD GPU driver does not appear to be installed
+    AGS_EXTENSION_NOT_SUPPORTED,    ///< Returned if the driver does not support the requested driver extension
+    AGS_ADL_FAILURE,                ///< Failure in ADL (the AMD Display Library)
+    AGS_DX_FAILURE,                 ///< Failure from DirectX runtime
+    AGS_D3DDEVICE_NOT_CREATED       ///< Failure due to not creating the D3D device successfully via AGS.
+} AGSReturnCode;
+
+/// @}
+
+typedef struct AGSContext AGSContext;  ///< All function calls in AGS require a pointer to a context. This is generated via \ref agsInitialize
+
+/// The rectangle struct used by AGS.
+typedef struct AGSRect
+{
+    int offsetX;    ///< Offset on X axis
+    int offsetY;    ///< Offset on Y axis
+    int width;      ///< Width of rectangle
+    int height;     ///< Height of rectangle
+} AGSRect;
+
+/// The display info struct used to describe a display enumerated by AGS
+typedef struct AGSDisplayInfo
+{
+    char                    name[ 256 ];                    ///< The name of the display
+    char                    displayDeviceName[ 32 ];        ///< The display device name, i.e. DISPLAY_DEVICE::DeviceName
+
+    unsigned int            isPrimaryDisplay : 1;           ///< Whether this display is marked as the primary display
+    unsigned int            HDR10 : 1;                      ///< HDR10 is supported on this display
+    unsigned int            dolbyVision : 1;                ///< Dolby Vision is supported on this display
+    unsigned int            freesync : 1;                   ///< Freesync is supported on this display
+    unsigned int            freesyncHDR : 1;                ///< Freesync HDR is supported on this display
+    unsigned int            eyefinityInGroup : 1;           ///< The display is part of the Eyefinity group
+    unsigned int            eyefinityPreferredDisplay : 1;  ///< The display is the preferred display in the Eyefinity group for displaying the UI
+    unsigned int            eyefinityInPortraitMode : 1;    ///< The display is in the Eyefinity group but in portrait mode
+    unsigned int            reservedPadding : 24;           ///< Reserved for future use
+
+    int                     maxResolutionX;                 ///< The maximum supported resolution of the unrotated display
+    int                     maxResolutionY;                 ///< The maximum supported resolution of the unrotated display
+    float                   maxRefreshRate;                 ///< The maximum supported refresh rate of the display
+
+    AGSRect                 currentResolution;              ///< The current resolution and position in the desktop, ignoring Eyefinity bezel compensation
+    AGSRect                 visibleResolution;              ///< The visible resolution and position. When Eyefinity bezel compensation is enabled this will
+                                                            ///< be the sub region in the Eyefinity single large surface (SLS)
+    float                   currentRefreshRate;             ///< The current refresh rate
+
+    int                     eyefinityGridCoordX;            ///< The X coordinate in the Eyefinity grid. -1 if not in an Eyefinity group
+    int                     eyefinityGridCoordY;            ///< The Y coordinate in the Eyefinity grid. -1 if not in an Eyefinity group
+
+    double                  chromaticityRedX;               ///< Red display primary X coord
+    double                  chromaticityRedY;               ///< Red display primary Y coord
+
+    double                  chromaticityGreenX;             ///< Green display primary X coord
+    double                  chromaticityGreenY;             ///< Green display primary Y coord
+
+    double                  chromaticityBlueX;              ///< Blue display primary X coord
+    double                  chromaticityBlueY;              ///< Blue display primary Y coord
+
+    double                  chromaticityWhitePointX;        ///< White point X coord
+    double                  chromaticityWhitePointY;        ///< White point Y coord
+
+    double                  screenDiffuseReflectance;       ///< Percentage expressed between 0 - 1
+    double                  screenSpecularReflectance;      ///< Percentage expressed between 0 - 1
+
+    double                  minLuminance;                   ///< The minimum luminance of the display in nits
+    double                  maxLuminance;                   ///< The maximum luminance of the display in nits
+    double                  avgLuminance;                   ///< The average luminance of the display in nits
+
+    int                     logicalDisplayIndex;            ///< The internally used index of this display
+    int                     adlAdapterIndex;                ///< The internally used ADL adapter index
+    int                     reserved;                       ///< reserved field
+} AGSDisplayInfo;
+
+/// The ASIC family
+typedef enum AsicFamily
+{
+    AsicFamily_Unknown,                                         ///< Unknown architecture, potentially from another IHV. Check \ref AGSDeviceInfo::vendorId
+    AsicFamily_PreGCN,                                          ///< Pre GCN architecture.
+    AsicFamily_GCN1,                                            ///< AMD GCN 1 architecture: Oland, Cape Verde, Pitcairn & Tahiti.
+    AsicFamily_GCN2,                                            ///< AMD GCN 2 architecture: Hawaii & Bonaire.  This also includes APUs Kaveri and Carrizo.
+    AsicFamily_GCN3,                                            ///< AMD GCN 3 architecture: Tonga & Fiji.
+    AsicFamily_GCN4,                                            ///< AMD GCN 4 architecture: Polaris.
+    AsicFamily_Vega,                                            ///< AMD Vega architecture, including Raven Ridge (ie AMD Ryzen CPU + AMD Vega GPU).
+    AsicFamily_RDNA,                                            ///< AMD RDNA architecture
+    AsicFamily_RDNA2,                                           ///< AMD RDNA2 architecture
+    AsicFamily_RDNA3,                                           ///< AMD RDNA3 architecture
+
+    AsicFamily_Count                                            ///< Number of enumerated ASIC families
+} AsicFamily;
+
+/// The device info struct used to describe a physical GPU enumerated by AGS
+typedef struct AGSDeviceInfo
+{
+    const char*                     adapterString;                  ///< The adapter name string
+    AsicFamily                      asicFamily;                     ///< Set to Unknown if not AMD hardware
+    unsigned int                    isAPU : 1;                      ///< Whether this device is an APU
+    unsigned int                    isPrimaryDevice : 1;            ///< Whether this device is marked as the primary device
+    unsigned int                    isExternal :1;                  ///< Whether this device is a detachable, external device
+    unsigned int                    reservedPadding : 29;           ///< Reserved for future use
+
+    int                             vendorId;                       ///< The vendor id
+    int                             deviceId;                       ///< The device id
+    int                             revisionId;                     ///< The revision id
+
+    int                             numCUs;                         ///< Number of compute units
+    int                             numWGPs;                        ///< Number of RDNA Work Group Processors.  Only valid if ASIC is RDNA onwards.
+
+    int                             numROPs;                        ///< Number of ROPs
+    int                             coreClock;                      ///< Core clock speed at 100% power in MHz
+    int                             memoryClock;                    ///< Memory clock speed at 100% power in MHz
+    int                             memoryBandwidth;                ///< Memory bandwidth in MB/s
+    float                           teraFlops;                      ///< Teraflops of GPU. Zero if not GCN onwards. Calculated from iCoreClock * iNumCUs * 64 Pixels/clk * 2 instructions/MAD
+
+    unsigned long long              localMemoryInBytes;             ///< The size of local memory in bytes. 0 for non AMD hardware.
+    unsigned long long              sharedMemoryInBytes;            ///< The size of system memory available to the GPU in bytes.  It is important to factor this into your VRAM budget for APUs
+                                                                    ///< as the reported local memory will only be a small fraction of the total memory available to the GPU.
+
+    int                             numDisplays;                    ///< The number of active displays found to be attached to this adapter.
+    AGSDisplayInfo*                 displays;                       ///< List of displays allocated by AGS to be numDisplays in length.
+
+    int                             eyefinityEnabled;               ///< Indicates if Eyefinity is active
+    int                             eyefinityGridWidth;             ///< Contains width of the multi-monitor grid that makes up the Eyefinity Single Large Surface.
+    int                             eyefinityGridHeight;            ///< Contains height of the multi-monitor grid that makes up the Eyefinity Single Large Surface.
+    int                             eyefinityResolutionX;           ///< Contains width in pixels of the multi-monitor Single Large Surface.
+    int                             eyefinityResolutionY;           ///< Contains height in pixels of the multi-monitor Single Large Surface.
+    int                             eyefinityBezelCompensated;      ///< Indicates if bezel compensation is used for the current SLS display area. 1 if enabled, and 0 if disabled.
+
+    int                             adlAdapterIndex;                ///< Internally used index into the ADL list of adapters
+    int                             reserved;                       ///< reserved field
+} AGSDeviceInfo;
+
+/// \defgroup general General API functions
+/// API for initialization, cleanup, HDR display modes and Crossfire GPU count
+/// @{
+
+typedef void* (__stdcall *AGS_ALLOC_CALLBACK)( size_t allocationSize );     ///< AGS user defined allocation prototype
+typedef void (__stdcall *AGS_FREE_CALLBACK)( void* allocationPtr );         ///< AGS user defined free prototype
+
+/// The configuration options that can be passed in to \ref agsInitialize
+typedef struct AGSConfiguration
+{
+    AGS_ALLOC_CALLBACK      allocCallback;                  ///< Optional memory allocation callback. If not supplied, malloc() is used
+    AGS_FREE_CALLBACK       freeCallback;                   ///< Optional memory freeing callback. If not supplied, free() is used
+} AGSConfiguration;
+
+/// The top level GPU information returned from \ref agsInitialize
+typedef struct AGSGPUInfo
+{
+    const char*             driverVersion;                  ///< The AMD driver package version
+    const char*             radeonSoftwareVersion;          ///< The Radeon Software Version
+
+    int                     numDevices;                     ///< Number of GPUs in the system
+    AGSDeviceInfo*          devices;                        ///< List of GPUs in the system
+} AGSGPUInfo;
+
+/// The struct to specify the display settings to the driver.
+typedef struct AGSDisplaySettings AGSDisplaySettings;
+
+
+/// The result returned from \ref agsCheckDriverVersion
+typedef enum AGSDriverVersionResult
+{
+    AGS_SOFTWAREVERSIONCHECK_OK,                              ///< The reported Radeon Software Version is newer or the same as the required version
+    AGS_SOFTWAREVERSIONCHECK_OLDER,                           ///< The reported Radeon Software Version is older than the required version
+    AGS_SOFTWAREVERSIONCHECK_UNDEFINED                        ///< The check could not determine as result.  This could be because it is a private or custom driver or just invalid arguments.
+} AGSDriverVersionResult;
+
+///
+/// Helper function to check the installed software version against the required software version.
+///
+/// \param [in] radeonSoftwareVersionReported       The Radeon Software Version returned from \ref AGSGPUInfo::radeonSoftwareVersion.
+/// \param [in] radeonSoftwareVersionRequired       The Radeon Software Version to check against.  This is specificed using \ref AGS_MAKE_VERSION.
+/// \return                                         The result of the check.
+///
+AMD_AGS_API AGSDriverVersionResult agsCheckDriverVersion( const char* radeonSoftwareVersionReported, unsigned int radeonSoftwareVersionRequired );
+
+///
+/// Function to return the AGS version number.
+///
+/// \return                                         The version number made using AGS_MAKE_VERSION( AMD_AGS_VERSION_MAJOR, AMD_AGS_VERSION_MINOR, AMD_AGS_VERSION_PATCH ).
+///
+AMD_AGS_API int agsGetVersionNumber();
+
+///
+/// Function used to initialize the AGS library.
+/// agsVersion must be specified as AGS_CURRENT_VERSION or the call will return \ref AGS_INVALID_ARGS.
+/// Must be called prior to any of the subsequent AGS API calls.
+/// Must be called prior to ID3D11Device or ID3D12Device creation.
+/// \note The caller of this function should handle the possibility of the call failing in the cases below. One option is to do a vendor id check and only call \ref agsInitialize if there is an AMD GPU present.
+/// \note This function will fail with \ref AGS_NO_AMD_DRIVER_INSTALLED if there is no AMD driver found on the system.
+/// \note This function will fail with \ref AGS_LEGACY_DRIVER in Catalyst versions before 12.20.
+///
+/// \param [in] agsVersion                          The API version specified using the \ref AGS_CURRENT_VERSION macro. If this does not match the version in the binary this initialization call will fail.
+/// \param [in] config                              Optional pointer to a AGSConfiguration struct to override the default library configuration.
+/// \param [out] context                            Address of a pointer to a context. This function allocates a context on the heap which is then required for all subsequent API calls.
+/// \param [out] gpuInfo                            Optional pointer to a AGSGPUInfo struct which will get filled in for all the GPUs in the system.
+///
+AMD_AGS_API AGSReturnCode agsInitialize( int agsVersion, const AGSConfiguration* config, AGSContext** context, AGSGPUInfo* gpuInfo );
+
+///
+///   Function used to clean up the AGS library.
+///
+/// \param [in] context                             Pointer to a context. This function will deallocate the context from the heap.
+///
+AMD_AGS_API AGSReturnCode agsDeInitialize( AGSContext* context );
+
+///
+/// Function used to set a specific display into HDR mode
+/// \note Setting all of the values apart from color space and transfer function to zero will cause the display to use defaults.
+/// \note Call this function after each mode change (switch to fullscreen, any change in swapchain etc).
+/// \note HDR10 PQ mode requires a 1010102 swapchain.
+/// \note HDR10 scRGB mode requires an FP16 swapchain.
+/// \note Freesync HDR scRGB mode requires an FP16 swapchain.
+/// \note Freesync HDR Gamma 2.2 mode requires a 1010102 swapchain.
+/// \note Dolby Vision requires a 8888 UNORM swapchain.
+///
+/// \param [in] context                             Pointer to a context. This is generated by \ref agsInitialize
+/// \param [in] deviceIndex                         The index of the device listed in \ref AGSGPUInfo::devices.
+/// \param [in] displayIndex                        The index of the display listed in \ref AGSDeviceInfo::displays.
+/// \param [in] settings                            Pointer to the display settings to use.
+///
+AMD_AGS_API AGSReturnCode agsSetDisplayMode( AGSContext* context, int deviceIndex, int displayIndex, const AGSDisplaySettings* settings );
+
+/// @}
+
+/// @}
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif // AMD_AGS_H

src/3rdparty/ags/repo.json

@@ -0,0 +1,7 @@
+{
+    "home": "https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK",
+    "license": "MIT (embeded in source)",
+    "version": "AGS v6.2.0",
+    "author": "Advanced Micro Devices, Inc",
+    "modified": "CarterLi"
+}

src/3rdparty/igcl/LICENSE

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

src/3rdparty/igcl/repo.json

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

src/common/bar.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_bar
-#define FF_INCLUDED_common_bar
-
 #include "fastfetch.h"
 
 enum
@@ -15,5 +12,3 @@ enum
 
 void ffAppendPercentBar(FFstrbuf* buffer, double percent, uint8_t green, uint8_t yellow, uint8_t red);
 void ffAppendPercentNum(FFstrbuf* buffer, double percent, uint8_t green, uint8_t yellow, bool parentheses);
-
-#endif

src/common/commandoption.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_commandoption
-#define FF_INCLUDED_common_commandoption
-
 #include "fastfetch.h"
 
 typedef struct FFCustomValue
@@ -17,12 +14,10 @@ typedef struct FFdata
 {
     FFstrbuf structure;
     FFlist customValues; // List of FFCustomValue
-    bool loadUserConfig;
+    bool configLoaded;
 } FFdata;
 
 bool ffParseModuleOptions(const char* key, const char* value);
 void ffPrepareCommandOption(FFdata* data);
 void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc);
 void ffMigrateCommandOptionToJsonc(FFdata* data, yyjson_mut_doc* jsonDoc);
-
-#endif

src/common/dbus.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_dbus
-#define FF_INCLUDED_common_dbus
-
 #ifdef FF_HAVE_DBUS
 #include <dbus/dbus.h>
 
@@ -54,4 +51,3 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
 void ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result);
 
 #endif // FF_HAVE_DBUS
-#endif // FF_INCLUDED_common_dbus

src/common/font.c

@@ -12,6 +12,22 @@ void ffFontInit(FFfont* font)
     ffListInit(&font->styles, sizeof(FFstrbuf));
 }
 
+static void strbufAppendNSExcludingC(FFstrbuf* strbuf, uint32_t length, const char* value, char exclude)
+{
+    if(value == NULL || length == 0)
+        return;
+
+    ffStrbufEnsureFree(strbuf, length);
+
+    for(uint32_t i = 0; i < length; i++)
+    {
+        if(value[i] != exclude)
+        strbuf->chars[strbuf->length++] = value[i];
+    }
+
+    strbuf->chars[strbuf->length] = '\0';
+}
+
 static void fontInitPretty(FFfont* font)
 {
     ffStrbufAppend(&font->pretty, &font->name);
@@ -155,7 +171,7 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern
             ffStrbufInit(alternativeBuffer);
         }
 
-        ffStrbufAppendNSExludingC(alternativeBuffer, wordLength, wordStart, '-');
+        strbufAppendNSExcludingC(alternativeBuffer, wordLength, wordStart, '-');
 
         if(
             strncasecmp(wordStart, "Ultra ", 6) == 0 ||
@@ -171,7 +187,7 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern
 
     if(alternativeBuffer != NULL)
     {
-        ffStrbufAppendNSExludingC(alternativeBuffer, wordLength, wordStart, '-');
+        strbufAppendNSExcludingC(alternativeBuffer, wordLength, wordStart, '-');
         return;
     }
 
@@ -200,11 +216,6 @@ void ffFontInitValues(FFfont* font, const char* name, const char* size)
     fontInitPretty(font);
 }
 
-void ffFontInitCopy(FFfont* font, const char* name)
-{
-    ffFontInitValues(font, name, NULL);
-}
-
 void ffFontInitWithSpace(FFfont* font, const char* rawName)
 {
     const char* pspace = strrchr(rawName, ' ');

src/common/font.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_font
-#define FF_INCLUDED_common_font
-
 #include "util/FFstrbuf.h"
 #include "util/FFlist.h"
 
@@ -17,9 +14,11 @@ typedef struct FFfont
 void ffFontInit(FFfont* font);
 void ffFontInitQt(FFfont* font, const char* data);
 void ffFontInitPango(FFfont* font, const char* data);
-void ffFontInitCopy(FFfont* font, const char* name);
 void ffFontInitValues(FFfont* font, const char* name, const char* size);
 void ffFontInitWithSpace(FFfont* font, const char* rawName);
 void ffFontDestroy(FFfont* font);
 
-#endif
+static inline void ffFontInitCopy(FFfont* font, const char* name)
+{
+    ffFontInitValues(font, name, NULL);
+}

src/common/format.c

@@ -203,7 +203,7 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
             }
 
             // fastforward to the end of the if without printing the in between
-            i = ffStrbufNextIndexS(formatstr, i, "{?}") + 2; // 2 is the length of "{?}" - 1 because the loop will increament it again directly after continue
+            i = ffStrbufNextIndexS(formatstr, i, "{?}") + 2; // 2 is the length of "{?}" - 1 because the loop will increment it again directly after continue
             continue;
         }
 
@@ -229,7 +229,7 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
             }
 
             // fastforward to the end of the if without printing the in between
-            i = ffStrbufNextIndexS(formatstr, i, "{/}") + 2; // 2 is the length of "{/}" - 1 because the loop will increament it again directly after continue
+            i = ffStrbufNextIndexS(formatstr, i, "{/}") + 2; // 2 is the length of "{/}" - 1 because the loop will increment it again directly after continue
             continue;
         }
 

src/common/format.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_format
-#define FF_INCLUDED_common_format
-
 typedef enum FFformatargtype
 {
     FF_FORMAT_ARG_TYPE_NULL = 0,
@@ -27,5 +24,3 @@ typedef struct FFformatarg
 
 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);
 void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
-
-#endif

src/common/init.c

@@ -94,7 +94,10 @@ void ffStart(void)
     ffHideCursor = instance.config.display.hideCursor && !instance.config.display.pipe && !instance.state.resultDoc;
 
     #ifdef _WIN32
-    setvbuf(stdout, NULL, _IOFBF, instance.config.display.noBuffer ? 0 : 4096);
+    if (instance.config.display.noBuffer)
+        setvbuf(stdout, NULL, _IONBF, 0);
+    else
+        setvbuf(stdout, NULL, _IOFBF, 4096);
     SetConsoleCtrlHandler(consoleHandler, TRUE);
     HANDLE hStdout = GetStdHandle(STD_OUTPUT_HANDLE);
     DWORD mode = 0;
@@ -144,7 +147,7 @@ static void destroyState(void)
     ffPlatformDestroy(&instance.state.platform);
     yyjson_doc_free(instance.state.configDoc);
     yyjson_mut_doc_free(instance.state.resultDoc);
-    ffStrbufDestroy(&instance.state.migrateConfigPath);
+    ffStrbufDestroy(&instance.state.genConfigPath);
 }
 
 void ffDestroyInstance(void)
@@ -181,6 +184,9 @@ void ffListFeatures(void)
         #ifdef FF_HAVE_X11
             "x11\n"
         #endif
+        #ifdef FF_HAVE_DRM
+            "drm\n"
+        #endif
         #ifdef FF_HAVE_GIO
             "gio\n"
         #endif

src/common/io/io.h

@@ -1,9 +1,7 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_io_io
-#define FF_INCLUDED_common_io_io
-
 #include "util/FFstrbuf.h"
+#include "util/FFlist.h"
 
 #ifdef _WIN32
     #include <fileapi.h>
@@ -13,7 +11,12 @@
 #else
     #include <unistd.h>
     #include <dirent.h>
+    #include <sys/stat.h>
     typedef int FFNativeFD;
+    // procfs's file can be changed between read calls such as /proc/meminfo and /proc/uptime.
+    // one safe way to read correct data is reading the whole file in a single read syscall
+    // 8192 comes from procps-ng: https://gitlab.com/procps-ng/procps/-/blob/master/library/meminfo.c?ref_type=heads#L39
+    #define PROC_FILE_BUFFSIZ 8192
 #endif
 
 static inline FFNativeFD FFUnixFD2NativeFD(int unixfd)
@@ -52,11 +55,11 @@ static inline ssize_t ffReadFDData(FFNativeFD fd, size_t dataSize, void* data)
     #ifndef _WIN32
         return read(fd, data, dataSize);
     #else
-        DWORD readed;
-        if(!ReadFile(fd, data, (DWORD)dataSize, &readed, NULL))
+        DWORD bytesRead;
+        if(!ReadFile(fd, data, (DWORD)dataSize, &bytesRead, NULL))
             return -1;
 
-        return (ssize_t)readed;
+        return (ssize_t)bytesRead;
     #endif
 }
 
@@ -74,15 +77,45 @@ static inline bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer)
 //Bit flags, combine with |
 typedef enum FFPathType
 {
-    FF_PATHTYPE_REGULAR = 1,
-    FF_PATHTYPE_LINK = 2,
-    FF_PATHTYPE_DIRECTORY = 4
+    FF_PATHTYPE_FILE = 1 << 0,
+    FF_PATHTYPE_DIRECTORY = 1 << 1,
+    FF_PATHTYPE_ANY = FF_PATHTYPE_FILE | FF_PATHTYPE_DIRECTORY,
 } FFPathType;
 
-#define FF_PATHTYPE_FILE (FF_PATHTYPE_REGULAR | FF_PATHTYPE_LINK)
-#define FF_PATHTYPE_ANY (FF_PATHTYPE_FILE | FF_PATHTYPE_DIRECTORY)
+static inline bool ffPathExists(const char* path, FFPathType pathType)
+{
+    #ifdef _WIN32
+
+    DWORD attr = GetFileAttributesA(path);
+
+    if(attr == INVALID_FILE_ATTRIBUTES)
+        return false;
+
+    if(pathType & FF_PATHTYPE_FILE && !(attr & FILE_ATTRIBUTE_DIRECTORY))
+        return true;
+
+    if(pathType & FF_PATHTYPE_DIRECTORY && (attr & FILE_ATTRIBUTE_DIRECTORY))
+        return true;
+
+    #else
+
+    struct stat fileStat;
+    if(stat(path, &fileStat) != 0)
+        return false;
+
+    unsigned int mode = fileStat.st_mode & S_IFMT;
+
+    if(pathType & FF_PATHTYPE_FILE && mode == S_IFREG)
+        return true;
+
+    if(pathType & FF_PATHTYPE_DIRECTORY && mode == S_IFDIR)
+        return true;
+
+    #endif
+
+    return false;
+}
 
-bool ffPathExists(const char* path, FFPathType pathType);
 bool ffPathExpandEnv(const char* in, FFstrbuf* out);
 
 #define FF_IO_TERM_RESP_WAIT_MS 100 // #554
@@ -102,7 +135,7 @@ static inline void ffUnsuppressIO(bool* suppressed)
 
 #define FF_SUPPRESS_IO() bool __attribute__((__cleanup__(ffUnsuppressIO), __unused__)) io_suppressed__ = ffSuppressIO(true)
 
-void ffListFilesRecursively(const char* path);
+void ffListFilesRecursively(const char* path, bool pretty);
 
 static inline bool wrapClose(FFNativeFD* pfd)
 {
@@ -154,4 +187,17 @@ static inline bool wrapClosedir(HANDLE* pdir)
 #endif
 #define FF_AUTO_CLOSE_DIR __attribute__((__cleanup__(wrapClosedir)))
 
-#endif // FF_INCLUDED_common_io_io
+static inline bool ffSearchUserConfigFile(const FFlist* configDirs, const char* fileSubpath, FFstrbuf* result)
+{
+    // configDirs is a list of FFstrbufs include the trailing slash
+    FF_LIST_FOR_EACH(FFstrbuf, dir, *configDirs)
+    {
+        ffStrbufClear(result);
+        ffStrbufAppend(result, dir);
+        ffStrbufAppendS(result, fileSubpath);
+        if (ffPathExists(result->chars, FF_PATHTYPE_FILE))
+            return true;
+    }
+
+    return false;
+}

src/common/io/io_unix.c

@@ -3,10 +3,10 @@
 #include "util/unused.h"
 
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <termios.h>
 #include <poll.h>
 #include <dirent.h>
+#include <errno.h>
 
 #if __has_include(<wordexp.h>)
 #include <wordexp.h>
@@ -16,63 +16,83 @@ static void createSubfolders(const char* fileName)
 {
     FF_STRBUF_AUTO_DESTROY path = ffStrbufCreate();
 
-    while(*fileName != '\0')
+    char *token = NULL;
+    while((token = strchr(fileName, '/')) != NULL)
     {
-        ffStrbufAppendC(&path, *fileName);
-        if(*fileName == '/')
-            mkdir(path.chars, S_IRWXU | S_IRGRP | S_IROTH);
-        ++fileName;
+        ffStrbufAppendNS(&path, (uint32_t)(token - fileName + 1), fileName);
+        mkdir(path.chars, S_IRWXU | S_IRGRP | S_IROTH);
+        fileName = token + 1;
     }
 }
 
 bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)
 {
-    int openFlagsModes = O_WRONLY | O_CREAT | O_TRUNC;
+    int openFlagsModes = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC;
     int openFlagsRights = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
 
     int FF_AUTO_CLOSE_FD fd = open(fileName, openFlagsModes, openFlagsRights);
     if(fd == -1)
     {
-        createSubfolders(fileName);
-        fd = open(fileName, openFlagsModes, openFlagsRights);
-        if(fd == -1)
+        if (errno == ENOENT)
+        {
+            createSubfolders(fileName);
+            fd = open(fileName, openFlagsModes, openFlagsRights);
+            if(fd == -1)
+                return false;
+        }
+        else
             return false;
     }
 
     return write(fd, data, dataSize) > 0;
 }
 
+static inline void readWithLength(int fd, FFstrbuf* buffer, uint32_t length)
+{
+    ffStrbufEnsureFixedLengthFree(buffer, length);
+    ssize_t bytesRead = 0;
+    while(
+        length > 0 && (bytesRead = read(fd, buffer->chars + buffer->length, length)) > 0
+    ) {
+        buffer->length += (uint32_t) bytesRead;
+        length -= (uint32_t) bytesRead;
+    }
+}
+
+static inline void readUntilEOF(int fd, FFstrbuf* buffer)
+{
+    ffStrbufEnsureFree(buffer, 31);
+    uint32_t available = ffStrbufGetFree(buffer);
+    ssize_t bytesRead = 0;
+    while(
+        (bytesRead = read(fd, buffer->chars + buffer->length, available)) > 0
+    ) {
+        buffer->length += (uint32_t) bytesRead;
+        if((uint32_t) bytesRead == available)
+            ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
+        available = ffStrbufGetFree(buffer);
+    }
+}
+
 bool ffAppendFDBuffer(int fd, FFstrbuf* buffer)
 {
-    ssize_t readed = 0;
-
     struct stat fileInfo;
     if(fstat(fd, &fileInfo) != 0)
         return false;
 
-    ffStrbufEnsureFree(buffer, fileInfo.st_size > 0 ? (uint32_t)fileInfo.st_size : 31);
-    uint32_t free = ffStrbufGetFree(buffer);
-
-    while(
-        (readed = read(fd, buffer->chars + buffer->length, free)) > 0
-    ) {
-        buffer->length += (uint32_t) readed;
-        if((uint32_t) readed == free)
-            ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
-        free = ffStrbufGetFree(buffer);
-    }
+    if (fileInfo.st_size > 0)
+        readWithLength(fd, buffer, (uint32_t)fileInfo.st_size);
+    else
+        readUntilEOF(fd, buffer);
 
     buffer->chars[buffer->length] = '\0';
 
-    ffStrbufTrimRight(buffer, '\n');
-    ffStrbufTrimRight(buffer, ' ');
-
     return buffer->length > 0;
 }
 
 ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data)
 {
-    int FF_AUTO_CLOSE_FD fd = open(fileName, O_RDONLY);
+    int FF_AUTO_CLOSE_FD fd = open(fileName, O_RDONLY | O_CLOEXEC);
     if(fd == -1)
         return -1;
 
@@ -81,33 +101,13 @@ ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data)
 
 bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
 {
-    int FF_AUTO_CLOSE_FD fd = open(fileName, O_RDONLY);
+    int FF_AUTO_CLOSE_FD fd = open(fileName, O_RDONLY | O_CLOEXEC);
     if(fd == -1)
         return false;
 
     return ffAppendFDBuffer(fd, buffer);
 }
 
-bool ffPathExists(const char* path, FFPathType type)
-{
-    struct stat fileStat;
-    if(stat(path, &fileStat) != 0)
-        return false;
-
-    int mode = fileStat.st_mode & S_IFMT;
-
-    if(type & FF_PATHTYPE_REGULAR && mode == S_IFREG)
-        return true;
-
-    if(type & FF_PATHTYPE_DIRECTORY && mode == S_IFDIR)
-        return true;
-
-    if(type & FF_PATHTYPE_LINK && mode == S_IFLNK)
-        return true;
-
-    return false;
-}
-
 bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* out)
 {
     bool result = false;
@@ -153,14 +153,14 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
     }
 
     char buffer[512];
-    ssize_t readed = read(STDIN_FILENO, buffer, sizeof(buffer) - 1);
+    ssize_t bytesRead = read(STDIN_FILENO, buffer, sizeof(buffer) - 1);
 
     tcsetattr(STDIN_FILENO, TCSANOW, &oldTerm);
 
-    if(readed <= 0)
+    if(bytesRead <= 0)
         return "read(STDIN_FILENO, buffer, sizeof(buffer) - 1) failed";
 
-    buffer[readed] = '\0';
+    buffer[bytesRead] = '\0';
 
     va_list args;
     va_start(args, format);
@@ -184,7 +184,7 @@ bool ffSuppressIO(bool suppress)
 
         origOut = dup(STDOUT_FILENO);
         origErr = dup(STDERR_FILENO);
-        nullFile = open("/dev/null", O_WRONLY);
+        nullFile = open("/dev/null", O_WRONLY | O_CLOEXEC);
         init = true;
     }
 
@@ -199,7 +199,7 @@ bool ffSuppressIO(bool suppress)
     return true;
 }
 
-void listFilesRecursively(FFstrbuf* folder, uint8_t indentation, const char* folderName)
+void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indentation, const char* folderName, bool pretty)
 {
     DIR* dir = opendir(folder->chars);
     if(dir == NULL)
@@ -207,8 +207,12 @@ void listFilesRecursively(FFstrbuf* folder, uint8_t indentation, const char* fol
 
     uint32_t folderLength = folder->length;
 
-    if(folderName != NULL)
+    if(pretty && folderName != NULL)
+    {
+        for(uint8_t i = 0; i < indentation - 1; i++)
+            fputs("  | ", stdout);
         printf("%s/\n", folderName);
+    }
 
     struct dirent* entry;
 
@@ -221,13 +225,20 @@ void listFilesRecursively(FFstrbuf* folder, uint8_t indentation, const char* fol
 
             ffStrbufAppendS(folder, entry->d_name);
             ffStrbufAppendC(folder, '/');
-            listFilesRecursively(folder, (uint8_t) (indentation + 1), entry->d_name);
+            listFilesRecursively(baseLength, folder, (uint8_t) (indentation + 1), entry->d_name, pretty);
             ffStrbufSubstrBefore(folder, folderLength);
             continue;
         }
 
-        for(uint8_t i = 0; i < indentation; i++)
-            fputs("  | ", stdout);
+        if (pretty)
+        {
+            for(uint8_t i = 0; i < indentation; i++)
+                fputs("  | ", stdout);
+        }
+        else
+        {
+            fputs(folder->chars + baseLength, stdout);
+        }
 
         puts(entry->d_name);
     }
@@ -235,9 +246,9 @@ void listFilesRecursively(FFstrbuf* folder, uint8_t indentation, const char* fol
     closedir(dir);
 }
 
-void ffListFilesRecursively(const char* path)
+void ffListFilesRecursively(const char* path, bool pretty)
 {
     FF_STRBUF_AUTO_DESTROY folder = ffStrbufCreateS(path);
     ffStrbufEnsureEndsWithC(&folder, '/');
-    listFilesRecursively(&folder, 0, NULL);
+    listFilesRecursively(folder.length, &folder, 0, NULL, pretty);
 }

src/common/io/io_windows.c

@@ -6,23 +6,28 @@
 static void createSubfolders(const char* fileName)
 {
     FF_STRBUF_AUTO_DESTROY path = ffStrbufCreate();
-    while(*fileName != '\0')
+    char *token = NULL;
+    while((token = strchr(fileName, '/')) != NULL)
     {
-        ffStrbufAppendC(&path, *fileName);
-        if(*fileName == '/')
-            CreateDirectoryA(path.chars, NULL);
-        ++fileName;
+        ffStrbufAppendNS(&path, (uint32_t)(token - fileName + 1), fileName);
+        CreateDirectoryA(path.chars, NULL);
+        fileName = token + 1;
     }
 }
 
 bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)
 {
     HANDLE FF_AUTO_CLOSE_FD handle = CreateFileA(fileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-    if(handle == INVALID_HANDLE_VALUE)
+    if (handle == INVALID_HANDLE_VALUE)
     {
-        createSubfolders(fileName);
-        handle = CreateFileA(fileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-        if(handle == INVALID_HANDLE_VALUE)
+        if (GetLastError() == ERROR_PATH_NOT_FOUND)
+        {
+            createSubfolders(fileName);
+            handle = CreateFileA(fileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+            if (handle == INVALID_HANDLE_VALUE)
+                return false;
+        }
+        else
             return false;
     }
 
@@ -30,34 +35,50 @@ bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)
     return !!WriteFile(handle, data, (DWORD)dataSize, &written, NULL);
 }
 
+static inline void readWithLength(HANDLE handle, FFstrbuf* buffer, uint32_t length)
+{
+    ffStrbufEnsureFixedLengthFree(buffer, length);
+    DWORD bytesRead = 0;
+    while(
+        length > 0 &&
+        ReadFile(handle, buffer->chars + buffer->length, length, &bytesRead, NULL) != FALSE &&
+        bytesRead > 0
+    ) {
+        buffer->length += (uint32_t) bytesRead;
+        length -= (uint32_t) bytesRead;
+    }
+}
+
+static inline void readUntilEOF(HANDLE handle, FFstrbuf* buffer)
+{
+    ffStrbufEnsureFree(buffer, 31);
+    uint32_t available = ffStrbufGetFree(buffer);
+    DWORD bytesRead = 0;
+    while(
+        ReadFile(handle, buffer->chars + buffer->length, available, &bytesRead, NULL) != FALSE &&
+        bytesRead > 0
+    ) {
+        buffer->length += (uint32_t) bytesRead;
+        if((uint32_t) bytesRead == available)
+            ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
+        available = ffStrbufGetFree(buffer);
+    }
+}
+
 bool ffAppendFDBuffer(HANDLE handle, FFstrbuf* buffer)
 {
-    DWORD readed = 0;
-
     LARGE_INTEGER fileSize;
     if(!GetFileSizeEx(handle, &fileSize))
         fileSize.QuadPart = 0;
 
-    ffStrbufEnsureFree(buffer, fileSize.QuadPart > 0 ? (uint32_t)fileSize.QuadPart : 31);
-    uint32_t free = ffStrbufGetFree(buffer);
-
-    bool success;
-    while(
-        (success = !!ReadFile(handle, buffer->chars + buffer->length, free, &readed, NULL)) &&
-        readed > 0
-    ) {
-        buffer->length += (uint32_t) readed;
-        if((uint32_t) readed == free)
-            ffStrbufEnsureFree(buffer, buffer->allocated - 1); // Doubles capacity every round. -1 for the null byte.
-        free = ffStrbufGetFree(buffer);
-    }
+    if (fileSize.QuadPart > 0)
+        readWithLength(handle, buffer, (uint32_t)fileSize.QuadPart);
+    else
+        readUntilEOF(handle, buffer);
 
     buffer->chars[buffer->length] = '\0';
 
-    ffStrbufTrimRight(buffer, '\n');
-    ffStrbufTrimRight(buffer, ' ');
-
-    return success;
+    return buffer->length > 0;
 }
 
 ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data)
@@ -78,24 +99,6 @@ bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
     return ffAppendFDBuffer(handle, buffer);
 }
 
-bool ffPathExists(const char* path, FFPathType type)
-{
-    DWORD attr = GetFileAttributesA(path);
-    if(attr == INVALID_FILE_ATTRIBUTES)
-        return false;
-
-    if(type & FF_PATHTYPE_REGULAR && !(attr & FILE_ATTRIBUTE_DIRECTORY))
-        return true;
-
-    if(type & FF_PATHTYPE_DIRECTORY && (attr & FILE_ATTRIBUTE_DIRECTORY))
-        return true;
-
-    if(type & FF_PATHTYPE_LINK && (attr & FILE_ATTRIBUTE_REPARSE_POINT))
-        return true;
-
-    return false;
-}
-
 bool ffPathExpandEnv(const char* in, FFstrbuf* out)
 {
     DWORD length = ExpandEnvironmentStringsA(in, NULL, 0);
@@ -114,16 +117,21 @@ bool ffSuppressIO(bool suppress)
     return false;
 }
 
-void listFilesRecursively(FFstrbuf* folder, uint8_t indentation, const char* folderName)
+void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indentation, const char* folderName, bool pretty)
 {
     uint32_t folderLength = folder->length;
 
-    if(folderName != NULL)
+    if(pretty && folderName != NULL)
+    {
+        for(uint8_t i = 0; i < indentation - 1; i++)
+            fputs("  | ", stdout);
         printf("%s/\n", folderName);
+    }
 
     ffStrbufAppendC(folder, '*');
     WIN32_FIND_DATAA entry;
     HANDLE hFind = FindFirstFileA(folder->chars, &entry);
+    ffStrbufTrimRight(folder, '*');
     if(hFind == INVALID_HANDLE_VALUE)
         return;
 
@@ -137,24 +145,31 @@ void listFilesRecursively(FFstrbuf* folder, uint8_t indentation, const char* fol
             ffStrbufSubstrBefore(folder, folderLength);
             ffStrbufAppendS(folder, entry.cFileName);
             ffStrbufAppendC(folder, '/');
-            listFilesRecursively(folder, (uint8_t) (indentation + 1), entry.cFileName);
+            listFilesRecursively(baseLength, folder, (uint8_t) (indentation + 1), entry.cFileName, pretty);
             ffStrbufSubstrBefore(folder, folderLength);
             continue;
         }
 
-        for(uint8_t i = 0; i < indentation; i++)
-            fputs("  | ", stdout);
+        if (pretty)
+        {
+            for(uint8_t i = 0; i < indentation; i++)
+                fputs("  | ", stdout);
+        }
+        else
+        {
+            fputs(folder->chars + baseLength, stdout);
+        }
 
         puts(entry.cFileName);
     } while (FindNextFileA(hFind, &entry));
     FindClose(hFind);
 }
 
-void ffListFilesRecursively(const char* path)
+void ffListFilesRecursively(const char* path, bool pretty)
 {
     FF_STRBUF_AUTO_DESTROY folder = ffStrbufCreateS(path);
     ffStrbufEnsureEndsWithC(&folder, '/');
-    listFilesRecursively(&folder, 0, NULL);
+    listFilesRecursively(folder.length, &folder, 0, NULL, pretty);
 }
 
 const char* ffGetTerminalResponse(const char* request, const char* format, ...)

src/common/library.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_library
-#define FF_INCLUDED_common_library
-
 #include "fastfetch.h"
 #include "util/FFcheckmacros.h"
 
@@ -74,5 +71,3 @@ static inline void ffLibraryUnload(void** handle)
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);
 
 void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);
-
-#endif

src/common/modules.c

@@ -96,6 +96,7 @@ static FFModuleBaseInfo* O[] = {
 
 static FFModuleBaseInfo* P[] = {
     (void*) &instance.config.modules.packages,
+    (void*) &instance.config.modules.physicalDisk,
     (void*) &instance.config.modules.player,
     (void*) &instance.config.modules.powerAdapter,
     (void*) &instance.config.modules.processes,

src/common/networking.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_networking
-#define FF_INCLUDED_common_networking
-
 #include "common/thread.h"
 #include "util/FFstrbuf.h"
 
@@ -35,5 +32,3 @@ static inline bool ffNetworkingGetHttp(const char* host, const char* path, uint3
         return ffNetworkingRecvHttpResponse(&state, buffer, timeout);
     return false;
 }
-
-#endif

src/common/networking_windows.c

@@ -7,22 +7,18 @@
 
 static LPFN_CONNECTEX ConnectEx;
 
-static BOOL WINAPI initWsaData(PINIT_ONCE once, PVOID param, PVOID* context)
+static const char* initWsaData(WSADATA* wsaData)
 {
-    (void)once;
-    (void)param;
-    static WSADATA wsaData;
-    *context = &wsaData;
-    if(WSAStartup(MAKEWORD(2, 2), &wsaData) != 0)
-        return FALSE;
+    if(WSAStartup(MAKEWORD(2, 2), wsaData) != 0)
+        return "WSAStartup() failed";
 
-    if(LOBYTE(wsaData.wVersion) != 2 || HIBYTE(wsaData.wVersion) != 2)
-        return FALSE;
+    if(LOBYTE(wsaData->wVersion) != 2 || HIBYTE(wsaData->wVersion) != 2)
+        return "Invalid wsaData version found";
 
     //Dummy socket needed for WSAIoctl
     SOCKET sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if(sockfd == INVALID_SOCKET)
-        return FALSE;
+        return "socket(AF_INET, SOCK_STREAM) failed";
 
     DWORD dwBytes;
     GUID guid = WSAID_CONNECTEX;
@@ -30,28 +26,35 @@ static BOOL WINAPI initWsaData(PINIT_ONCE once, PVOID param, PVOID* context)
                     &guid, sizeof(guid),
                     &ConnectEx, sizeof(ConnectEx),
                     &dwBytes, NULL, NULL) != 0)
-        return FALSE;
+        return "WSAIoctl(sockfd, SIO_GET_EXTENSION_FUNCTION_POINTER) failed";
 
-    return closesocket(sockfd) == 0;
+    closesocket(sockfd);
+
+    return NULL;
 }
 
 bool ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers)
 {
-    static INIT_ONCE once = INIT_ONCE_STATIC_INIT;
-    WSADATA* pData;
-    if(!InitOnceExecuteOnce(&once, initWsaData, NULL, (LPVOID*) &pData))
+    static WSADATA wsaData;
+    if (wsaData.wVersion == 0)
+    {
+        if (initWsaData(&wsaData) != NULL)
+        {
+            wsaData.wVersion = (WORD) -1;
+            return false;
+        }
+    }
+    else if (wsaData.wVersion == (WORD) -1)
         return false;
 
     memset(state, 0, sizeof(*state));
 
-    struct addrinfo hints = {
-        .ai_family = AF_INET,
-        .ai_socktype = SOCK_STREAM,
-    };
-
     struct addrinfo* addr;
 
-    if(getaddrinfo(host, "80", &hints, &addr) != 0)
+    if(getaddrinfo(host, "80", &(struct addrinfo) {
+        .ai_family = AF_INET,
+        .ai_socktype = SOCK_STREAM,
+    }, &addr) != 0)
         return false;
 
     state->sockfd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);

src/common/option.h

@@ -10,6 +10,7 @@ struct yyjson_mut_val;
 typedef struct FFModuleBaseInfo
 {
     const char* name;
+    const char* description;
     // A dirty polymorphic implementation in C.
     // This is UB, because `void*` is not compatible with `FF*Options*`.
     // However we can't do it better unless we move to C++, so that `option` becomes a `this` pointer
@@ -25,6 +26,7 @@ typedef struct FFModuleBaseInfo
 static inline void ffOptionInitModuleBaseInfo(
     FFModuleBaseInfo* baseInfo,
     const char* name,
+    const char* description,
     void* parseCommandOptions, // bool (*const parseCommandOptions)(void* options, const char* key, const char* value)
     void* parseJsonObject, // void (*const parseJsonObject)(void* options, yyjson_val *module)
     void* printModule, // void (*const printModule)(void* options)
@@ -34,6 +36,7 @@ static inline void ffOptionInitModuleBaseInfo(
 )
 {
     baseInfo->name = name;
+    baseInfo->description = description;
     baseInfo->parseCommandOptions = (__typeof__(baseInfo->parseCommandOptions)) parseCommandOptions;
     baseInfo->parseJsonObject = (__typeof__(baseInfo->parseJsonObject)) parseJsonObject;
     baseInfo->printModule = (__typeof__(baseInfo->printModule)) printModule;

src/common/parsing.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_parsing_h
-#define FF_INCLUDED_parsing_h
-
 #include "fastfetch.h"
 
 #include <stdint.h>
@@ -24,5 +21,3 @@ int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2);
 
 void ffParseSize(uint64_t bytes, FFstrbuf* result);
 void ffParseTemperature(double celsius, FFstrbuf* buffer);
-
-#endif

src/common/printing.c

@@ -6,7 +6,7 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
 {
     ffLogoPrintLine();
 
-    //This is used by --set-keyless, in this case we wan't neither the module name nor the separator
+    //This is used by --set-keyless, in this case we want neither the module name nor the separator
     if(moduleName == NULL)
         return;
 

src/common/printing.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_printing
-#define FF_INCLUDED_common_printing
-
 #include "fastfetch.h"
 #include "common/format.h"
 
@@ -26,5 +23,3 @@ void ffPrintColor(const FFstrbuf* colorValue);
 void ffPrintCharTimes(char c, uint32_t times);
 
 void ffPrintModuleFormatHelp(const char* name, const char* def, uint32_t numArgs, const char* args[]);
-
-#endif

src/common/processing.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_processing
-#define FF_INCLUDED_common_processing
-
 #include "util/FFstrbuf.h"
 
 const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr);
@@ -28,5 +25,3 @@ static inline const char* ffProcessAppendStdErr(FFstrbuf* buffer, char* const ar
     }
     return error;
 }
-
-#endif

src/common/processing_linux.c

@@ -11,49 +11,62 @@
 #include <errno.h>
 #include <sys/wait.h>
 
-enum { FF_PIPE_BUFSIZ = 4096 };
+enum { FF_PIPE_BUFSIZ = 8192 };
 
-static inline void waitpid_wrapper(pid_t* pid)
+static inline void waitpid_wrapper(const pid_t* pid)
 {
     // remove zombie processes
     if (*pid > 0)
         waitpid(*pid, NULL, 0);
 }
 
+static inline int ffPipe2(int *fds, int flags)
+{
+    #ifdef __APPLE__
+        if(pipe(fds) == -1)
+            return -1;
+        fcntl(fds[0], F_SETFL, fcntl(fds[0], F_GETFL) | flags);
+        fcntl(fds[1], F_SETFL, fcntl(fds[1], F_GETFL) | flags);
+        return 0;
+    #else
+        return pipe2(fds, flags);
+    #endif
+}
+
 const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr)
 {
     int pipes[2];
+    const int timeout = instance.config.general.processingTimeout;
 
-    if(pipe(pipes) == -1)
+    if(ffPipe2(pipes, O_CLOEXEC) == -1)
         return "pipe() failed";
 
     __attribute__((__cleanup__(waitpid_wrapper))) pid_t childPid = fork();
     if(childPid == -1)
+    {
+        close(pipes[0]);
+        close(pipes[1]);
         return "fork() failed";
+    }
 
     //Child
     if(childPid == 0)
     {
-        int nullFile = open("/dev/null", O_WRONLY);
+        int nullFile = open("/dev/null", O_WRONLY | O_CLOEXEC);
         dup2(pipes[1], useStdErr ? STDERR_FILENO : STDOUT_FILENO);
         dup2(nullFile, useStdErr ? STDOUT_FILENO : STDERR_FILENO);
-        close(pipes[0]);
-        close(pipes[1]);
         setenv("LANG", "C", 1);
         execvp(argv[0], argv);
-        exit(901);
+        _exit(127);
     }
 
     //Parent
     close(pipes[1]);
 
     int FF_AUTO_CLOSE_FD childPipeFd = pipes[0];
+    char str[FF_PIPE_BUFSIZ];
 
-    int timeout = instance.config.general.processingTimeout;
-    if (timeout >= 0)
-        fcntl(childPipeFd, F_SETFL, fcntl(childPipeFd, F_GETFL) | O_NONBLOCK);
-
-    do
+    while(1)
     {
         if (timeout >= 0)
         {
@@ -70,18 +83,14 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
             }
         }
 
-        char str[FF_PIPE_BUFSIZ];
-        while (true)
-        {
-            ssize_t nRead = read(childPipeFd, str, FF_PIPE_BUFSIZ);
-            if (nRead > 0)
-                ffStrbufAppendNS(buffer, (uint32_t) nRead, str);
-            else if (nRead == 0)
-                return NULL;
-            else if (nRead < 0)
-                break;
-        }
-    } while (errno == EAGAIN);
+        ssize_t nRead = read(childPipeFd, str, FF_PIPE_BUFSIZ);
+        if (nRead > 0)
+            ffStrbufAppendNS(buffer, (uint32_t) nRead, str);
+        else if (nRead == 0)
+            return NULL;
+        else if (nRead < 0)
+            break;
+    };
 
-    return NULL;
+    return "read(childPipeFd, str, FF_PIPE_BUFSIZ) failed";
 }

src/common/processing_windows.c

@@ -4,7 +4,7 @@
 
 #include <Windows.h>
 
-enum { FF_PIPE_BUFSIZ = 4096 };
+enum { FF_PIPE_BUFSIZ = 8192 };
 
 const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr)
 {

src/common/properties.c

@@ -91,7 +91,7 @@ bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer)
 
 // The following functions return true if the file was found, independently if start was found
 // Buffers which already contain content are not overwritten
-// The last occurence of start in the first file will be the one used
+// The last occurrence of start in the first file will be the one used
 
 bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquery* queries)
 {

src/common/properties.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_properties
-#define FF_INCLUDED_common_properties
-
 #include "fastfetch.h"
 
 typedef struct FFpropquery
@@ -51,5 +48,3 @@ static inline bool ffParsePropFileData(const char* relativeFile, const char* sta
 {
     return ffParsePropFileDataValues(relativeFile, 1, (FFpropquery[]){{start, buffer}});
 }
-
-#endif

src/common/settings.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_settings
-#define FF_INCLUDED_common_settings
-
 #include "fastfetch.h"
 
 typedef enum FFvarianttype
@@ -38,5 +35,3 @@ bool ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result);
 #elif defined(__FreeBSD__)
 bool ffSettingsGetFreeBSDKenv(const char* propName, FFstrbuf* result);
 #endif
-
-#endif

src/common/sysctl.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_sysctl
-#define FF_INCLUDED_common_sysctl
-
 #include "fastfetch.h"
 #include "util/FFcheckmacros.h"
 
@@ -13,5 +10,3 @@ const char* ffSysctlGetString(const char* propName, FFstrbuf* result);
 FF_C_NODISCARD int ffSysctlGetInt(const char* propName, int defaultValue);
 FF_C_NODISCARD int64_t ffSysctlGetInt64(const char* propName, int64_t defaultValue);
 FF_C_NODISCARD void* ffSysctlGetData(int* request, u_int requestLength, size_t* resultLength);
-
-#endif

src/common/thread.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_thread
-#define FF_INCLUDED_common_thread
-
 #include "fastfetch.h"
 
 #ifdef FF_HAVE_THREADS
@@ -82,5 +79,3 @@
     static inline void ffThreadMutexUnlock(FFThreadMutex* mutex) { FF_UNUSED(mutex) }
     #define FF_THREAD_ENTRY_DECL_WRAPPER(fn, paramType)
 #endif //FF_HAVE_THREADS
-
-#endif

src/common/time.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_common_time
-#define FF_INCLUDED_common_time
-
 #include <stdint.h>
 #ifdef _WIN32
     #include <synchapi.h>
@@ -48,5 +45,3 @@ static inline void ffTimeSleep(uint32_t msec)
         nanosleep(&(struct timespec){ msec / 1000, (msec % 1000) * 1000000 }, NULL);
     #endif
 }
-
-#endif

src/data/config_system.txt

@@ -1,16 +0,0 @@
-# Fastfetch system configuration
-# This file sets the default config for all users of the system.
-
-# For more information about how configuration files work,
-# see ~/.config/fastfetch/config.conf.
-# All options that can be put there (or passed as argument) can be put here too.
-
-# Use fastfetch --print-config-system > /etc/fastfetch/config.conf
-# to overwrite this file with the current default file.
-
-# User config option
-# Sets if fastfetch should load user provided configuration.
-# If this is off, fastfetch ignores the user config file and any passed arguments
-# Must be true or false
-# Default is true.
-#--load-user-config true

src/data/config_user.jsonc

@@ -1,41 +0,0 @@
-// ~/.config/fastfetch/config.jsonc
-// See https://github.com/fastfetch-cli/fastfetch/wiki/Configuration for more details
-// See *.jsonc in https://github.com/fastfetch-cli/fastfetch/tree/dev/presets/examples for more examples
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
-        "padding": {
-            "top": 2
-        }
-    },
-    "modules": [
-        "title",
-        "separator",
-        "os",
-        "host",
-        "kernel",
-        "uptime",
-        "packages",
-        "shell",
-        "display",
-        "de",
-        "wm",
-        "wmtheme",
-        "theme",
-        "icons",
-        "font",
-        "cursor",
-        "terminal",
-        "terminalfont",
-        "cpu",
-        "gpu",
-        "memory",
-        "disk",
-        "localip",
-        "battery",
-        "poweradapter",
-        "locale",
-        "break",
-        "colors"
-    ]
-}

src/data/config_user.txt

@@ -1,519 +0,0 @@
-# Fastfetch configuration
-# Write every argument in different lines.
-# Direct arguments will overwrite the corresponding ones in this file.
-# Argument keys are not case sensitive.
-# Whitespaces are trimmed at the beginning and the end.
-# Empty lines or lines starting with # are ignored.
-
-# This file was shipped with $" FASTFETCH_PROJECT_VERSION $".
-# Use fastfetch --gen-config-force to overwrite this file with the current defaults
-
-# Below some often usefull options are listed. Uncomment and modify them so they take affect.
-# Note that there are a lot more options than the ones listed here, take a look at "fastfetch --help".
-# Of course all of them can be made persistent here too.
-
-# Config option:
-# Load additional config files.
-# Some are shipped with fastfetch, list them with "fastfetch --list-presets".
-# Must be a path to a config file or the name of a shipped preset.
-# The config file is completely loaded before continuing in the current file, so the placement of this option matters, as later options overwrite already set ones.
-# Can be used multiple times to load multiple config files / presets.
-#--load-config /path/to/config.txt
-
-# Structure option:
-# Sets the modules to use and their order.
-# Must be a list of module names, separated by colons.
-# List available modules with "fastfetch --list-modules".
-# Get the default structure with "fastfetch --print-structure".
-#--structure $" FASTFETCH_DATATEXT_STRUCTURE $"
-
-# Multithreading option:
-# Sets if fastfetch should use multiple threads to detect the values.
-# Must be true or false.
-# Default is true.
-#--multithreading true
-
-# Print stat option:
-# Sets if fastfetch should print time usage (in ms) for individual modules
-# If true, it will also enable --show-errors
-# Must be true or false.
-# Default is false.
-#--stat true
-
-# Slow operations option:
-# Sets if fastfetch is allowed to use known slow operations to detect more / better values.
-# Must be true or false.
-# Default is false.
-#--allow-slow-operations false
-
-# Linewrap option:
-# Sets if fastfetch should disable linewrap during the run.
-# Must be true or false.
-# Default is true.
-#--disable-linewrap true
-
-# Cursor option:
-# Sets if fastfetch should hide the console cursor during the run.
-# Must be true or false.
-# Default is true.
-#--hide-cursor true
-
-# Processing timeout option:
-# Sets the timeout (ms) when waiting for child processes
-# Must be an integer.
-# Default is 1000
-#--processing-timeout 1000
-
-# WMI timeout option:
-# Sets the timeout (ms) for WMI queries. Windows only
-# Must be an integer.
-# Default is 5000
-#--wmi-timeout 5000
-
-# Logo option:
-# Sets the logo to use.
-# List available logos with "fastfetch --list-logos".
-# Print available logos with "fastfetch --print-logos".
-# Must be the name of an available logo or a path to a text file containing a custom logo.
-# Default is the current distribution.
-#--logo arch
-
-# Logo type option:
-# Sets the logo type to use.
-# Must be auto, builtin, file, file-raw, data, data-raw, sixel, kitty or chafa.
-# Default is auto.
-#--logo-type auto
-
-# Logo width option:
-# Sets the width of the logo (in characters) if the logo is an image.
-# Must be a positive integer.
-# Default is 65.
-#--logo-width 65
-
-# Logo height option:
-# Sets the height of the logo (in characters) if the logo is an image.
-# Must be a positive integer.
-# Default is 0 (keeps aspect ration).
-#--logo-height 0
-
-# Logo color options:
-# Overwrite a color in the logo. Also works for user provided logos.
-# In the user logo, they replace $[1-9]. Use $$ to print a single $ sign.
-# Must be linux console color codes or the name of a color.
-# Default is the one specified by the logo.
-# Use "fastfetch --help color" to learn more and see examples.
-# Valid index range is [1-9].
-#--logo-color-1 red
-#--logo-color-2 32
-# [...]
-#--logo-color-9 yellow
-
-# Logo padding option:
-# Adds a padding to the left and the right side of the logo.
-# Must be a positive integer.
-# Default is 0.
-#--logo-padding 0
-
-# Logo padding left option:
-# Adds a padding to the left side of the logo.
-# Must be a positive integer.
-# Default is 0.
-#--logo-padding-left 0
-
-# Logo padding right option:
-# Adds a padding to the right side of the logo.
-# Must be a positive integer.
-# Default is 0.
-#--logo-padding-right 0
-
-# Logo padding top option:
-# Adds a padding to the top side of the logo.
-# Must be a positive integer.
-# Default is 0.
-#--logo-padding-top 0
-
-# Logo print remaining option:
-# Sets if the remaining logo should be printed, it is has more lines than modules to show.
-# Must be true or false.
-# Default is true.
-#--logo-print-remaining true
-
-# Color keys option:
-# Sets the color of the keys.
-# Must be linux console color codes or the name of a color.
-# Default is the key color of the logo.
-# Use "fastfetch --help color" to learn more and see examples.
-#--color-keys magenta
-
-# Color title option:
-# Sets the color of the title.
-# Must be linux console color codes or the name of a color.
-# Default is the title color of the logo.
-# Use "fastfetch --help color" to learn more and see examples.
-#--color-title magenta
-
-# Binary prefix option:
-# Sets the binary prefix to use.
-# Must be a IEC, SI or JEDEC.
-# Default is IEC.
-#--binary-prefix IEC
-
-# Size number of digits option:
-# Sets the number of digits to keep after the decimal point when formatting sizes.
-# Must be an possitive integer.
-# Default is 2.
-#--size-ndigits 2
-
-# Size max prefix option:
-# Sets the largest binary prefix to use when formatting sizes.
-# Must be one of B, kB, MB, GB, TB, PB, EB, ZB, YB
-# Default is YB.
-#--size-max-prefix YB
-
-# Disable output buffer option:
-# Sets if the stdout application buffer should be disabled.
-# Must be true or false.
-# Default is false.
-#--no-buffer false
-
-# Title FQDN option:
-# Sets if the title should use the fully qualified domain name.
-# Must be true or false.
-# Default is false.
-#--title-fqdn false
-
-# Title user color option:
-# Sets color of the user name (left part).
-# Default is empty (use color of `--color-title`).
-#--title-color-user
-
-# Title at color option:
-# Sets color of the @ symbol (middle part).
-# Default is empty (use color of `--color-title`).
-#--title-color-at
-
-# Title host color option:
-# Sets color of the host name (right part).
-# Default is empty (use color of `--color-title`).
-#--title-color-host
-
-# Separator option:
-# Sets the string placed between a key and its value.
-# Can be any string.
-# Default is ": ".
-#--separator ": "
-
-# Separator string option:
-# Sets the string printed by the "separator" module (usually between title and rest of output)
-# Must be any string. It is repated / cut to fit perfectly.
-# Default is "-"
-#--separator-string -
-
-# Public IP URL option:
-# Sets the URL of public IP detection server to be used.
-# Only HTTP protocol is supported, and the value should not contain "http://" prefix.
-# Default is "ipinfo.io/ip".
-#--publicip-url "ipinfo.io/ip"
-
-# Public IP timeout option:
-# Sets the time to wait for the public ip server to respond.
-# Must be a positive integer.
-# Default is 0 (disabled).
-#--publicip-timeout 0
-
-# Weather location option:
-# Sets the location to be used. It must be URI encoded (eg a whitespace must be encoded as `+`).
-# Default is empty (guessing by public IP)
-#--weather-location "Location"
-
-# Weather output format option:
-# Sets the weather format to be used. It must be URI encoded.
-# See: https://github.com/chubin/wttr.in#one-line-output
-# Default is "%t+-+%C+(%l)".
-#--weather-output-format "%t+-+%C+(%l)"
-
-# Weather timeout option:
-# Sets the time to wait for the weather server (wttr.in) to respond.
-# Must be a positive integer.
-# Default is 0 (disabled).
-#--weather-timeout 0
-
-# OS file option
-# Sets the path to the file containing the operating system information.
-# Should be a valid path to an existing file.
-# Default is /etc/os-release.
-#--os-file /etc/os-release
-
-# Player name option
-# Sets the name of the player. This is also used in song detection
-# Must be the exact name of the player or a dbus address (e.g. org.mpris.MediaPlayer2.spotify)
-# Default is the first match starting with org.mpris.MediaPlayer2.
-#--player-name spotify
-
-# Display server force DRM option
-# Sets if fastfetch should only use `/sys/class/drm` to detect displays if you get issues with the default behavior.
-# Note DRM doesn't support refresh rate or scaled resolution detection.
-# Only supported on Linux.
-# Must be true or false.
-# Default is false.
-#--ds-force-drm false
-
-# Escape bedrock option
-# Sets if fastfetch should escape the bedrock jail, if it detectes that it is running in one
-# Must be true or false.
-# Default is true.
-#--escape-bedrock true
-
-# OpenGL option
-# Sets with opengl context creation library to use
-# Must be either auto, egl, glx or osmesa
-# Default is auto.
-#--opengl-library auto
-
-# GPU hide options
-# Sets whether to hide certain gpu types
-# Must be either true or false
-# Default is false.
-#--gpu-hide-integrated
-#--gpu-hide-discrete
-
-# GPU detection options
-# Forces using vulkan to detect GPUs
-# which support video memory usage detection with `--allow-slow-operations`
-# Must be either true or false
-# Default is false.
-#--gpu-force-vulkan
-
-# Disk show options
-# Sets if certain types of disk should be printed
-# Must be either true or false
-# Default is false except for --disk-show-external.
-#--disk-show-external true
-#--disk-show-hidden false
-#--disk-show-subvolumes false
-#--disk-show-unknown false
-
-# Disk option
-# A colon (semicolon on Windows) separated list of folder paths for the disk output
-# This option override `--disk-show-*` options above
-# Must be a string
-# Default is "/:/home" ("C:\\;D:\\ ..." on Windows).
-#--disk-folders /:/home
-
-# Bluetooth show disconnected option
-# Sets if disconnected bluetooth devices should be printed
-# Must be either true or false
-# Default is false.
-#--bluetooth-show-disconnected false
-
-# Display compact output option
-# Sets if all displays should be printed in one line
-# Must be either original (print pixel resolution) or scaled (print scaled resolution)
-# Default is none.
-#--display-compact-type none
-
-# Display detect name option
-# Sets if display name should be detected and printed (if supported)
-# Must be either true of false
-# Default is false.
-#--display-detect-name none
-
-# Display precise refresh rate option
-# Sets if decimal refresh rates should not be rounded into integers when printing
-# Must be either true (keep decimals) of false (round into integers)
-# Default is false.
-#--display-precise-refresh-rate false
-
-# Sound show all option
-# Sets if all sound devices should be printed
-# Must be either main, active or all. Default is main
-# Default is main.
-#--sound-type main
-
-# Percentage output type option
-# Applies to all modules that prints percentage values. Currently memory, swap, disk, battery and CPU usage are supported.
-# Only works with default format ( without --module-format option ).
-# 0: prints none; 1: prints percent number only; 2: prints bar only; 3: prints both percent number and bar; 6: prints bar and hide other texts; 9: prints colored number
-#--percent-type 1
-
-# Key options:
-# Sets the displayed key of a module
-# Can be any string. Some of theme take an argument like a format string. See "fastfetch --help format" for help.
-#--os-key OS
-#--host-key Host
-#--chassis-key Chassis
-#--kernel-key Kernel
-#--uptime-key Uptime
-#--processes-key Processes
-#--packages-key Packages
-#--shell-key Shell
-#--display-key Display {1}
-#--brightness-key Brightness ({1})
-#--monitor-key Monitor
-#--de-key DE
-#--wm-key WM
-#--wmtheme-key WM Theme
-#--theme-key Theme
-#--icons-key Icons
-#--font-key Font
-#--cursor-key Cursor
-#--terminal-key Terminal
-#--terminalfont-key Terminal Font
-#--cpu-key CPU
-#--cpuusage-key CPU Usage
-#--gpu-key GPU {1}
-#--memory-key Memory
-#--swap-key Swap
-#--disk-key Disk ({1})
-#--battery-key Battery {1}
-#--poweradapter-key Power Adapter {1}
-#--lm-key LM
-#--locale-key Locale
-#--localip-key Local IP ({1})
-#--netio-key Network IO ({1})
-#--publicip-key Public IP
-#--wifi-key Wifi
-#--weather-key Weather
-#--player-key Media Player
-#--media-key Media
-#--datetime-key Date Time
-#--version-key Version
-#--vulkan-key Vulkan
-#--opengl-key OpenGL
-#--opencl-key OpenCL
-#--users-key Users
-#--bluetooth-key Bluetooth
-#--sound-key Sound
-#--gamepad-key Gamepad
-#--wallpaper-key Wallpaper
-
-# Format options:
-# Sets the format string for module values.
-# For information on format strings, see "fastfetch --help format".
-# To see the parameter they take and their default value, see "fastfetch --help *-format", e.g. "fastfetch --help os-format".
-# An empty format string (As they are currently below) will behave as if it was not set.
-#--title-format
-#--os-format
-#--host-format
-#--chassis-format
-#--kernel-format
-#--uptime-format
-#--processes-format
-#--packages-format
-#--shell-format
-#--display-format
-#--brightness-format
-#--de-format
-#--wm-format
-#--wmtheme-format
-#--theme-format
-#--icons-format
-#--font-format
-#--cursor-format
-#--terminal-format
-#--terminalfont-format
-#--cpu-format
-#--cpuusage-format
-#--gpu-format
-#--memory-format
-#--swap-format
-#--disk-format
-#--battery-format
-#--poweradapter-format
-#--lm-format
-#--locale-format
-#--localip-format
-#--netio-format
-#--publicip-format
-#--weather-format
-#--monitor-format
-#--player-format
-#--media-format
-#--datetime-format
-#--version-format
-#--vulkan-format
-#--opengl-format
-#--opencl-format
-#--users-format
-#--bluetooth-format
-#--sound-format
-#--gamepad-format
-#--wallpaper-format
-
-# Key color options:
-# Overrides the global `--color-keys` for one specified module
-#--title-key-color
-#--os-key-color
-#--host-key-color
-#--chassis-key-color
-#--kernel-key-color
-#--uptime-key-color
-#--processes-key-color
-#--packages-key-color
-#--shell-key-color
-#--display-key-color
-#--brightness-key-color
-#--de-key-color
-#--wm-key-color
-#--wmtheme-key-color
-#--theme-key-color
-#--icons-key-color
-#--font-key-color
-#--cursor-key-color
-#--terminal-key-color
-#--terminalfont-key-color
-#--cpu-key-color
-#--cpuusage-key-color
-#--gpu-key-color
-#--memory-key-color
-#--swap-key-color
-#--disk-key-color
-#--battery-key-color
-#--poweradapter-key-color
-#--lm-key-color
-#--locale-key-color
-#--localip-key-color
-#--netio-key-color
-#--publicip-key-color
-#--weather-key-color
-#--monitor-key-color
-#--player-key-color
-#--media-key-color
-#--datetime-key-color
-#--version-key-color
-#--vulkan-key-color
-#--opengl-key-color
-#--opencl-key-color
-#--users-key-color
-#--bluetooth-key-color
-#--sound-key-color
-#--gamepad-key-color
-#--wallpaper-key-color
-
-# Library options:
-# Sets an user specific path to a library to load.
-# Must be a valid path to a library.
-#--lib-PCI /usr/lib/libpci.so
-#--lib-vulkan /usr/lib/libvulkan.so (libMoltenVK.dylib on macOS)
-#--lib-wayland /usr/lib/libwayland-client.so
-#--lib-xcb-randr /usr/lib/libxcb-randr.so
-#--lib-xcb /usr/lib/libxcb.so
-#--lib-Xrandr /usr/lib/libXrandr.so
-#--lib-X11 /usr/lib/libX11.so
-#--lib-gio /usr/lib/libgio-2.0.so
-#--lib-DConf /usr/lib/libdconf.so
-#--lib-DBus /usr/lib/libdbus-1.so
-#--lib-XFConf /usr/lib/libxfconf-0.so
-#--lib-sqlite3 /usr/lib/libsqlite3.so
-#--lib-rpm /usr/lib/librpm.so
-#--lib-imagemagick /usr/lib/libMagickCore-7.Q16HDRI.so
-#--lib-z /usr/lib/libz.so
-#--lib-chafa /usr/lib/libchafa.so
-#--lib-egl /usr/lib/libEGL.so
-#--lib-glx /usr/lib/libGLX.so
-#--lib-osmesa /usr/lib/libOSMesa.so
-#--lib-opencl /usr/lib/libOpenCL.so
-#--lib-freetype /data/data/com.termux/files/usr/lib
-#--lib-pulse /usr/lib/libpulse.so
-#--lib-ddcutil /usr/lib/libddcutil.so
-#--lib-nm /usr/lib/libnm.so

src/data/help.txt

@@ -1,186 +1,4 @@
-Fastfetch is a neofetch-like tool for fetching system information and displaying them in a pretty way
-
-Usage: fastfetch <?options>
-
-Informative options:
-    -h, --help:                 Show this message
-    -h, --help <command>:       Show help for a specific command
-    -v, --version:              Show the version of fastfetch
-    --list-config-paths:        List search paths of config files
-    --list-data-paths:          List search paths of presets and logos
-    --list-logos:               List available logos
-    --list-modules:             List available modules
-    --list-presets:             List presets fastfetch knows about; they can be loaded with --load-config (+)
-    --list-features:            List the supported features fastfetch was compiled with (mainly for development)
-    --print-logos:              Print available logos
-    --print-config-system:      Print the default system config
-    --print-config-user:        Print the default user config
-    --print-structure:          Print the default structure
-
-Config options:
-    -c, --load-config <file>:   Load a config file or preset (+)
-    --gen-config <type>:        Generate a sample config file in the default path. Param `type` can be `jsonc` or deprecated `conf`
-    --gen-config-force <type>:  Generate a sample config file in the default path. Overwrite the existing one
-    --migrate-config <?path>:   Migrate old flag based config file to new JSONC format. Optional param `path` is the file path that new file should be write to
-
-General options:
-    --thread <?value>:                Use separate threads to send HTTP requests
-    --escape-bedrock <?value>:        On Bedrock Linux, whether to escape the bedrock jail
-    --wmi-timeout <num>:              Set the timeout (ms) for WMI queries. Windows only. Default is 5000
-    --processing-timeout <num>:       Set the timeout (ms) when waiting for child processes. Default is 1000
-    --ds-force-drm <?value>:          Set if only DRM should be used to detect displays. Default is false. Linux only
-
-Logo options:
-    -l, --logo <logo>:                     Set the logo; if default, the name of a builtin logo or a path to a file
-    --logo-type <type>:                    Set the type of the logo given; must be auto, builtin, file, file-raw, data, data-raw, sixel, kitty, iterm or chafa
-    --logo-width <width>:                  Set the width of the logo (in characters), if it is an image. Required for iTerm image protocol
-    --logo-height <height>:                Set the height of the logo (in characters), if it is an image. Required for iTerm image protocol
-    --logo-preserve-aspect-ratio <?value>: Set if the logo should fill the specified width and height as much as possible without stretching. Supported by iTerm image protocol
-    --logo-color-[1-9] <color>:            Overwrite a color in the logo
-    --logo-padding <padding>:              Set the padding on the left and the right of the logo
-    --logo-padding-left <padding>:         Set the padding on the left of the logo
-    --logo-padding-right <padding>:        Set the padding on the right of the logo
-    --logo-padding-top <padding>:          Set the padding on the top of the logo
-    --logo-print-remaining <?value>:       Whether to print the remaining logo, if it has more lines than modules to display
-    --logo-separate <?value>:              If true, print modules at bottom of the logo
-    --logo-recache <?value>:               If true, regenerate image logo cache
-    --file <file>:                         Short for --logo-type file --logo <file>
-    --file-raw <file>:                     Short for --logo-type file-raw --logo <file>
-    --data <data>:                         Short for --logo-type data --logo <data>
-    --data-raw <data>:                     Short for --logo-type data-raw --logo <data>
-    --sixel <file>:                        Short for --logo-type sixel --logo <file>
-    --kitty <file>:                        Short for --logo-type kitty --logo <file>
-    --iterm <file>:                        Short for --logo-type iterm --logo <file>
-    --chafa <file>:                        Short for --logo-type chafa --logo <file>
-    --chafa-fg-only <?value>:              Produce character-cell output using foreground colors only. See chafa document for detail
-    --chafa-symbols <str>:                 Specify character symbols to employ in final output. See chafa document for detail
-    --chafa-canvas-mode <value>:           Determine how colors are used in the output. This value maps the int value of enum ChafaCanvasMode. See chafa document for detail
-    --chafa-color-space <value>:           Set color space used for quantization. 0 for RGB; 1 for DIN99d. See chafa document for detail
-    --chafa-dither-mode <value>:           Set output dither mode (No effect with 24-bit color). This value maps the int value of enum ChafaDitherMode. See chafa document for detail
-
-Display options:
-    -s,--structure <structure>:  Set the structure of the fetch. Must be a colon separated list of keys. Use `fastfetch --list-modules` to see the ones available.
-    --stat <?value>:             Show time usage (in ms) for individual modules
-    --pipe <?value>:             Disable logo and all escape sequences
-    --color-keys <color>:        Set the color of the keys
-    --color-title <color>:       Set the color of the title
-    --color <color>:             Set the color of both the keys and title
-    --key-width <num>:           Align the width of keys to <num> characters
-    --bright-color <?value>:     Set if the keys, title and ASCII logo should be printed in bright color. Default is true
-    --separator <str>:           Set the separator between key and value. Default is a colon with a space
-    --set <key=value>:           Hard set the value of a key
-    --set-keyless <key=value>:   Hard set the value of a key, but don't print the key or the separator
-    --show-errors <?value>:      Print occurring errors
-    --disable-linewrap <?value>: Whether to disable line wrap during the run
-    --hide-cursor <?value>:      Whether to hide the cursor during the run
-    --binary-prefix <value>:     Set the binary prefix to used. Must be IEC, SI or JEDEC. Default is IEC
-    --percent-type <value>:      Set the percentage output type. 1 for percentage number, 2 for bar, 3 for both, 6 for bar only, 9 for colored number. Default is 9
-    --percent-ndigits <value>:   Set the number of digits to keep after the decimal point when formatting percentage numbers. Default is 0
-    --bar-char-elapsed <str>:    Set the character to use in elapsed part. Default is '■'
-    --bar-char-total <str>:      Set the character to use in total part. Default is '-'
-    --bar-width <?num>:          Set the width of the bar, in number of characters. Default is 10
-    --bar-border <?value>:       Whether to show a border around the bar. Default is true
-    --no-buffer <?value>:        Set if the stdout application buffer should be disabled. Default is false
-    --size-ndigits <value>:      Set the number of digits to keep after the decimal point when formatting sizes
-    --size-max-prefix <value>:   Set the largest binary prefix to use when formatting sizes. Default is YB
-    --temperature-unit <value>:  Set the unit of the temperature. Must be one of C, F and K. Default is C
-
-General module options:
-    --<module>-format <format>:    Set the format string to use for each specific module.
-                                   To see how a format string works, use `fastfetch --help format`.
-                                   To see help about a specific format string, use `fastfetch --help <module>-format`.
-
-    --<module>-key <key>:          Set the key to use for each specific module.
-                                   For modules which print multiple lines, the string is parsed as a format string with the index as first character.
-
-    --<module>-key-color <format>: Override the global `--color-keys` option for each specific module.
-    --<module>-key-width <num>:    Override the global `--key-width` option for each specific module.
-
-Library options: Set the path of a library to load
-    --lib-PCI <path>:           GPU output
-    --lib-vulkan <path>:        Vulkan module & fallback for GPU output
-    --lib-wayland <path>:       Better display performance and output in wayland sessions
-    --lib-xcb-randr <path>:     X11 sessions for better display detection and faster WM detection
-    --lib-xcb <path>:           X11 sessions for better display detection and faster WM detection
-    --lib-Xrandr <path>:        X11 sessions for better display detection and faster WM detection
-    --lib-X11 <path>:           X11 sessions for better display detection and faster WM detection
-    --lib-gio <path>:           Needed for values that are only stored GSettings
-    --lib-DConf <path>:         Needed for values that are only stored in DConf + Fallback for GSettings
-    --lib-DBus <path>:          Bluetooth, Player & Media detection
-    --lib-XFConf <path>:        Needed for XFWM theme and XFCE Terminal font
-    --lib-sqlite3 <path>:       Needed for pkg & rpm package count
-    --lib-rpm <path>:           Slower fallback for rpm package count
-    --lib-imagemagick <path>:   Images in terminal using sixel or kitty graphics protocol
-    --lib-z <path>:             Libz. Faster image output when using kitty graphics protocol
-    --lib-chafa <path>:         Image output as ascii art
-    --lib-egl <path>:           Needed by the OpenGL module for gl context creation
-    --lib-glx <path>:           Needed by the OpenGL module for gl context creation
-    --lib-osmesa <path>:        Needed by the OpenGL module for gl context creation
-    --lib-opencl <path>:        OpenCL module
-    --lib-pulse <path>:         Pulseaudio. Used for Sound detection
-    --lib-nm:                   NetworkManager. Used for Wifi detection
-    --lib-freetype <path>:      Used for Termux font detection
-    --lib-ddcutil <path>:       Used for brightness detection of external displays
-
-Module specific options:
-    --title-fqdn <?value>:                   Set if the title should use fully qualified domain name. Default is false
-    --title-color-user <color>:              Set color of the user name (left part). Default is empty (use color of `--color-title`).
-    --title-color-at <color>:                Set color of the @ symbol (middle part). Default is empty (use color of `--color-title`)
-    --title-color-host <color>:              Set color of the host name (right part). Default is empty (use color of `--color-title`)
-    --chassis-use-wmi <?value>:              Set if WMI query should be used on Windows, which detects more information but slower. Default is false
-    --separator-string <str>:                Set the string printed by the separator module
-    --os-file <path>:                        Set the path to the file containing OS information. Linux only
-    --disk-folders <folders>:                A colon (semicolon on Windows) separated list of folder paths for the disk output. Default is "/:/home" ("C:\\;D:\\ ..." on Windows)
-    --disk-show-regular <?value>:            Set if regular volume should be printed. Default is true
-    --disk-show-external <?value>:           Set if external volume should be printed. Default is true
-    --disk-show-hidden <?value>:             Set if hidden volumes should be printed. Default is false
-    --disk-show-subvolumes <?value>:         Set if subvolumes should be printed. Default is false
-    --disk-show-readonly <?value>:           Set if read only volumes should be printed. Default is false
-    --disk-show-unknown <?value>:            Set if unknown (unable to detect sizes) volumes should be printed. Default is false
-    --disk-use-available <?value>:           Use f_bavail (lpFreeBytesAvailableToCaller for Windows) instead of f_bfree to calculate used bytes. Default is false
-    --diskio-name-prefix <str>:              Show disks with given name prefix only. Default is empty
-    --bluetooth-show-disconnected <?value>:  Set if disconnected bluetooth devices should be printed. Default is false
-    --packages-winget <?value>:              Set if winget package count should be detected. Default is false
-    --display-compact-type <?string>:        Set if all displays should be printed in one line. Default is none
-    --display-detect-name <?value>:          Set if display name should be detected and printed (if supported). Default is false
-    --display-precise-refresh-rate <?value>: Set if decimal refresh rates should not be rounded into integers when printing. Default is true
-    --brightness-ddcci-sleep <num>:          Set the sleep times (in ms) when sending DDC/CI requests. See <https://www.ddcutil.com/performance_options/#option-sleep-multiplier> for detail. Default is 10
-    --sound-type <value>:                    Set what type of sound devices should be printed. Should be either main, active or all. Default is main
-    --battery-dir <folder>:                  The directory where the battery folders are. Standard: `/sys/class/power_supply/`. Linux only
-    --battery-use-setup-api <?value>:        Set if `SetupAPI` should be used on Windows to detect battery info, which supports multi batteries, but slower. Windows only
-    --cpu-temp <?value>:                     Detect and display CPU temperature if supported. Default is false
-    --cpu-freq-ndigits <num>:                Set the number of digits to keep after the decimal point when printing CPU frequency. Default is 2
-    --cpuusage-separate <?value>:            Display CPU usage per CPU logical core, instead of an average result. Default is false
-    --de-slow-version-detection <?value>:    Set if DE version should be detected with slow operations. Default is false
-    --gpu-temp <?value>:                     Detect and display GPU temperature if supported. Default is false
-    --gpu-use-nvml <?value>:                 Use nvml (NVIDIA Management Library) to detect more detailed GPU information (memory usage, CUDA core count, etc). Default is false
-    --gpu-force-vulkan <?value>:             Force using vulkan to detect GPUs, which support video memory usage detection with `--allow-slow-operations`. Default is false
-    --gpu-hide-type <?value>:                Specify the type of GPUs should not be printed. Must be `integrated`, `discrete` or `none`. Default is none
-    --battery-temp <?value>:                 Detect and display Battery temperature if supported. Default is false
-    --localip-show-ipv4 <?value>:            Show IPv4 addresses in local ip module. Default is true
-    --localip-show-ipv6 <?value>:            Show IPv6 addresses in local ip module. Default is false
-    --localip-show-mac <?value>:             Show mac addresses in local ip module. Default is false
-    --localip-show-loop <?value>:            Show loop back addresses (127.0.0.1) in local ip module. Default is false
-    --localip-name-prefix <str>:             Show interfaces with given interface name prefix only. Default is empty
-    --localip-default-route-only <?value>:   Show the interface that is used for default routing only. Default is true
-    --localip-compact <?value>:              Show all IPs in one line. Default is false
-    --netio-name-prefix <str>:               Show interfaces with given name prefix only. Default is empty
-    --netio-default-route-only <?value>:     Show the interfac that is used for default routing only. Default is true
-    --publicip-timeout <num>:                Time in milliseconds to wait for the public ip server to respond. Default is disabled (0)
-    --publicip-url <str>:                    The URL of public IP detection server to be used.
-    --weather-location <str>:                Set the location to be used. It must be URI encoded (eg a whitespace must be encoded as `+`).
-    --weather-timeout <num>:                 Time in milliseconds to wait for the weather server to respond. Default is disabled (0)
-    --weather-output-format <str>:           The output weather format to be used. It must be URI encoded.
-    --wm-detect-plugin <?value>:             Set if window manager plugin should be detected on supported platforms. Default is false
-    --player-name <str>:                     The name of the player to use for module Media and Player. Linux only
-    --opengl-library <str>:                  Set the OpenGL context creation library to use. Must be auto, egl, glx or osmesa. Default is auto
-    --command-shell <str>:                   Set the shell program to execute the command text. Default is cmd for Windows, /bin/sh for *nix
-    --command-key <str>:                     Set the module key to display
-    --command-text <str>:                    Set the command text to be executed
-    --colors-symbol <str>:                   Set the symbol to be printed by Colors module. Default is block
-    --colors-padding-left <value>:           Set the number of white spaces to print before the symbol. Default is 0
-
 Parsing is not case sensitive. E.g. "--lib-PCI" is equal to "--Lib-Pci"
-If a value starts with a ?, it is optional. "true" will be used if not set.
-A (+) at the end indicates that more help can be printed with --help <option>
-All options can be made permanent with command `fastfetch <options> --migrate-config`
+If a value starts with a ?, it is optional. An optional boolean value defaults to true if not specified.
+More detailed help messages for each options can be printed with "-h <option_without_dash_prefix>"
+All options can be made permanent with command "fastfetch <options> --gen-config"

src/data/help_color.txt

@@ -3,7 +3,7 @@ Usage: fastfetch --color <color>
 <color> must be a color encoding as ANSI escape sequences. It is inserted between "ESC[" and "m".
 Infos about them can be found here: https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters.
 Examples:
-   --color 35:    sets the color to pink
+   --color 35:    sets the color to magenta. `--color magenta` is also supported
    --color 4;92:  sets the color to bright Green with underline
    --color 5;104: blinking text on a blue background
 If no color is set, the main color of the logo will be used.

src/data/help_config.txt

@@ -5,5 +5,4 @@ If the file is relative it looks in the following order:
    - relative to the current working directory
    - relative to ~/.local/share/fastfetch/presets/
    - relative to /usr/share/fastfetch/presets/
-Fastfetch provides some default presets. List them with --print-available-presets.
-Note that this will only print presets fastfetch knows about and not every possible one.
+Fastfetch provides some default presets. List them with "fastfetch --list-presets".

src/data/help_format.txt

@@ -1,7 +1,7 @@
 A format string is a string that contains placeholders for values.
 These placeholders begin with a '{', containing the index of the value, and end with a '}'.
 For example the format string "Values: {1} ({2})", with the values "First" and "My second val", will produce
-The format string can contain placeholders in any order and have multiple occurences.
+The format string can contain placeholders in any order and have multiple occurrences.
 To include spaces when setting from the command line, surround the whole string with double quotes (").
 
 If the value index is missing, meaning the placeholder is "{}", an internal counter sets the value index.
@@ -22,7 +22,7 @@ For example to print a fallback for a second value if it is not set, use "{?2}{2
 To stop formatting at any point in the format string, use "{-}".
 
 To print something with color, start a placeholder with a '#' and then the linux terminal color encoding.
-"\\033[" at the start, and an 'm' at the end is automatically added, so don't do that.
+"\033[" at the start, and an 'm' at the end is automatically added, so don't do that.
 A "{#}" is equivalent to a "{#0}" and resets everything to normal.
 For example to print something pink and underline, use "{#4;35}...{#}".
 Information about what the numbers mean can be found here: https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Sele

src/detection/battery/battery.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_battery_battery
-#define FF_INCLUDED_detection_battery_battery
-
 #include "fastfetch.h"
 
 #define FF_BATTERY_TEMP_UNSET (0/0.0)
@@ -19,5 +16,3 @@ typedef struct FFBatteryResult
 } FFBatteryResult;
 
 const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results);
-
-#endif

src/detection/battery/battery_android.c

@@ -71,6 +71,7 @@ static const char* parseDumpsys(FFBatteryOptions* options, FFlist* results)
 
     FFBatteryResult* battery = ffListAdd(results);
     battery->temperature = FF_BATTERY_TEMP_UNSET;
+    battery->cycleCount = 0;
     ffStrbufInit(&battery->manufacturer);
     ffStrbufInit(&battery->modelName);
     ffStrbufInit(&battery->status);

src/detection/battery/battery_apple.c

@@ -56,7 +56,9 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
                 ffStrbufAppendS(&battery->modelName, "Built-in");
         }
 
-        ffCfDictGetInt(properties, CFSTR("CycleCount"), (int32_t*) &battery->cycleCount);
+        int32_t cycleCount = 0;
+        ffCfDictGetInt(properties, CFSTR("CycleCount"), &cycleCount);
+        battery->cycleCount = cycleCount < 0 ? 0 : (uint32_t) cycleCount;
 
         if (!ffCfDictGetBool(properties, CFSTR("ExternalConnected"), &boolValue) && boolValue)
             ffStrbufAppendS(&battery->status, "AC connected, ");
@@ -75,7 +77,7 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
             if (!ffCfDictGetInt64(properties, CFSTR("Temperature"), &temp))
                 battery->temperature = (double) temp / 10 - 273.15;
             else
-                ffDetectCoreTemps(FF_TEMP_BATTERY, &battery->temperature);
+                ffDetectSmcTemps(FF_TEMP_BATTERY, &battery->temperature);
         }
 
         IOObjectRelease(registryEntry);

src/detection/battery/battery_bsd.c

@@ -20,9 +20,9 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
     if(units == 0)
         return NULL;
 
-    FF_AUTO_CLOSE_FD int acpifd = open("/dev/acpi", O_RDONLY);
+    FF_AUTO_CLOSE_FD int acpifd = open("/dev/acpi", O_RDONLY | O_CLOEXEC);
     if(acpifd < 0)
-        return "open(\"/dev/acpi\", O_RDONLY) failed";
+        return "open(\"/dev/acpi\", O_RDONLY | O_CLOEXEC) failed";
 
     for(int i = 0; i < units; ++i)
     {

src/detection/battery/battery_linux.c

@@ -14,6 +14,7 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
     //type must exist and be "Battery"
     ffStrbufAppendS(dir, "/type");
     ffReadFileBuffer(dir->chars, &testBatteryBuffer);
+    ffStrbufTrimRightSpace(&testBatteryBuffer);
     ffStrbufSubstrBefore(dir, dirLength);
 
     if(ffStrbufIgnCaseCompS(&testBatteryBuffer, "Battery") != 0)
@@ -22,6 +23,7 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
     //scope may not exist or must not be "Device"
     ffStrbufAppendS(dir, "/scope");
     ffReadFileBuffer(dir->chars, &testBatteryBuffer);
+    ffStrbufTrimRightSpace(&testBatteryBuffer);
     ffStrbufSubstrBefore(dir, dirLength);
 
     if(ffStrbufIgnCaseCompS(&testBatteryBuffer, "Device") == 0)
@@ -48,28 +50,37 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
     ffStrbufInit(&result->manufacturer);
     ffStrbufAppendS(dir, "/manufacturer");
     ffReadFileBuffer(dir->chars, &result->manufacturer);
+    ffStrbufTrimRightSpace(&result->manufacturer);
     ffStrbufSubstrBefore(dir, dirLength);
 
     ffStrbufInit(&result->modelName);
     ffStrbufAppendS(dir, "/model_name");
     ffReadFileBuffer(dir->chars, &result->modelName);
+    ffStrbufTrimRightSpace(&result->modelName);
     ffStrbufSubstrBefore(dir, dirLength);
 
     ffStrbufInit(&result->technology);
     ffStrbufAppendS(dir, "/technology");
     ffReadFileBuffer(dir->chars, &result->technology);
+    ffStrbufTrimRightSpace(&result->technology);
     ffStrbufSubstrBefore(dir, dirLength);
 
     ffStrbufInit(&result->status);
     ffStrbufAppendS(dir, "/status");
     ffReadFileBuffer(dir->chars, &result->status);
+    ffStrbufTrimRightSpace(&result->status);
     ffStrbufSubstrBefore(dir, dirLength);
 
     ffStrbufAppendS(dir, "/cycle_count");
     ffReadFileBuffer(dir->chars, &testBatteryBuffer);
+    ffStrbufTrimRightSpace(&testBatteryBuffer);
     ffStrbufSubstrBefore(dir, dirLength);
-    if(dir->length)
-        result->cycleCount = (uint32_t) ffStrbufToUInt(&testBatteryBuffer, 0);
+    if (dir->length)
+    {
+        int64_t cycleCount = 0;
+        cycleCount = (int64_t) strtoll(testBatteryBuffer.chars, NULL, 10);
+        result->cycleCount = cycleCount < 0 || cycleCount > UINT32_MAX ? 0 : (uint32_t) cycleCount;
+    }
 
     result->temperature = FF_BATTERY_TEMP_UNSET;
     if (options->temp)
@@ -78,7 +89,7 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
 
         FF_LIST_FOR_EACH(FFTempValue, value, *tempsResult)
         {
-            if (ffStrbufEqualS(&value->name, id))
+            if (ffStrbufEqualS(&value->deviceName, id))
             {
                 result->temperature = value->value;
                 break;
@@ -90,16 +101,8 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
 const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
 {
     FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
-
-    if(options->dir.length > 0)
-    {
-        ffStrbufAppend(&baseDir, &options->dir);
-        ffStrbufEnsureEndsWithC(&baseDir, '/');
-    }
-    else
-    {
-        ffStrbufAppendS(&baseDir, "/sys/class/power_supply/");
-    }
+    ffStrbufAppend(&baseDir, &options->dir);
+    ffStrbufEnsureEndsWithC(&baseDir, '/');
 
     uint32_t baseDirLength = baseDir.length;
 

src/detection/battery/battery_windows.c

@@ -150,7 +150,7 @@ static const char* detectWithNtApi(FF_MAYBE_UNUSED FFBatteryOptions* options, FF
         ffStrbufInit(&battery->manufacturer);
         ffStrbufInit(&battery->technology);
         ffStrbufInit(&battery->status);
-        battery->temperature = 0.0/0.0;
+        battery->temperature = FF_BATTERY_TEMP_UNSET;
         battery->cycleCount = 0;
 
         battery->capacity = info.RemainingCapacity * 100.0 / info.MaxCapacity;

src/detection/bios/bios.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_bios_bios
-#define FF_INCLUDED_detection_bios_bios
-
 #include "fastfetch.h"
 
 typedef struct FFBiosResult
@@ -15,5 +12,3 @@ typedef struct FFBiosResult
 } FFBiosResult;
 
 const char* ffDetectBios(FFBiosResult* bios);
-
-#endif

src/detection/bios/bios_linux.c

@@ -4,25 +4,12 @@
 
 #include <stdlib.h>
 
-static void getSmbiosValue(const char* devicesPath, const char* classPath, FFstrbuf* buffer)
+const char* ffDetectBios(FFBiosResult* bios)
 {
-    ffReadFileBuffer(devicesPath, buffer);
-    if(ffIsSmbiosValueSet(buffer))
-        return;
-
-    ffReadFileBuffer(classPath, buffer);
-    if(ffIsSmbiosValueSet(buffer))
-        return;
-
-    ffStrbufClear(buffer);
-}
-
-const char*  ffDetectBios(FFBiosResult* bios)
-{
-    getSmbiosValue("/sys/devices/virtual/dmi/id/bios_date", "/sys/class/dmi/id/bios_date", &bios->date);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->release);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/bios_vendor", "/sys/class/dmi/id/bios_vendor", &bios->vendor);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/bios_version", "/sys/class/dmi/id/bios_version", &bios->version);
+    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_date", "/sys/class/dmi/id/bios_date", &bios->date);
+    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->release);
+    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_vendor", "/sys/class/dmi/id/bios_vendor", &bios->vendor);
+    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_version", "/sys/class/dmi/id/bios_version", &bios->version);
     if (ffPathExists("/sys/firmware/efi", FF_PATHTYPE_DIRECTORY) || ffPathExists("/sys/firmware/acpi/tables/UEFI", FF_PATHTYPE_FILE))
         ffStrbufSetStatic(&bios->type, "UEFI");
     else

src/detection/bluetooth/bluetooth.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_bluetooth_bluetooth
-#define FF_INCLUDED_detection_bluetooth_bluetooth
-
 #include "fastfetch.h"
 
 typedef struct FFBluetoothResult
@@ -15,5 +12,3 @@ typedef struct FFBluetoothResult
 } FFBluetoothResult;
 
 const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */);
-
-#endif

src/detection/bluetooth/bluetooth_windows.c

@@ -1,14 +1,20 @@
 #include "bluetooth.h"
+#include "common/library.h"
 #include "util/windows/unicode.h"
 
 #include <windows.h>
 #include <bluetoothapis.h>
 
-#pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpointer-sign"
 
 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_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindFirstDevice)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindNextDevice)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindDeviceClose)
+
     BLUETOOTH_DEVICE_SEARCH_PARAMS btsp = {
         .fReturnConnected = TRUE,
         .fReturnRemembered = TRUE,
@@ -20,9 +26,14 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
     BLUETOOTH_DEVICE_INFO btdi = {
         .dwSize = sizeof(btdi)
     };
-    HBLUETOOTH_DEVICE_FIND hFind = BluetoothFindFirstDevice(&btsp, &btdi);
+    HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstDevice(&btsp, &btdi);
     if(!hFind)
-        return "BluetoothFindFirstDevice() failed or no devices found";
+    {
+        if (GetLastError() == ERROR_NO_MORE_ITEMS)
+            return "No Bluetooth devices found";
+        else
+            return "BluetoothFindFirstDevice() failed";
+    }
 
     do {
         FFBluetoothResult* device = ffListAdd(devices);
@@ -114,9 +125,9 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
             ffStrbufTrimRight(&device->type, ' ');
             ffStrbufTrimRight(&device->type, ',');
         }
-    } while (BluetoothFindNextDevice(hFind, &btdi));
+    } while (ffBluetoothFindNextDevice(hFind, &btdi));
+
+    ffBluetoothFindDeviceClose(hFind);
 
     return NULL;
 }
-
-#pragma GCC diagnostic pop

src/detection/board/board.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_board_board
-#define FF_INCLUDED_detection_board_board
-
 #include "fastfetch.h"
 
 typedef struct FFBoardResult
@@ -12,6 +9,4 @@ typedef struct FFBoardResult
     FFstrbuf version;
 } FFBoardResult;
 
-const char* ffDetectBoard(FFBoardResult* result);
-
-#endif
+const char* ffDetectBoard(FFBoardResult* board);

src/detection/board/board_apple.c

@@ -0,0 +1,13 @@
+#include "board.h"
+
+#include "common/sysctl.h"
+
+const char* ffDetectBoard(FFBoardResult* result)
+{
+    const char* error = ffSysctlGetString("hw.model", &result->name);
+    if (error)
+        return error;
+
+    ffStrbufSetStatic(&result->vendor, "Apple");
+    return NULL;
+}

src/detection/board/board_linux.c

@@ -4,23 +4,10 @@
 
 #include <stdlib.h>
 
-static void getSmbiosValue(const char* devicesPath, const char* classPath, FFstrbuf* buffer)
-{
-    ffReadFileBuffer(devicesPath, buffer);
-    if(ffIsSmbiosValueSet(buffer))
-        return;
-
-    ffReadFileBuffer(classPath, buffer);
-    if(ffIsSmbiosValueSet(buffer))
-        return;
-
-    ffStrbufClear(buffer);
-}
-
 const char* ffDetectBoard(FFBoardResult* board)
 {
-    getSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->name);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &board->vendor);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &board->version);
+    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &board->name);
+    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);
     return NULL;
 }

src/detection/brightness/brightness.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_brightness_brightness
-#define FF_INCLUDED_detection_brightness_brightness
-
 #include "fastfetch.h"
 #include "util/FFlist.h"
 
@@ -13,5 +10,3 @@ typedef struct FFBrightnessResult
 } FFBrightnessResult;
 
 const char* ffDetectBrightness(FFBrightnessOptions* options, FFlist* result); // list of FFBrightnessResult
-
-#endif

src/detection/brightness/brightness_bsd.c

@@ -18,7 +18,7 @@ const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFl
     {
         path[sizeof(path) - 2] = i;
 
-        FF_AUTO_CLOSE_FD int blfd = open(path, O_RDONLY);
+        FF_AUTO_CLOSE_FD int blfd = open(path, O_RDONLY | O_CLOEXEC);
         if (blfd < 0)
             continue;
 

src/detection/brightness/brightness_linux.c

@@ -58,9 +58,9 @@ static const char* detectWithBacklight(FFlist* result)
                     {
                         ffStrbufSubstrBeforeLastC(&brightness->name, '/'); // remove "/edid"
                         ffStrbufSubstrAfterLastC(&brightness->name, '/'); // try getting DRM connector name
-                        if(ffStrbufStartsWithS(&brightness->name, "0000:"))
+                        if(isdigit(brightness->name.chars[0]))
                         {
-                            // PCI address, give up
+                            // PCI address or some unknown path, give up
                             ffStrbufSetS(&brightness->name, entry->d_name);
                         }
                         else
@@ -96,6 +96,8 @@ static const char* detectWithBacklight(FFlist* result)
 // Try to be compatible with ddcutil 2.0
 #if DDCUTIL_VMAJOR >= 2
 double ddca_set_default_sleep_multiplier(double multiplier); // ddcutil 1.4
+#else
+DDCA_Status ddca_init(const char *libopts, int syslog_level, int opts);
 #endif
 
 static const char* detectWithDdcci(FFBrightnessOptions* options, FFlist* result)
@@ -107,11 +109,22 @@ static const char* detectWithDdcci(FFBrightnessOptions* options, FFlist* result)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_free_any_vcp_value)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_close_display)
 
-    __typeof__(&ddca_set_default_sleep_multiplier) ffddca_set_default_sleep_multiplier = dlsym(libddcutil, "ddca_set_default_sleep_multiplier");
-    if (ffddca_set_default_sleep_multiplier)
-        ffddca_set_default_sleep_multiplier(options->ddcciSleep / 40.0);
+    __typeof__(&ddca_init) ffddca_init = dlsym(libddcutil, "ddca_init");
+    if (ffddca_init)
+    {
+        FF_SUPPRESS_IO();
+        // Ref: https://github.com/rockowitz/ddcutil/issues/344
+        if (ffddca_init("--disable-watch-displays", -1 /*DDCA_SYSLOG_NOT_SET*/, 1 /*DDCA_INIT_OPTIONS_DISABLE_CONFIG_FILE*/) < 0)
+            return "ddca_init() failed";
+    }
+    else
+    {
+        __typeof__(&ddca_set_default_sleep_multiplier) ffddca_set_default_sleep_multiplier = dlsym(libddcutil, "ddca_set_default_sleep_multiplier");
+        if (ffddca_set_default_sleep_multiplier)
+            ffddca_set_default_sleep_multiplier(options->ddcciSleep / 40.0);
 
-    libddcutil = NULL; // Don't dlclose libddcutil. See https://github.com/rockowitz/ddcutil/issues/330
+        libddcutil = NULL; // Don't dlclose libddcutil. See https://github.com/rockowitz/ddcutil/issues/330
+    }
 
     FF_AUTO_FREE DDCA_Display_Info_List* infoList = NULL;
     if (ffddca_get_display_info_list2(false, &infoList) < 0)

src/detection/brightness/brightness_windows.cpp

@@ -2,6 +2,7 @@ extern "C"
 {
 #include "brightness.h"
 #include "detection/displayserver/displayserver.h"
+#include "common/library.h"
 }
 #include "util/windows/wmi.hpp"
 #include "util/windows/unicode.hpp"
@@ -36,15 +37,19 @@ static const char* detectWithWmi(FFlist* result)
     return NULL;
 }
 
-static char* detectWithDdcci(const FFDisplayServerResult* displayServer, 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_SYMBOL_MESSAGE(dxva2, GetPhysicalMonitorsFromHMONITOR)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(dxva2, GetMonitorBrightness)
+
     FF_LIST_FOR_EACH(FFDisplayResult, display, displayServer->displays)
     {
         PHYSICAL_MONITOR physicalMonitor;
-        if (GetPhysicalMonitorsFromHMONITOR((HMONITOR)(uintptr_t) display->id, 1, &physicalMonitor))
+        if (ffGetPhysicalMonitorsFromHMONITOR((HMONITOR)(uintptr_t) display->id, 1, &physicalMonitor))
         {
             DWORD min = 0, curr = 0, max = 0;
-            if (GetMonitorBrightness(physicalMonitor.hPhysicalMonitor, &min, &curr, &max))
+            if (ffGetMonitorBrightness(physicalMonitor.hPhysicalMonitor, &min, &curr, &max))
             {
                 FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
 

src/detection/chassis/chassis.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_chassis_chassis
-#define FF_INCLUDED_detection_chassis_chassis
-
 #include "fastfetch.h"
 
 typedef struct FFChassisResult
@@ -14,5 +11,3 @@ typedef struct FFChassisResult
 
 const char* ffDetectChassis(FFChassisResult* result, FFChassisOptions* options);
 const char* ffChassisTypeToString(uint32_t type);
-
-#endif

src/detection/chassis/chassis_linux.c

@@ -4,24 +4,11 @@
 
 #include <stdlib.h>
 
-static void getSmbiosValue(const char* devicesPath, const char* classPath, FFstrbuf* buffer)
-{
-    ffReadFileBuffer(devicesPath, buffer);
-    if(ffIsSmbiosValueSet(buffer))
-        return;
-
-    ffReadFileBuffer(classPath, buffer);
-    if(ffIsSmbiosValueSet(buffer))
-        return;
-
-    ffStrbufClear(buffer);
-}
-
 const char* ffDetectChassis(FFChassisResult* result, FF_MAYBE_UNUSED FFChassisOptions* options)
 {
-    getSmbiosValue("/sys/devices/virtual/dmi/id/chassis_type", "/sys/class/dmi/id/chassis_type", &result->type);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/chassis_vendor", "/sys/class/dmi/id/chassis_vendor", &result->vendor);
-    getSmbiosValue("/sys/devices/virtual/dmi/id/chassis_version", "/sys/class/dmi/id/chassis_version", &result->version);
+    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/chassis_type", "/sys/class/dmi/id/chassis_type", &result->type);
+    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/chassis_vendor", "/sys/class/dmi/id/chassis_vendor", &result->vendor);
+    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/chassis_version", "/sys/class/dmi/id/chassis_version", &result->version);
 
     if(result->type.length)
     {

src/detection/cpu/cpu.c

@@ -1,5 +1,4 @@
 #include "cpu.h"
-#include "detection/internal.h"
 
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu);
 

src/detection/cpu/cpu.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_cpu_cpu
-#define FF_INCLUDED_detection_cpu_cpu
-
 #include "fastfetch.h"
 
 #define FF_CPU_TEMP_UNSET (0/0.0)
@@ -16,12 +13,10 @@ typedef struct FFCPUResult
     uint16_t coresLogical;
     uint16_t coresOnline;
 
-    double frequencyMin;
-    double frequencyMax;
+    double frequencyMin; // GHz
+    double frequencyMax; // GHz
 
     double temperature;
 } FFCPUResult;
 
 const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu);
-
-#endif

src/detection/cpu/cpu_apple.c

@@ -7,12 +7,18 @@ static double detectCpuTemp(const FFstrbuf* cpuName)
     double result = 0;
 
     const char* error = NULL;
-    if(ffStrbufStartsWithS(cpuName, "Apple M1"))
-        error = ffDetectCoreTemps(FF_TEMP_CPU_M1X, &result);
-    else if(ffStrbufStartsWithS(cpuName, "Apple M2"))
-        error = ffDetectCoreTemps(FF_TEMP_CPU_M2X, &result);
+    if (ffStrbufStartsWithS(cpuName, "Apple M"))
+    {
+        switch (strtol(cpuName->chars + strlen("Apple M"), NULL, 10))
+        {
+            case 1: error = ffDetectSmcTemps(FF_TEMP_CPU_M1X, &result); break;
+            case 2: error = ffDetectSmcTemps(FF_TEMP_CPU_M2X, &result); break;
+            case 3: error = ffDetectSmcTemps(FF_TEMP_CPU_M3X, &result); break;
+            default: error = "Unsupported Apple Silicon CPU";
+        }
+    }
     else // PPC?
-        error = ffDetectCoreTemps(FF_TEMP_CPU_X64, &result);
+        error = ffDetectSmcTemps(FF_TEMP_CPU_X64, &result);
 
     if(error)
         return FF_CPU_TEMP_UNSET;

src/detection/cpu/cpu_linux.c

@@ -8,6 +8,7 @@
 #include <sys/sysinfo.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #ifdef __ANDROID__
 #include "common/settings.h"
@@ -132,10 +133,9 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     const char* error = parseCpuInfo(cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch);
     if (error) return error;
 
-    cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, 1);
-
     cpu->coresLogical = (uint16_t) get_nprocs_conf();
     cpu->coresOnline = (uint16_t) get_nprocs();
+    cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, cpu->coresLogical);
 
     #define BP "/sys/devices/system/cpu/cpufreq/policy0/"
     if(ffPathExists(BP, FF_PATHTYPE_DIRECTORY))
@@ -167,17 +167,64 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     detectAndroid(cpu);
     #endif
 
-    #ifdef __linux__
     if (cpu->name.length == 0)
     {
         FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
-        if (!ffProcessAppendStdOut(&buffer, (char *const[]) { "lscpu", NULL }))
+        if (ffProcessAppendStdOut(&buffer, (char *const[]) { "lscpu", NULL }) == NULL)
         {
-            ffParsePropLines(buffer.chars, "Model name:", &cpu->name);
-            if (ffStrbufEqualS(&cpu->name, "-")) ffStrbufClear(&cpu->name);
+            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;
+                    }
+                }
+            }
+
+            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 == '-')
+                {
+                    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;
+            }
         }
     }
-    #endif
 
     return NULL;
 }

src/detection/cpuusage/cpuusage.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_cpuusage_cpuusage
-#define FF_INCLUDED_detection_cpuusage_cpuusage
-
 #include "fastfetch.h"
 
 typedef struct FFCpuUsageInfo {
@@ -12,5 +9,3 @@ typedef struct FFCpuUsageInfo {
 const char* ffGetCpuUsageInfo(FFlist* cpuTimes);
 
 const char* ffGetCpuUsageResult(FFlist* result); // list of double
-
-#endif

src/detection/cpuusage/cpuusage_linux.c

@@ -7,30 +7,42 @@
 
 const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
 {
-    FF_AUTO_CLOSE_FILE FILE* procStat = fopen("/proc/stat", "r");
-    if(procStat == NULL)
+    char buf[PROC_FILE_BUFFSIZ];
+    ssize_t nRead = ffReadFileData("/proc/stat", sizeof(buf) - 1, buf);
+    if(nRead < 0)
     {
         #ifdef __ANDROID__
         return "Accessing \"/proc/stat\" is restricted on Android O+";
         #else
-        return "fopen(\"""/proc/stat\", \"r\") == NULL";
+        return "ffReadFileData(\"/proc/stat\", sizeof(buf) - 1, buf) failed";
         #endif
     }
+    buf[nRead] = '\0';
+
     // Skip first line
-    if (fscanf(procStat, "cpu%*[^\n]\n") < 0)
-        return "fscanf() first line failed";
+    char *start = NULL;
+    if((start = strchr(buf, '\n')) == NULL)
+        return "skip first line failed";
+    ++start;
 
     uint64_t user = 0, nice = 0, system = 0, idle = 0, iowait = 0, irq = 0, softirq = 0;
-    while (fscanf(procStat, "cpu%*d%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%*[^\n]\n", &user, &nice, &system, &idle, &iowait, &irq, &softirq) == 7)
+    char *token = NULL;
+    while ((token = strchr(start, '\n')))
     {
-        uint64_t inUse = user + nice + system;
-        uint64_t total = inUse + idle + iowait + irq + softirq;
+        if(sscanf(start, "cpu%*d%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%" PRIu64 "%*[^\n]\n", &user, &nice, &system, &idle, &iowait, &irq, &softirq) == 7)
+        {
+            uint64_t inUse = user + nice + system;
+            uint64_t total = inUse + idle + iowait + irq + softirq;
 
-        FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes);
-        *info = (FFCpuUsageInfo) {
-            .inUseAll = (uint64_t)inUse,
-            .totalAll = (uint64_t)total,
-        };
+            FFCpuUsageInfo* info = (FFCpuUsageInfo*) ffListAdd(cpuTimes);
+            *info = (FFCpuUsageInfo) {
+                .inUseAll = (uint64_t)inUse,
+                .totalAll = (uint64_t)total,
+            };
+        }
+        else
+            break;
+        start = token + 1;
     }
 
     return NULL;

src/detection/cursor/cursor.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_cursor_cursor
-#define FF_INCLUDED_detection_cursor_cursor
-
 #include "fastfetch.h"
 
 typedef struct FFCursorResult
@@ -13,5 +10,3 @@ typedef struct FFCursorResult
 } FFCursorResult;
 
 void ffDetectCursor(FFCursorResult* result);
-
-#endif

src/detection/de/de_linux.c

@@ -1,6 +1,7 @@
 #include "de.h"
 
 #include "common/io/io.h"
+#include "common/library.h"
 #include "common/parsing.h"
 #include "common/properties.h"
 #include "common/processing.h"
@@ -87,26 +88,18 @@ static void getMate(FFstrbuf* result, FFDEOptions* options)
     }
 }
 
+static const char* getXfce4ByLib(FFstrbuf* result)
+{
+    const char* xfce_version_string(void); // from `xfce4/libxfce4util/xfce-misutils.h
+    FF_LIBRARY_LOAD(xfce4util, NULL, "dlopen libxfce4util" FF_LIBRARY_EXTENSION "failed", "libxfce4util" FF_LIBRARY_EXTENSION, 7);
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(xfce4util, xfce_version_string);
+    ffStrbufSetS(result, ffxfce_version_string());
+    return NULL;
+}
+
 static void getXFCE4(FFstrbuf* result, FFDEOptions* options)
 {
-    ffParsePropFileData("gtk-doc/html/libxfce4ui/index.html", "<div><p class=\"releaseinfo\">Version", result);
-
-    #ifdef __FreeBSD__
-    if(result->length == 0)
-    {
-        FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/usr/local/share/licenses/");
-        if (dirp)
-        {
-            struct dirent* entry;
-            while((entry = readdir(dirp)) != NULL)
-            {
-                if(!ffStrStartsWith(entry->d_name, "xfce-") || !isdigit(entry->d_name[5]))
-                    continue;
-                ffStrbufAppendS(result, &entry->d_name[5]);
-            }
-        }
-    }
-    #endif
+    getXfce4ByLib(result);
 
     if(result->length == 0 && options->slowVersionDetection)
     {
@@ -117,8 +110,8 @@ static void getXFCE4(FFstrbuf* result, FFDEOptions* options)
             NULL
         });
 
-        ffStrbufSubstrBeforeFirstC(result, '(');
-        ffStrbufSubstrAfterFirstC(result, ' ');
+        ffStrbufSubstrBeforeFirstC(result, ')');
+        ffStrbufSubstrAfterLastC(result, ' ');
         ffStrbufTrim(result, ' ');
     }
 }
@@ -155,7 +148,7 @@ const char* ffDetectDEVersion(const FFstrbuf* deName, FFstrbuf* result, FFDEOpti
 {
     if (ffStrbufEqualS(deName, FF_DE_PRETTY_PLASMA))
         getKDE(result, options);
-    else if (ffStrbufEqualS(deName, FF_DE_PRETTY_GNOME) || ffStrbufEqualS(deName, FF_DE_PRETTY_GNOME))
+    else if (ffStrbufEqualS(deName, FF_DE_PRETTY_GNOME))
         getGnome(result, options);
     else if (ffStrbufEqualS(deName, FF_DE_PRETTY_CINNAMON))
         getCinnamon(result, options);

src/detection/disk/disk.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#ifndef FF_INCLUDED_detection_disk_disk
-#define FF_INCLUDED_detection_disk_disk
-
 #include "fastfetch.h"
 
 typedef struct FFDisk
@@ -26,6 +23,4 @@ typedef struct FFDisk
  * Returns a List of FFDisk, sorted alphabetically by mountpoint.
  * If error is not set, disks contains at least one disk.
  */
-const char* ffDetectDisks(FFDiskOptions* options, FFlist* result /* list of FFDisk */);
-
-#endif
+const char* ffDetectDisks(FFDiskOptions* options, FFlist* disks /* list of FFDisk */);

src/detection/disk/disk_bsd.c

@@ -5,6 +5,43 @@
 #include <sys/mount.h>
 
 #ifdef __FreeBSD__
+#include <libgeom.h>
+
+static const char* detectFsLabel(struct statfs* fs, FFDisk* disk)
+{
+    if (!ffStrStartsWith(fs->f_mntfromname, "/dev/"))
+        return "Only block devices are supported";
+
+    // Detect volume label in geom tree
+    static struct gmesh geomTree;
+    static struct gclass* cLabels;
+    if (!cLabels)
+    {
+        if (geomTree.lg_ident)
+            return "Previous geom_gettree() failed";
+
+        if (geom_gettree(&geomTree) < 0)
+        {
+            geomTree.lg_ident = (void*)(intptr_t)-1;
+            return "geom_gettree() failed";
+        }
+
+        for (cLabels = geomTree.lg_class.lh_first; !ffStrEquals(cLabels->lg_name, "LABEL"); cLabels = cLabels->lg_class.le_next);
+        if (!cLabels)
+            return "Class LABEL is not found";
+    }
+
+    for (struct ggeom* label = cLabels->lg_geom.lh_first; label; label = label->lg_geom.le_next)
+    {
+        struct gprovider* provider = label->lg_provider.lh_first;
+        if (!provider || !ffStrEquals(label->lg_name, fs->f_mntfromname + strlen("/dev/"))) continue;
+        const char* str = strchr(provider->lg_name, '/');
+        ffStrbufSetS(&disk->name, str ? str + 1 : provider->lg_name);
+    }
+
+    return NULL;
+}
+
 static void detectFsInfo(struct statfs* fs, FFDisk* disk)
 {
     if(ffStrbufEqualS(&disk->filesystem, "zfs"))
@@ -19,6 +56,8 @@ static void detectFsInfo(struct statfs* fs, FFDisk* disk)
         disk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
     else
         disk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
+
+    detectFsLabel(fs, disk);
 }
 #elif __APPLE__
 #include "util/apple/cf_helpers.h"
@@ -26,10 +65,10 @@ static void detectFsInfo(struct statfs* fs, FFDisk* disk)
 #include <sys/attr.h>
 #include <unistd.h>
 
-struct VolAttrBuf {
+struct CmnAttrBuf {
     uint32_t       length;
-    attrreference_t volNameRef;
-    char            volNameSpace[MAXPATHLEN];
+    attrreference_t nameRef;
+    char            nameSpace[NAME_MAX * 3 + 1];
 } __attribute__((aligned(4), packed));
 
 void detectFsInfo(struct statfs* fs, FFDisk* disk)
@@ -41,12 +80,12 @@ void detectFsInfo(struct statfs* fs, FFDisk* disk)
     else
         disk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
 
-    struct VolAttrBuf attrBuf;
+    struct CmnAttrBuf attrBuf;
     if (getattrlist(disk->mountpoint.chars, &(struct attrlist) {
         .bitmapcount = ATTR_BIT_MAP_COUNT,
-        .volattr = ATTR_VOL_INFO | ATTR_VOL_NAME,
+        .commonattr = ATTR_CMN_NAME,
     }, &attrBuf, sizeof(attrBuf), 0) == 0)
-        ffStrbufInitNS(&disk->name, attrBuf.volNameRef.attr_length - 1 /* excluding '\0' */, attrBuf.volNameSpace);
+        ffStrbufInitNS(&disk->name, attrBuf.nameRef.attr_length - 1 /* excluding '\0' */, attrBuf.nameSpace);
 }
 #endif
 

src/detection/disk/disk_linux.c

@@ -20,14 +20,17 @@
 
 static bool isPhysicalDevice(const struct mntent* device)
 {
-    #ifndef __ANDROID__ //On Android, `/dev` is not accessable, so that the following checks always fail
+    #ifndef __ANDROID__ //On Android, `/dev` is not accessible, so that the following checks always fail
 
     //Always show the root path
     if(ffStrEquals(device->mnt_dir, "/"))
         return true;
 
+    if(ffStrEquals(device->mnt_fsname, "none"))
+        return false;
+
     //DrvFs is a filesystem plugin to WSL that was designed to support interop between WSL and the Windows filesystem.
-    if(ffStrEquals(device->mnt_fsname, "drvfs"))
+    if(ffStrEquals(device->mnt_type, "9p"))
         return true;
 
     //ZFS pool
@@ -106,14 +109,6 @@ static void detectName(FFDisk* disk)
 
     FF_STRBUF_AUTO_DESTROY basePath = ffStrbufCreate();
 
-    //Detect USB devices. Code is put here to reuse deviceStat
-    //https://stackoverflow.com/a/73302717
-    ffStrbufAppendS(&basePath, "/dev/disk/by-id/");
-    detectNameFromPath(disk, &deviceStat, &basePath);
-    if (ffStrbufStartsWithS(&disk->name, "usb-"))
-        disk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
-    ffStrbufClear(&disk->name);
-
     //Try label first
     ffStrbufSetS(&basePath, "/dev/disk/by-label/");
     detectNameFromPath(disk, &deviceStat, &basePath);
@@ -197,47 +192,29 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
 
 static bool isRemovable(FFDisk* currentDisk)
 {
-    // https://stackoverflow.com/a/73302025
-    // Note my USB mobile hard disk isn't detected as removable, but my USB flash disk does.
-    // USB devices should be handled in detectName
-    FF_STRBUF_AUTO_DESTROY basePath = ffStrbufCreateS("/sys/block/");
-
-    FF_AUTO_CLOSE_DIR DIR* dir = opendir(basePath.chars);
-    if(dir == NULL)
+    if (!ffStrbufStartsWithS(&currentDisk->mountFrom, "/dev/"))
         return false;
 
-    uint32_t index = ffStrbufLastIndexC(&currentDisk->mountFrom, '/');
-    const char* partitionName = index == currentDisk->mountFrom.length ? NULL : currentDisk->mountFrom.chars + index + 1;
-    if (!partitionName || !*partitionName) return false;
+    char sysBlockPartition[64];
+    snprintf(sysBlockPartition, sizeof(sysBlockPartition), "/sys/class/block/%s", currentDisk->mountFrom.chars + strlen("/dev/"));
 
-    struct dirent* entry;
-    while((entry = readdir(dir)) != NULL)
-    {
-        if(entry->d_name[0] == '.')
-            continue;
+    char sysBlockVolume[PATH_MAX]; // /sys/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host0/target0:0:0/0:0:0:0/block/sda/sda1
+    if (realpath(sysBlockPartition, sysBlockVolume) == NULL)
+        return false;
+    strcpy(strrchr(sysBlockVolume, '/') + 1, "removable");
 
-        if (!ffStrStartsWith(partitionName, entry->d_name)) continue;
-
-        // /sys/block/sdx/removable
-        ffStrbufAppendS(&basePath, entry->d_name);
-        ffStrbufAppendS(&basePath, "/removable");
-        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
-        return ffReadFileBuffer(basePath.chars, &buffer) && ffStrbufEqualS(&buffer, "1");
-    }
-
-    return false;
+    char removableChar = '0';
+    return ffReadFileData(sysBlockVolume, 1, &removableChar) > 0 && removableChar == '1';
 }
 
 static void detectType(const FFlist* disks, FFDisk* currentDisk)
 {
-    if(currentDisk->type != FF_DISK_VOLUME_TYPE_NONE) return;
-
-    if(isRemovable(currentDisk))
-        currentDisk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
+    if(ffStrbufStartsWithS(&currentDisk->mountpoint, "/boot") || ffStrbufStartsWithS(&currentDisk->mountpoint, "/efi"))
+        currentDisk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
     else if(isSubvolume(disks, currentDisk))
         currentDisk->type = FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT;
-    else if(ffStrbufStartsWithS(&currentDisk->mountpoint, "/boot") || ffStrbufStartsWithS(&currentDisk->mountpoint, "/efi"))
-        currentDisk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
+    else if(isRemovable(currentDisk))
+        currentDisk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
     else
         currentDisk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
 }

src/detection/diskio/diskio.c

@@ -47,8 +47,8 @@ const char* ffDetectDiskIO(FFlist* result, FFDiskIOOptions* options)
     {
         FFDiskIOResult* icPrev = (FFDiskIOResult*)ffListGet(&ioCounters1, i);
         FFDiskIOResult* icCurr = (FFDiskIOResult*)ffListGet(result, i);
-        if (!ffStrbufEqual(&icPrev->name, &icCurr->name))
-            return "Network interface name changed";
+        if (!ffStrbufEqual(&icPrev->devPath, &icCurr->devPath))
+            return "Physical disk device path changed";
 
         static_assert(sizeof(FFDiskIOResult) - offsetof(FFDiskIOResult, bytesRead) == sizeof(uint64_t) * 4, "Unexpected struct FFDiskIOResult layout");
         for (size_t off = offsetof(FFDiskIOResult, bytesRead); off < sizeof(FFDiskIOResult); off += sizeof(uint64_t))