Merge pull request #1302 from fastfetch-cli/dev

Release: v2.26.1

.github/FUNDING.yml

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

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
         run: uname -a
 
       - name: configure project
-        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_XFCONF=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OSMESA=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_DRM_AMDGPU=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_XFCONF=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OSMESA=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
 
       - name: build project
         run: cmake --build . --target package --verbose -j4
@@ -74,7 +74,7 @@ jobs:
         run: uname -a
 
       - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev
+        run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev python3-requests
 
       - name: install linuxbrew packages
         run: |
@@ -87,7 +87,7 @@ jobs:
           languages: c
 
       - name: configure project
-        run: PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+        run: PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
 
       - name: build project
         run: cmake --build . --target package --verbose -j4
@@ -247,12 +247,12 @@ jobs:
         run: |
           cat /etc/alpine-release
           uname -a
-          apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev gcc g++
+          apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev py3-requests gcc g++
         shell: alpine.sh --root {0}
 
       - name: build
         run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -GNinja .
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -DENABLE_EMBEDDED_PCIIDS=On -GNinja .
             cmake --build . --target package --verbose -j4
         shell: alpine.sh {0}
 
@@ -422,8 +422,8 @@ jobs:
           run: |
             uname -a
             sudo pkg update
-            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm libelf glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm libelf glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat py311-requests
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On .
             cmake --build . --target package --verbose -j4
             ./fastfetch --list-features
             time ./fastfetch -c presets/ci.jsonc --stat false

CHANGELOG.md

@@ -1,3 +1,66 @@
+# 2.26.1
+
+Features:
+* Allow to disable pacstall packager detection in CMake
+
+Bugfixes:
+* Fix uninitialized variables (GPU, Windows)
+
+# 2.26.0
+
+Changes:
+* To be consistent to other platforms, CPU frequency detection on Linux no longer checks `bios_limit`
+
+Features:
+* Detect GPU index (#1267, GPU)
+* Count Flatpak runtime packages (#1085, Packages, Linux)
+* Support pacstall package manager (Packages, Linux)
+* Support CU core count, max frequency, VMEM usage detection for AMD cards on Linux (GPU, Linux)
+    * Requires `--gpu-driver-specific`
+* Support EU core count, VMEM size detection Intel cards on Linux (GPU, Linux)
+    * Requires `--gpu-driver-specific`. VMEM usage detection requires root permissions.
+* Add new module `TPM` to print TPM (Trusted Platform Module) version if available (TPM)
+* Support GPU driver version detection (GPU, macOS)
+* Add new CMake option `-DENABLE_EMBEDDED_PCIIDS=ON`.
+    * If enabled, fastfetch will download the newest [`pci.ids`](https://pci-ids.ucw.cz/) file, [transform it into C code](https://github.com/fastfetch-cli/fastfetch/blob/dev/scripts/gen-pciids.py) and compile it into fastfetch binaries.
+
+Bugfixes:
+* Fix font size detecton of foot terminal (#1276, TerminalFont, Linux)
+* Ignore `su` and `sudo` when detecting terminal (#1283, Terminal, Linux)
+* Always print inches in integer (Display)
+* Fix Wifi connection protocol detection on macOS Sequoia (Wifi, macOS)
+* Fix hanging when font name is long when detecting kitty term font (#1289, TerminalFont)
+* Detect all enabled or connected connectors (#1301, Display, Linux)
+
+Logos:
+* Add FoxOS
+* Add GXDE OS
+
+# 2.25.0
+
+Features:
+* Moore Threads GPU add support to query number of cores (#1259, GPU)
+* Cache detection result based on last modification time (Packages)
+* Add cmake options to disable certain package managers at compile time
+    * Package managers are encouraged to disable some package managers by passing `-DPACKAGES_DISABLE_` when running `cmake`. For example, when building for Arch Linux, `-DPACKAGES_DISABLE_APK=ON -DPACKAGES_DISABLE_DPKG=ON -DPACKAGES_DISABLE_RPM=ON ...` should be specified.
+    * See all available options by [running `cmake -L | grep PACKAGES_DISABLE_`](https://github.com/fastfetch-cli/fastfetch/blob/dev/CMakeLists.txt#L91)
+    * This option does NOT remove the detection code. It just disables the detection at runtime. One can still use `--packages-disabled ""` to enable all package managers.
+* Add new option `--show-localip-{speed,mtu}` (LocalIP)
+* Add new module `Btrfs`, which prints all mounted Btrfs volumes, like `Zpool` module (#1262, Linux)
+* Improve Wifi module support for macOS Sequoia (Wifi, macOS)
+    * Currently it uses `system_profiler` which costs about 2 seconds on my MBP. I suggest disabling it for now until a better solution is found.
+
+Bugfixes:
+* Fix invalid CPU temperature detection on FreeBSD (#1260, CPU, FreeBSD)
+* Remove `showPeCoreCount` support on FreeBSD (#1260, CPU, FreeBSD)
+* Don't use Wifi speed as Ethernet speed (LocalIP, FreeBSD)
+* Fix compiling with old linux headers (Camera, Linux)
+* Fix detecting public ipv6 address (PublicIP, Windows)
+
+Logo:
+* Fix parrot logo detection
+* Rename TorizonCore to Torizon OS
+
 # 2.24.0
 
 Changes:

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.24.0
+    VERSION 2.26.1
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -51,6 +51,7 @@ cmake_dependent_option(ENABLE_XCB "Enable xcb" ON "LINUX OR FreeBSD OR SunOS" OF
 cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX OR FreeBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_X11 "Enable x11" ON "LINUX OR FreeBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_DRM "Enable libdrm" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DRM_AMDGPU "Enable libdrm_amdgpu" ON "LINUX" OFF)
 cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX OR FreeBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_DCONF "Enable dconf" ON "LINUX OR FreeBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_DBUS "Enable dbus-1" ON "LINUX OR FreeBSD OR SunOS" OFF)
@@ -80,6 +81,7 @@ option(BUILD_TESTS "Build tests" OFF) # Also create test executables
 option(SET_TWEAK "Add tweak to project version" ON) # This is set to off by github actions for release builds
 option(IS_MUSL "Build with musl libc" OFF) # Used by Github Actions
 option(INSTALL_LICENSE "Install license into /usr/share/licenses" ON)
+option(ENABLE_EMBEDDED_PCIIDS "Embed pci.ids into fastfetch, requires `python`" OFF)
 
 set(BINARY_LINK_TYPE_OPTIONS dlopen dynamic static)
 set(BINARY_LINK_TYPE dlopen CACHE STRING "How to link fastfetch")
@@ -88,6 +90,15 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS)
     message(FATAL_ERROR "BINARY_LINK_TYPE must be one of ${BINARY_LINK_TYPE_OPTIONS}")
 endif()
 
+set(PACKAGE_MANAGERS AM APK BREW CHOCO DPKG EMERGE EOPKG FLATPAK GUIX LINGLONG LPKG LPKGBUILD MACPORTS NIX OPKG PACMAN PACSTALL PALUDIS PKG PKGTOOL RPM SCOOP SNAP SORCERY WINGET XBPS)
+foreach(package_manager ${PACKAGE_MANAGERS})
+    if(package_manager STREQUAL "WINGET")
+        option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON)
+    else()
+        option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" OFF)
+    endif()
+endforeach()
+
 if (LINUX)
     set(CUSTOM_PCI_IDS_PATH "" CACHE STRING "Custom path to file pci.ids, defaults to `/usr/share/hwdata/pci.ids`")
     set(CUSTOM_AMDGPU_IDS_PATH "" CACHE STRING "Custom path to file amdgpu.ids, defaults to `/usr/share/libdrm/amdgpu.ids`")
@@ -245,6 +256,16 @@ else()
     file(READ "src/data/help.json" DATATEXT_JSON_HELP)
 endif()
 
+if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "fastfetch_pciids.c.inc")
+    if(Python_FOUND)
+        execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-pciids.py"
+                        OUTPUT_FILE "fastfetch_pciids.c.inc")
+    else()
+        message(STATUS "Python3 is not found, 'fastfetch_pciids.c.inc' will not be generated")
+        set(ENABLE_EMBEDDED_PCIIDS OFF)
+    endif()
+endif()
+
 fastfetch_encode_c_string("${DATATEXT_JSON_HELP}" DATATEXT_JSON_HELP)
 fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE)
 fastfetch_load_text(src/data/help_footer.txt DATATEXT_HELP_FOOTER)
@@ -333,6 +354,7 @@ set(LIBFASTFETCH_SRC
     src/modules/bootmgr/bootmgr.c
     src/modules/brightness/brightness.c
     src/modules/break/break.c
+    src/modules/btrfs/btrfs.c
     src/modules/camera/camera.c
     src/modules/chassis/chassis.c
     src/modules/colors/colors.c
@@ -384,6 +406,7 @@ set(LIBFASTFETCH_SRC
     src/modules/terminalsize/terminalsize.c
     src/modules/theme/theme.c
     src/modules/title/title.c
+    src/modules/tpm/tpm.c
     src/modules/uptime/uptime.c
     src/modules/users/users.c
     src/modules/version/version.c
@@ -402,6 +425,7 @@ set(LIBFASTFETCH_SRC
     src/util/base64.c
     src/util/FFlist.c
     src/util/FFstrbuf.c
+    src/util/kmod.c
     src/util/path.c
     src/util/platform/FFPlatform.c
     src/util/smbiosHelper.c
@@ -419,6 +443,7 @@ if(LINUX)
         src/detection/board/board_linux.c
         src/detection/bootmgr/bootmgr_linux.c
         src/detection/brightness/brightness_linux.c
+        src/detection/btrfs/btrfs_linux.c
         src/detection/chassis/chassis_linux.c
         src/detection/cpu/cpu_linux.c
         src/detection/cpucache/cpucache_linux.c
@@ -469,11 +494,11 @@ if(LINUX)
         src/detection/gtk_qt/qt.c
         src/detection/sound/sound_linux.c
         src/detection/swap/swap_linux.c
-        src/detection/temps/temps_linux.c
         src/detection/terminalfont/terminalfont_linux.c
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/terminalsize/terminalsize_linux.c
         src/detection/theme/theme_linux.c
+        src/detection/tpm/tpm_linux.c
         src/detection/uptime/uptime_linux.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_linux.c
@@ -499,6 +524,7 @@ elseif(ANDROID)
         src/detection/board/board_android.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_linux.c
         src/detection/cpucache/cpucache_linux.c
@@ -532,11 +558,11 @@ elseif(ANDROID)
         src/detection/processes/processes_linux.c
         src/detection/sound/sound_nosupport.c
         src/detection/swap/swap_linux.c
-        src/detection/temps/temps_linux.c
         src/detection/terminalfont/terminalfont_android.c
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/terminalsize/terminalsize_linux.c
         src/detection/theme/theme_nosupport.c
+        src/detection/tpm/tpm_nosupport.c
         src/detection/uptime/uptime_linux.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_nosupport.c
@@ -564,6 +590,7 @@ elseif(FreeBSD)
         src/detection/board/board_bsd.c
         src/detection/bootmgr/bootmgr_bsd.c
         src/detection/brightness/brightness_bsd.c
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_bsd.c
         src/detection/cpu/cpu_bsd.c
         src/detection/cpucache/cpucache_shared.c
@@ -612,11 +639,11 @@ elseif(FreeBSD)
         src/detection/gtk_qt/qt.c
         src/detection/sound/sound_bsd.c
         src/detection/swap/swap_bsd.c
-        src/detection/temps/temps_bsd.c
         src/detection/terminalfont/terminalfont_linux.c
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/terminalsize/terminalsize_linux.c
         src/detection/theme/theme_linux.c
+        src/detection/tpm/tpm_bsd.c
         src/detection/uptime/uptime_bsd.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_linux.c
@@ -643,6 +670,7 @@ elseif(APPLE)
         src/detection/board/board_apple.c
         src/detection/bootmgr/bootmgr_apple.c
         src/detection/brightness/brightness_apple.c
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_apple.c
         src/detection/cpucache/cpucache_apple.c
@@ -677,11 +705,11 @@ elseif(APPLE)
         src/detection/processes/processes_bsd.c
         src/detection/sound/sound_apple.c
         src/detection/swap/swap_apple.c
-        src/detection/temps/temps_apple.c
         src/detection/terminalfont/terminalfont_apple.m
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/terminalsize/terminalsize_linux.c
         src/detection/theme/theme_nosupport.c
+        src/detection/tpm/tpm_nosupport.c
         src/detection/uptime/uptime_bsd.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_apple.m
@@ -693,6 +721,7 @@ elseif(APPLE)
         src/detection/zpool/zpool_nosupport.c
         src/util/apple/cf_helpers.c
         src/util/apple/osascript.m
+        src/util/apple/smc_temps.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_apple.c
     )
@@ -709,8 +738,10 @@ elseif(WIN32)
         src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_windows.c
         src/detection/brightness/brightness_windows.cpp
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_windows.c
+        src/detection/cpu/cpu_windows.cpp
         src/detection/cpucache/cpucache_windows.c
         src/detection/cpuusage/cpuusage_windows.c
         src/detection/cursor/cursor_windows.c
@@ -745,8 +776,8 @@ elseif(WIN32)
         src/detection/terminalfont/terminalfont_windows.c
         src/detection/terminalshell/terminalshell_windows.c
         src/detection/terminalsize/terminalsize_windows.c
-        src/detection/temps/temps_windows.cpp
         src/detection/theme/theme_nosupport.c
+        src/detection/tpm/tpm_windows.c
         src/detection/uptime/uptime_windows.c
         src/detection/users/users_windows.c
         src/detection/wallpaper/wallpaper_windows.c
@@ -776,6 +807,7 @@ elseif(SunOS)
         src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
+        src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_sunos.c
         src/detection/cpucache/cpucache_shared.c
@@ -830,6 +862,7 @@ elseif(SunOS)
         src/detection/terminalshell/terminalshell_linux.c
         src/detection/terminalsize/terminalsize_linux.c
         src/detection/theme/theme_linux.c
+        src/detection/tpm/tpm_nosupport.c
         src/detection/uptime/uptime_sunos.c
         src/detection/users/users_linux.c
         src/detection/wallpaper/wallpaper_linux.c
@@ -885,8 +918,8 @@ add_library(libfastfetch OBJECT
 )
 
 if(yyjson_FOUND)
-    target_compile_definitions(libfastfetch PRIVATE FF_USE_SYSTEM_YYJSON)
-    target_link_libraries(libfastfetch PRIVATE yyjson::yyjson)
+    target_compile_definitions(libfastfetch PUBLIC FF_USE_SYSTEM_YYJSON)
+    target_link_libraries(libfastfetch PUBLIC yyjson::yyjson)
     # `target_link_libraries(yyjson::yyjson)` sets rpath implicitly
 else()
     # Used for dlopen finding dylibs installed by homebrew
@@ -928,11 +961,11 @@ elseif(SunOS)
 endif()
 
 if(HAVE_STATX)
-    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_STATX)
+    target_compile_definitions(libfastfetch PUBLIC FF_HAVE_STATX)
 endif()
 
 if(HAVE_WCWIDTH)
-    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_WCWIDTH)
+    target_compile_definitions(libfastfetch PUBLIC FF_HAVE_WCWIDTH)
 endif()
 
 if(NOT "${CUSTOM_PCI_IDS_PATH}" STREQUAL "")
@@ -1022,6 +1055,10 @@ ff_lib_enable(DRM
     "libdrm"
     "Libdrm"
 )
+ff_lib_enable(DRM_AMDGPU
+    "libdrm_amdgpu"
+    "Libdrm_Amdgpu"
+)
 ff_lib_enable(GIO
     "gio-2.0"
     "GIO"
@@ -1117,18 +1154,29 @@ if(ENABLE_LIBZFS)
     endif()
 endif()
 
-
 if(ENABLE_THREADS)
-    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_THREADS)
+    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_THREADS=1)
     if(CMAKE_USE_PTHREADS_INIT) #Threads::Threads is not set for WIN32
         target_link_libraries(libfastfetch PRIVATE Threads::Threads)
     endif()
 endif()
 
+if(ENABLE_EMBEDDED_PCIIDS)
+    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_EMBEDDED_PCIIDS=1)
+endif()
+
 if(LINUX)
     target_link_libraries(libfastfetch
         PRIVATE "m"
     )
+
+    if(ENABLE_DIRECTX_HEADERS)
+        if(NOT BINARY_LINK_TYPE STREQUAL "dlopen")
+            target_link_libraries(libfastfetch
+                PRIVATE "/usr/lib/wsl/lib/libdxcore.so"
+            )
+        endif()
+    endif()
 elseif(APPLE)
     target_link_libraries(libfastfetch
         PRIVATE "-framework AVFoundation"
@@ -1152,7 +1200,7 @@ elseif(APPLE)
         PRIVATE "-weak_framework Apple80211"
     )
 elseif(WIN32)
-    target_compile_definitions(libfastfetch PRIVATE -D_WIN32_WINNT=0x0601)
+    target_compile_definitions(libfastfetch PRIVATE -D_WIN32_WINNT=0x0A00)
     target_link_libraries(libfastfetch
         PRIVATE "dwmapi"
         PRIVATE "gdi32"
@@ -1264,6 +1312,22 @@ if(NOT WIN32)
     endif()
 endif()
 
+set(PACKAGES_DISABLE_LIST "")
+foreach(package_manager ${PACKAGE_MANAGERS})
+    if(PACKAGES_DISABLE_${package_manager})
+        list(APPEND PACKAGES_DISABLE_LIST "${package_manager}")
+    endif()
+endforeach()
+if("${PACKAGES_DISABLE_LIST}" STREQUAL "")
+    set(PACKAGES_DISABLE_LIST "FF_PACKAGES_FLAG_NONE")
+else()
+    message(STATUS "Disabled package managers: ${PACKAGES_DISABLE_LIST}")
+    list(TRANSFORM PACKAGES_DISABLE_LIST PREPEND "FF_PACKAGES_FLAG_")
+    list(TRANSFORM PACKAGES_DISABLE_LIST APPEND "_BIT")
+    list(JOIN PACKAGES_DISABLE_LIST " | " PACKAGES_DISABLE_LIST)
+endif()
+target_compile_definitions(libfastfetch PRIVATE FF_PACKAGES_DISABLE_LIST=${PACKAGES_DISABLE_LIST})
+
 ######################
 # Executable targets #
 ######################
@@ -1294,13 +1358,6 @@ set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "")
 set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C)
 set_target_properties(flashfetch PROPERTIES LINKER_LANGUAGE C)
 
-if(yyjson_FOUND)
-    target_compile_definitions(fastfetch PRIVATE FF_USE_SYSTEM_YYJSON)
-    target_link_libraries(fastfetch PRIVATE yyjson::yyjson)
-    target_compile_definitions(flashfetch PRIVATE FF_USE_SYSTEM_YYJSON)
-    target_link_libraries(flashfetch PRIVATE yyjson::yyjson)
-endif()
-
 if(WIN32)
     target_sources(fastfetch
         PRIVATE src/util/windows/version.rc
@@ -1347,9 +1404,6 @@ if (BUILD_TESTS)
     target_link_libraries(fastfetch-test-format
         PRIVATE libfastfetch
     )
-    if(yyjson_FOUND)
-        target_compile_definitions(fastfetch-test-format PRIVATE FF_USE_SYSTEM_YYJSON)
-    endif()
 
     enable_testing()
     add_test(NAME test-strbuf COMMAND fastfetch-test-strbuf)

README.md

@@ -27,7 +27,7 @@ There are [screenshots on different platforms](https://github.com/fastfetch-cli/
 
 ### Linux
 
-Some distros packaged an outdated fastfetch version. Older version receive no support, so please try always to use the latest version.
+Some distros package an outdated fastfetch version. Older versions receive no support, so please try always to use the latest version.
 
 * Ubuntu: [`ppa:zhangsongcui3371/fastfetch`](https://launchpad.net/~zhangsongcui3371/+archive/ubuntu/fastfetch) (for Ubuntu 22.04 or newer)
 * Debian: `apt install fastfetch` (for Debian 13 or newer)
@@ -90,7 +90,7 @@ See Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building
 
 Fastfetch uses the JSONC (or JSON with comments) for configuration. [See Wiki for detail](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration). There are some premade config files in [`presets`](presets), including the ones used for the screenshots above. You can load them using `-c <filename>`. Those files can serve as examples of the configuration syntax.
 
-Logos can be heavily customized too; see the [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for more information.
+Logos can also be heavily customized; see the [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for more information.
 
 
 ## Packaging
@@ -112,7 +112,7 @@ Logos can be heavily customized too; see the [logo documentation](https://github
 2. Fastfetch is faster. As the name suggests.
 3. Fastfetch has a greater number of features, though by default fastfetch only has a few modules enabled; use `fastfetch -c all` to find what you want.
 4. Fastfetch is more configurable. You can find more information in the Wiki: <https://github.com/fastfetch-cli/fastfetch/wiki/Configuration>.
-5. Fastfetch is more polished. For example, neofetch prints `555MiB` in `Memory` module and `23G` in `Disk` module, whereas fastfetch prints `555.00 MiB` and `22.97 GiB` respectively.
+5. Fastfetch is more polished. For example, neofetch prints `555 MiB` in the Memory module and `23 G` in the Disk module, whereas fastfetch prints `555.00 MiB` and `22.97 GiB` respectively.
 6. Fastfetch is more accurate. For example, [neofetch never actually supports the Wayland protocol](https://github.com/dylanaraps/neofetch/pull/2395).
 
 ### Q: Fastfetch shows my local IP address. It leaks my privacy!
@@ -152,13 +152,13 @@ Fastfetch uses `format` to generate output. For example, to make the `GPU` modul
     "modules": [
         {
             "type": "gpu",
-            "format": "{2}" // See `fastfetch -h gpu-format` for detail
+            "format": "{name}" // See `fastfetch -h gpu-format` for detail
         }
     ]
 }
 ```
 
-. . which is equivalent to `fastfetch -s gpu --gpu-format '{2}'`
+. . which is equivalent to `fastfetch -s gpu --gpu-format '{name}'`
 
 See `fastfetch -h format` for information on basic usage. For module specific formattion, see `fastfetch -h <module>-format`
 
@@ -186,6 +186,10 @@ You can always use `fastfetch --pipe false` to force fastfetch running in colorf
 
 See [#1096](https://github.com/fastfetch-cli/fastfetch/issues/1096).
 
+### Q: I use Debian / Ubuntu / Debian deserved distro. My GPU is detected as `XXXX Device XXXX (VGA compatible)`. Is it a bug?
+
+See [#1282](https://github.com/fastfetch-cli/fastfetch/issues/1282)
+
 ### Q: I want feature A / B / C. Will fastfetch support it?
 
 Fastfetch is a system information tool. We only accept hardware or system level software feature requests. For most personal uses, I recommend using `Command` module to detect it yourself, which can be used to grab output from a custom shell script:
@@ -210,6 +214,13 @@ Otherwise, open a feature request in [GitHub Issues](https://github.com/fastfetc
 * For usage questions, please start a discussion in [GitHub Discussions](https://github.com/fastfetch-cli/fastfetch/discussions).
 * For possible bugs, please open an issue in [GitHub Issues](https://github.com/fastfetch-cli/fastfetch/issues). Be sure to fill the bug-report template carefully for developers to investigate.
 
+## Donate
+
+If you find Fastfetch to be useful, please consider donating.
+
+* Current maintainer: [@CarterLi](https://paypal.me/zhangsongcui)
+* Original author: [@LinusDierheimer](https://github.com/sponsors/LinusDierheimer)
+
 ## Star History
 
 Give it a star to support us!

debian/changelog

@@ -1,3 +1,21 @@
+fastfetch (2.26.0) jammy; urgency=medium
+
+  * Update to 2.26.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Sun, 29 Sep 2024 13:31:25 +0800
+
+fastfetch (2.25.0) jammy; urgency=medium
+
+  * Update to 2.25.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 19 Sep 2024 10:28:38 +0800
+
+fastfetch (2.24.0) jammy; urgency=medium
+
+  * Update to 2.24.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 11 Sep 2024 13:50:02 +0800
+
 fastfetch (2.23.0) jammy; urgency=medium
 
   * Update to 2.23.0

debian/files

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

doc/json_schema.json

@@ -337,7 +337,7 @@
                 "processingTimeout": {
                     "type": "integer",
                     "description": "Set the timeout (ms) when waiting for child processes, `-1` for no timeout",
-                    "default": 1000
+                    "default": 5000
                 },
                 "preRun": {
                     "type": "string",
@@ -655,6 +655,7 @@
                             "bootmgr",
                             "break",
                             "brightness",
+                            "btrfs",
                             "camera",
                             "chassis",
                             "cpu",
@@ -705,6 +706,7 @@
                             "terminaltheme",
                             "title",
                             "theme",
+                            "tpm",
                             "uptime",
                             "users",
                             "version",
@@ -864,6 +866,10 @@
                                                 "const": "theme",
                                                 "description": "Print current theme of desktop environment"
                                             },
+                                            {
+                                                "const": "tpm",
+                                                "description": "Print info of Trusted Platform Module (TPM) Security Device"
+                                            },
                                             {
                                                 "const": "uptime",
                                                 "description": "Print how long system has been running"
@@ -887,10 +893,6 @@
                                             {
                                                 "const": "wmtheme",
                                                 "description": "Print current theme of window manager"
-                                            },
-                                            {
-                                                "const": "zpool",
-                                                "description": "Print ZFS storage pools"
                                             }
                                         ]
                                     },
@@ -1059,6 +1061,38 @@
                                     }
                                 }
                             },
+                            {
+                                "title": "BTRFS",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "type": {
+                                        "const": "btrfs",
+                                        "description": "Print Btrfs volumes"
+                                    },
+                                    "percent": {
+                                        "$ref": "#/$defs/percent"
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                }
+                            },
                             {
                                 "title": "Chassis",
                                 "type": "object",
@@ -1634,6 +1668,16 @@
                                         "type": "boolean",
                                         "default": false
                                     },
+                                    "showSpeed": {
+                                        "description": "Show ethernet rx speed",
+                                        "type": "boolean",
+                                        "default": false
+                                    },
+                                    "showMtu": {
+                                        "description": "Show MTU",
+                                        "type": "boolean",
+                                        "default": false
+                                    },
                                     "showMac": {
                                         "description": "Show MAC addresses",
                                         "type": "boolean",
@@ -2261,6 +2305,38 @@
                                         "$ref": "#/$defs/format"
                                     }
                                 }
+                            },
+                            {
+                                "title": "Zpool",
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "type": {
+                                        "const": "zpool",
+                                        "description": "Print ZFS storage pools"
+                                    },
+                                    "percent": {
+                                        "$ref": "#/$defs/percent"
+                                    },
+                                    "key": {
+                                        "$ref": "#/$defs/key"
+                                    },
+                                    "keyColor": {
+                                        "$ref": "#/$defs/keyColor"
+                                    },
+                                    "keyIcon": {
+                                        "$ref": "#/$defs/keyIcon"
+                                    },
+                                    "keyWidth": {
+                                        "$ref": "#/$defs/keyWidth"
+                                    },
+                                    "outputColor": {
+                                        "$ref": "#/$defs/outputColor"
+                                    },
+                                    "format": {
+                                        "$ref": "#/$defs/format"
+                                    }
+                                }
                             }
                         ]
                     }

presets/all.jsonc

@@ -54,8 +54,12 @@
         "physicalmemory",
         "swap",
         "disk",
+        "btrfs",
         "zpool",
-        "battery",
+        {
+            "type": "battery",
+            "temp": true
+        },
         "poweradapter",
         "player",
         "media",
@@ -66,7 +70,9 @@
         {
             "type": "localip",
             "showIpv6": true,
-            "showMac": true
+            "showMac": true,
+            "showSpeed": true,
+            "showMtu": true
         },
         "dns",
         "wifi",
@@ -91,6 +97,7 @@
             "type": "physicaldisk",
             "temp": true
         },
+        "tpm",
         "version",
         "break",
         "colors"

presets/ci.jsonc

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

presets/examples/24.jsonc

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

scripts/gen-pciids.py

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

src/common/init.c

@@ -191,6 +191,9 @@ void ffListFeatures(void)
         #if FF_HAVE_DRM
             "drm\n"
         #endif
+        #if FF_HAVE_DRM_AMDGPU
+            "drm_amdgpu\n"
+        #endif
         #if FF_HAVE_GIO
             "gio\n"
         #endif
@@ -260,6 +263,9 @@ void ffListFeatures(void)
         #if FF_HAVE_LINUX_WIRELESS
             "linux/wireless\n"
         #endif
+        #if FF_HAVE_EMBEDDED_PCIIDS
+            "Embedded pciids\n"
+        #endif
         ""
     , stdout);
 }

src/common/modules.c

@@ -13,6 +13,7 @@ static FFModuleBaseInfo* B[] = {
     (void*) &instance.config.modules.bootmgr,
     (void*) &instance.config.modules.break_,
     (void*) &instance.config.modules.brightness,
+    (void*) &instance.config.modules.btrfs,
     NULL,
 };
 
@@ -136,6 +137,7 @@ static FFModuleBaseInfo* T[] = {
     (void*) &instance.config.modules.terminalTheme,
     (void*) &instance.config.modules.title,
     (void*) &instance.config.modules.theme,
+    (void*) &instance.config.modules.tpm,
     NULL,
 };
 

src/common/networking_linux.c

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

src/common/networking_windows.c

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

src/common/processing_windows.c

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

src/data/help.json

@@ -128,7 +128,7 @@
             "desc": "Set the timeout (ms) when waiting for child processes",
             "arg": {
                 "type": "num",
-                "default": 1000
+                "default": 5000
             }
         },
         {
@@ -1379,7 +1379,7 @@
         {
             "long": "command-param",
             "desc": "Set the parameter used when starting the shell",
-            "remark": "Due to the difference of how OSes handle command line parameters, Windows will parse whitespaces as param separators, while *nix will not",
+            "remark": "If set to empty string, it will be ignored",
             "arg": {
                 "type": "str",
                 "default": "\"/c\" for Windows; \"-c\" for *nix"

src/detection/battery/battery_apple.c

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

src/detection/battery/battery_linux.c

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

src/detection/bootmgr/bootmgr_windows.c

@@ -38,7 +38,7 @@ const char* ffDetectBootmgr(FFBootmgrResult* result)
 
     uint8_t buffer[2048];
     wchar_t key[16];
-    wsprintfW(key, L"Boot%04X", value);
+    swprintf(key, sizeof(key) / sizeof(*key), L"Boot%04X", value);
     uint32_t size = GetFirmwareEnvironmentVariableW(key, L"{" FF_EFI_GLOBAL_GUID L"}", buffer, sizeof(buffer));
     if (size < sizeof(FFEfiLoadOption) || size == sizeof(buffer))
         return "GetFirmwareEnvironmentVariableW(Boot####) failed";

src/detection/btrfs/btrfs.h

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

src/detection/btrfs/btrfs_linux.c

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

src/detection/btrfs/btrfs_nosupport.c

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

src/detection/camera/camera_linux.c

@@ -43,10 +43,10 @@ const char* ffDetectCamera(FFlist* result)
         case V4L2_COLORSPACE_JPEG: ffStrbufInitStatic(&camera->colorspace, "JPEG"); break;
         case V4L2_COLORSPACE_REC709:
         case V4L2_COLORSPACE_SRGB: ffStrbufInitStatic(&camera->colorspace, "sRGB"); break;
-        case V4L2_COLORSPACE_OPRGB: ffStrbufInitStatic(&camera->colorspace, "Adobe RGB"); break;
-        case V4L2_COLORSPACE_BT2020: ffStrbufInitStatic(&camera->colorspace, "BT.2020"); break;
-        case V4L2_COLORSPACE_RAW: ffStrbufInitStatic(&camera->colorspace, "RAW"); break;
-        case V4L2_COLORSPACE_DCI_P3: ffStrbufInitStatic(&camera->colorspace, "DCI-P3"); break;
+        case 9 /* V4L2_COLORSPACE_OPRGB */: ffStrbufInitStatic(&camera->colorspace, "Adobe RGB"); break;
+        case 10 /* V4L2_COLORSPACE_BT2020 */: ffStrbufInitStatic(&camera->colorspace, "BT.2020"); break;
+        case 11 /* V4L2_COLORSPACE_RAW */: ffStrbufInitStatic(&camera->colorspace, "RAW"); break;
+        case 12 /* V4L2_COLORSPACE_DCI_P3 */: ffStrbufInitStatic(&camera->colorspace, "DCI-P3"); break;
         default: ffStrbufInit(&camera->colorspace); break;
         }
         camera->width = fmt.fmt.pix.width;

src/detection/cpu/cpu.h

@@ -21,7 +21,6 @@ typedef struct FFCPUResult
 
     uint32_t frequencyBase; // GHz
     uint32_t frequencyMax; // GHz
-    uint32_t frequencyBiosLimit; // GHz
 
     FFCPUCore coreTypes[16]; // number of P cores, E cores, etc.
 

src/detection/cpu/cpu_apple.c

@@ -1,6 +1,6 @@
 #include "cpu.h"
 #include "common/sysctl.h"
-#include "detection/temps/temps_apple.h"
+#include "util/apple/smc_temps.h"
 #include "util/stringUtils.h"
 
 static double detectCpuTemp(const FFstrbuf* cpuName)

src/detection/cpu/cpu_bsd.c

@@ -1,6 +1,27 @@
 #include "cpu.h"
 #include "common/sysctl.h"
-#include "detection/temps/temps_bsd.h"
+
+static const char* detectCpuTemp(double* current)
+{
+    int temp = ffSysctlGetInt("dev.cpu.0.temperature", -999999);
+    if (temp == -999999)
+        return "ffSysctlGetInt(\"dev.cpu.0.temperature\") failed";
+
+    // In tenth of degrees Kelvin
+    *current = (double) temp / 10 - 273.15;
+    return NULL;
+}
+
+static const char* detectThermalTemp(double* current)
+{
+    int temp = ffSysctlGetInt("hw.acpi.thermal.tz0.temperature", -999999);
+    if (temp == -999999)
+        return "ffSysctlGetInt(\"hw.acpi.thermal.tz0.temperature\") failed";
+
+    // In tenth of degrees Kelvin
+    *current = (double) temp / 10 - 273.15;
+    return NULL;
+}
 
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
@@ -41,40 +62,13 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 
     ffCPUDetectSpeedByCpuid(cpu);
 
-    for (uint16_t i = 0; i < cpu->coresLogical; ++i)
-    {
-        ffStrbufClear(&buffer);
-        char key[32];
-        snprintf(key, sizeof(key), "dev.cpu.%u.freq_levels", i);
-        if (ffSysctlGetString(key, &buffer) == NULL)
-        {
-            if (buffer.length == 0) continue;
-
-            // MHz/Watts pairs like: 2501/32000 2187/27125 2000/24000
-            uint32_t fmax = (uint32_t) strtoul(buffer.chars, NULL, 10);
-            if (cpu->frequencyMax < fmax) cpu->frequencyMax = fmax;
-
-            if (options->showPeCoreCount)
-            {
-                uint32_t ifreq = 0;
-                while (cpu->coreTypes[ifreq].freq != fmax && cpu->coreTypes[ifreq].freq > 0)
-                    ++ifreq;
-                if (cpu->coreTypes[ifreq].freq == 0)
-                    cpu->coreTypes[ifreq].freq = fmax;
-                cpu->coreTypes[ifreq].count++;
-            }
-        }
-        else
-            break;
-    }
-
     cpu->frequencyBase = (uint32_t) ffSysctlGetInt("hw.clockrate", 0);
     cpu->temperature = FF_CPU_TEMP_UNSET;
 
     if (options->temp)
     {
-        if (!ffDetectCpuTemp(&cpu->temperature))
-            ffDetectThermalTemp(&cpu->temperature);
+        if (detectCpuTemp(&cpu->temperature) != NULL)
+            detectThermalTemp(&cpu->temperature);
     }
 
     return NULL;

src/detection/cpu/cpu_linux.c

@@ -2,13 +2,85 @@
 #include "common/io/io.h"
 #include "common/processing.h"
 #include "common/properties.h"
-#include "detection/temps/temps_linux.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 
 #include <sys/sysinfo.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <dirent.h>
+
+static double parseHwmonDir(FFstrbuf* dir, FFstrbuf* buffer)
+{
+    //https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
+    uint32_t dirLength = dir->length;
+    ffStrbufAppendS(dir, "temp1_input");
+
+    if(!ffReadFileBuffer(dir->chars, buffer))
+    {
+        // Some badly implemented system put temp file in /hwmonN/device
+        ffStrbufSubstrBefore(dir, dirLength);
+        ffStrbufAppendS(dir, "device/");
+        dirLength = dir->length;
+        ffStrbufAppendS(dir, "temp1_input");
+
+        if(!ffReadFileBuffer(dir->chars, buffer))
+            return 0.0/0.0;
+    }
+
+    ffStrbufSubstrBefore(dir, dirLength);
+
+    double value = ffStrbufToDouble(buffer);// millidegree Celsius
+
+    if(value != value)
+        return 0.0/0.0;
+
+    ffStrbufAppendS(dir, "name");
+    if (!ffReadFileBuffer(dir->chars, buffer))
+        return 0.0/0.0;
+
+    ffStrbufTrimRightSpace(buffer);
+
+    if(
+        ffStrbufContainS(buffer, "cpu") ||
+        ffStrbufEqualS(buffer, "k10temp") || // AMD
+        ffStrbufEqualS(buffer, "coretemp") // Intel
+    ) return value / 1000.;
+
+    return false;
+}
+
+static double detectCPUTemp(void)
+{
+    FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
+    ffStrbufAppendS(&baseDir, "/sys/class/hwmon/");
+
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+
+    uint32_t baseDirLength = baseDir.length;
+
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir.chars);
+    if(dirp == NULL)
+        return 0.0/0.0;
+
+    struct dirent* entry;
+    while((entry = readdir(dirp)) != NULL)
+    {
+        if(entry->d_name[0] == '.')
+            continue;
+
+        ffStrbufAppendS(&baseDir, entry->d_name);
+        ffStrbufAppendC(&baseDir, '/');
+
+        double result = parseHwmonDir(&baseDir, &buffer);
+        if (result == result)
+            return result;
+
+        ffStrbufSubstrBefore(&baseDir, baseDirLength);
+    }
+
+    return 0.0/0.0;
+}
 
 #ifdef __ANDROID__
 #include "common/settings.h"
@@ -253,18 +325,25 @@ static bool detectFrequency(FFCPUResult* cpu, const FFCPUOptions* options)
         if (ffStrStartsWith(entry->d_name, "policy") && ffCharIsDigit(entry->d_name[strlen("policy")]))
         {
             ffStrbufAppendS(&path, entry->d_name);
+
+            uint32_t fmax = getFrequency(&path, "/cpuinfo_max_freq", "/scaling_max_freq", &buffer);
+            if (fmax == 0) continue;
+
+            if (cpu->frequencyMax >= fmax)
+            {
+                if (!options->showPeCoreCount)
+                {
+                    ffStrbufSubstrBefore(&path, baseLen);
+                    continue;
+                }
+            }
+            else
+                cpu->frequencyMax = fmax;
+
             uint32_t fbase = getFrequency(&path, "/base_frequency", NULL, &buffer);
             if (fbase > 0)
                 cpu->frequencyBase = cpu->frequencyBase > fbase ? cpu->frequencyBase : fbase;
 
-            uint32_t fbioslimit = getFrequency(&path, "/bios_limit", NULL, &buffer);
-            if (fbioslimit > 0)
-                cpu->frequencyBiosLimit = cpu->frequencyBiosLimit > fbioslimit ? cpu->frequencyBiosLimit : fbioslimit;
-
-            uint32_t fmax = getFrequency(&path, "/cpuinfo_max_freq", "/scaling_max_freq", &buffer);
-            if (fmax > 0)
-                cpu->frequencyMax = cpu->frequencyMax > fmax ? cpu->frequencyMax : fmax;
-
             if (options->showPeCoreCount)
             {
                 uint32_t freq = fbase == 0 ? fmax : fbase; // seems base frequencies are more stable
@@ -281,22 +360,6 @@ static bool detectFrequency(FFCPUResult* cpu, const FFCPUOptions* options)
     return true;
 }
 
-static double detectCPUTemp(void)
-{
-    const FFlist* tempsResult = ffDetectTemps();
-
-    FF_LIST_FOR_EACH(FFTempValue, value, *tempsResult)
-    {
-        if(
-            ffStrbufFirstIndexS(&value->name, "cpu") < value->name.length ||
-            ffStrbufEqualS(&value->name, "k10temp") ||
-            ffStrbufEqualS(&value->name, "coretemp")
-        ) return value->value;
-    }
-
-    return FF_CPU_TEMP_UNSET;
-}
-
 FF_MAYBE_UNUSED static void parseIsa(FFstrbuf* cpuIsa)
 {
     // Always use the last part of the ISA string. Ref: #590 #1204

src/detection/cpu/cpu_windows.c

@@ -1,5 +1,4 @@
 #include "cpu.h"
-#include "detection/temps/temps_windows.h"
 #include "util/windows/registry.h"
 #include "util/windows/nt.h"
 #include "util/mallocHelper.h"
@@ -160,6 +159,8 @@ static const char* detectCoreTypes(FFCPUResult* cpu)
     return NULL;
 }
 
+const char* detectThermalTemp(double* current, double* critical);
+
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
     detectNCores(cpu);
@@ -175,7 +176,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
         detectMaxSpeedBySmbios(cpu);
 
     if(options->temp)
-        ffDetectSmbiosTemp(&cpu->temperature, NULL);
+        detectThermalTemp(&cpu->temperature, NULL);
 
     return NULL;
 }

src/detection/cpu/cpu_windows.cpp

@@ -1,11 +1,7 @@
-extern "C"
-{
-#include "temps_windows.h"
-}
 #include "util/windows/wmi.hpp"
 
 extern "C"
-const char* ffDetectSmbiosTemp(double* current, double* critical)
+const char* detectThermalTemp(double* current, double* critical)
 {
     // Requires Administrator privileges
     // https://wutils.com/wmi/root/wmi/msacpi_thermalzonetemperature/#properties

src/detection/cursor/cursor_apple.m

@@ -4,10 +4,10 @@
 
 static void appendColor(FFstrbuf* str, NSDictionary* color)
 {
-    int r = (int) (((NSNumber*) [color valueForKey:@"red"]).doubleValue * 255);
-    int g = (int) (((NSNumber*) [color valueForKey:@"green"]).doubleValue * 255);
-    int b = (int) (((NSNumber*) [color valueForKey:@"blue"]).doubleValue * 255);
-    int a = (int) (((NSNumber*) [color valueForKey:@"alpha"]).doubleValue * 255);
+    int r = (int) (((NSNumber*) color[@"red"]).doubleValue * 255);
+    int g = (int) (((NSNumber*) color[@"green"]).doubleValue * 255);
+    int b = (int) (((NSNumber*) color[@"blue"]).doubleValue * 255);
+    int a = (int) (((NSNumber*) color[@"alpha"]).doubleValue * 255);
 
     if (r == 255 && g == 255 && b == 255 && a == 255)
         ffStrbufAppendS(str, "White");
@@ -32,19 +32,19 @@ void ffDetectCursor(FFCursorResult* result)
     NSDictionary* color;
 
     ffStrbufAppendS(&result->theme, "Fill - ");
-    if ((color = [dict valueForKey:@"cursorFill"]))
+    if ((color = dict[@"cursorFill"]))
         appendColor(&result->theme, color);
     else
         ffStrbufAppendS(&result->theme, "Black");
 
     ffStrbufAppendS(&result->theme, ", Outline - ");
 
-    if ((color = [dict valueForKey:@"cursorOutline"]))
+    if ((color = dict[@"cursorOutline"]))
         appendColor(&result->theme, color);
     else
         ffStrbufAppendS(&result->theme, "White");
 
-    NSNumber* mouseDriverCursorSize = [dict valueForKey:@"mouseDriverCursorSize"];
+    NSNumber* mouseDriverCursorSize = dict[@"mouseDriverCursorSize"];
     if (mouseDriverCursorSize)
         ffStrbufAppendF(&result->size, "%d", (int) (mouseDriverCursorSize.doubleValue * 32));
     else

src/detection/disk/disk_windows.c

@@ -6,7 +6,7 @@
 #include <windows.h>
 #include <winioctl.h>
 
-static unsigned __stdcall testRemoteVolumeAccessable(void* mountpoint)
+static unsigned __stdcall testRemoteVolumeAccessible(void* mountpoint)
 {
     FF_AUTO_CLOSE_FD HANDLE handle = CreateFileW(
         (wchar_t*) mountpoint,
@@ -84,7 +84,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
         #ifdef FF_HAVE_THREADS
         if (driveType == DRIVE_REMOTE)
         {
-            FFThreadType thread = ffThreadCreate(testRemoteVolumeAccessable, mountpoint);
+            FFThreadType thread = ffThreadCreate(testRemoteVolumeAccessible, mountpoint);
             if (!ffThreadJoin(thread, 500))
                 continue;
         }

src/detection/displayserver/linux/drm.c

@@ -28,13 +28,19 @@ static const char* drmParseSysfs(FFDisplayServerResult* result)
         ffStrbufAppendS(&drmDir, entry->d_name);
         uint32_t drmDirWithDnameLength = drmDir.length;
 
-        ffStrbufAppendS(&drmDir, "/status");
-        char status = 'd'; // disconnected
-        ffReadFileData(drmDir.chars, sizeof(status), &status);
-        if (status != 'c') // connected
-        {
+        char buf;
+        ffStrbufAppendS(&drmDir, "/enabled");
+        if (!ffReadFileData(drmDir.chars, sizeof(buf), &buf) || buf != 'e') {
+          /* read failed or enabled != "enabled" */
+          ffStrbufSubstrBefore(&drmDir, drmDirWithDnameLength);
+          ffStrbufAppendS(&drmDir, "/status");
+          buf = 'd';
+          ffReadFileData(drmDir.chars, sizeof(buf), &buf);
+          if (buf != 'c') {
+            /* read failed or status != "connected" */
             ffStrbufSubstrBefore(&drmDir, drmDirLength);
             continue;
+          }
         }
 
         unsigned width = 0, height = 0, physicalWidth = 0, physicalHeight = 0;
@@ -251,7 +257,7 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
             if (!conn)
                 continue;
 
-            if (conn->connection == DRM_MODE_CONNECTED)
+            if (conn->connection != DRM_MODE_DISCONNECTED)
             {
                 drmModeEncoder* encoder = ffdrmModeGetEncoder(fd, conn->encoder_id);
                 uint32_t width = 0, height = 0, refreshRate = 0;

src/detection/gpu/gpu.c

@@ -55,6 +55,7 @@ const char* detectByOpenGL(FFlist* gpus)
         ffStrbufInitMove(&gpu->name, &result.renderer);
         ffStrbufInitMove(&gpu->driver, &result.vendor);
         ffStrbufInitF(&gpu->platformApi, "OpenGL %s", result.version.chars);
+        gpu->index = FF_GPU_INDEX_UNSET;
         gpu->temperature = FF_GPU_TEMP_UNSET;
         gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
         gpu->frequency = FF_GPU_FREQUENCY_UNSET;

src/detection/gpu/gpu.h

@@ -7,6 +7,7 @@
 #define FF_GPU_VMEM_SIZE_UNSET ((uint64_t)-1)
 #define FF_GPU_FREQUENCY_UNSET 0
 #define FF_GPU_CORE_USAGE_UNSET (0/0.0)
+#define FF_GPU_INDEX_UNSET ((uint32_t)-1)
 
 extern const char* FF_GPU_VENDOR_NAME_APPLE;
 extern const char* FF_GPU_VENDOR_NAME_AMD;
@@ -27,6 +28,7 @@ typedef struct FFGPUMemory
 
 typedef struct FFGPUResult
 {
+    uint32_t index;
     FFGPUType type;
     FFstrbuf vendor;
     FFstrbuf name;
@@ -38,7 +40,7 @@ typedef struct FFGPUResult
     uint32_t frequency; // Maximum time clock frequency in MHz
     FFGPUMemory dedicated;
     FFGPUMemory shared;
-    uint64_t deviceId; // Used internally, may be uninitialized
+    uint64_t deviceId;
 } FFGPUResult;
 
 const char* ffDetectGPU(const FFGPUOptions* options, FFlist* result);
@@ -47,5 +49,5 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus);
 const char* ffGetGPUVendorString(unsigned vendorId);
 
 #if defined(__linux__) || defined(__FreeBSD__) || defined(__sun)
-void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu, FFstrbuf* coreName);
+void ffGPUFillVendorAndName(uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu);
 #endif

src/detection/gpu/gpu_amd.c

@@ -65,5 +65,11 @@ const char* ffDetectAmdGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverResu
     if (result.type)
         *result.type = device->isAPU ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
 
+    if (result.index)
+        *result.type = (uint32_t) device->adlAdapterIndex;
+
+    if (result.name)
+        ffStrbufSetS(result.name, device->adapterString);
+
     return NULL;
 }

src/detection/gpu/gpu_apple.c

@@ -1,12 +1,13 @@
 #include "gpu.h"
 #include "common/library.h"
 #include "detection/cpu/cpu.h"
-#include "detection/temps/temps_apple.h"
 #include "util/apple/cf_helpers.h"
+#include "util/apple/smc_temps.h"
 
 #include <IOKit/graphics/IOGraphicsLib.h>
 
 const char* ffGpuDetectMetal(FFlist* gpus);
+const char* ffGpuDetectDriverVersion(FFlist* gpus);
 
 static double detectGpuTemp(const FFstrbuf* gpuName)
 {
@@ -185,5 +186,7 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
     }
 
     ffGpuDetectMetal(gpus);
+    if (instance.config.general.detectVersion)
+        ffGpuDetectDriverVersion(gpus);
     return NULL;
 }

src/detection/gpu/gpu_apple.m

@@ -1,6 +1,7 @@
 #include "gpu.h"
 
 #import <Metal/MTLDevice.h>
+#import <IOKit/kext/KextManager.h>
 
 #ifndef MAC_OS_VERSION_13_0
     #define MTLGPUFamilyMetal3 ((MTLGPUFamily) 5001)
@@ -10,6 +11,28 @@
     #define MTLFeatureSet_macOS_GPUFamily2_v1 ((MTLFeatureSet) 10005)
 #endif
 
+const char* ffGpuDetectDriverVersion(FFlist* gpus)
+{
+    if (@available(macOS 10.7, *))
+    {
+        NSMutableArray* arr = NSMutableArray.new;
+        FF_LIST_FOR_EACH(FFGPUResult, x, *gpus)
+            [arr addObject:@(x->driver.chars)];
+
+        NSDictionary* dict = CFBridgingRelease(KextManagerCopyLoadedKextInfo((__bridge CFArrayRef)arr, (__bridge CFArrayRef)@[@"CFBundleVersion"]));
+        FF_LIST_FOR_EACH(FFGPUResult, x, *gpus)
+        {
+            NSString* version = dict[@(x->driver.chars)][@"CFBundleVersion"];
+            if (version)
+            {
+                ffStrbufAppendC(&x->driver, ' ');
+                ffStrbufAppendS(&x->driver, version.UTF8String);
+            }
+        }
+    }
+    return "Unsupported macOS version";
+}
+
 const char* ffGpuDetectMetal(FFlist* gpus)
 {
     if (@available(macOS 10.13, *))
@@ -42,7 +65,8 @@ const char* ffGpuDetectMetal(FFlist* gpus)
             else if ([device supportsFamily:MTLGPUFamilyCommon1])
                 ffStrbufSetStatic(&gpu->platformApi, "Metal Common 1");
 
-            gpu->type = device.hasUnifiedMemory ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
+            gpu->type = device.location == MTLDeviceLocationBuiltIn ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
+            gpu->index = (uint32_t) device.locationNumber;
             #endif
         }
         return NULL;

src/detection/gpu/gpu_asahi.h

@@ -0,0 +1,91 @@
+#if __aarch64__ && FF_HAVE_DRM
+
+#include <drm.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+
+#if __has_include(<drm/asahi_drm.h>)
+
+#include <drm/asahi_drm.h>
+
+#else
+
+// https://github.com/AsahiLinux/linux/blob/asahi/include/uapi/drm/asahi_drm.h
+/* SPDX-License-Identifier: MIT */
+/* Copyright (C) The Asahi Linux Contributors */
+
+#define DRM_ASAHI_UNSTABLE_UABI_VERSION		10011
+
+#define DRM_ASAHI_GET_PARAMS			0x00
+#define DRM_ASAHI_MAX_CLUSTERS	32
+struct drm_asahi_params_global
+{
+    __u32 unstable_uabi_version;
+    __u32 pad0;
+
+    __u64 feat_compat;
+    __u64 feat_incompat;
+
+    __u32 gpu_generation;
+    __u32 gpu_variant;
+    __u32 gpu_revision;
+    __u32 chip_id;
+
+    __u32 num_dies;
+    __u32 num_clusters_total;
+    __u32 num_cores_per_cluster;
+    __u32 num_frags_per_cluster;
+    __u32 num_gps_per_cluster;
+    __u32 num_cores_total_active;
+    __u64 core_masks[DRM_ASAHI_MAX_CLUSTERS];
+
+    __u32 vm_page_size;
+    __u32 pad1;
+    __u64 vm_user_start;
+    __u64 vm_user_end;
+    __u64 vm_usc_start;
+    __u64 vm_usc_end;
+    __u64 vm_kernel_min_size;
+
+    __u32 max_syncs_per_submission;
+    __u32 max_commands_per_submission;
+    __u32 max_commands_in_flight;
+    __u32 max_attachments;
+
+    __u32 timer_frequency_hz;
+    __u32 min_frequency_khz;
+    __u32 max_frequency_khz;
+    __u32 max_power_mw;
+
+    __u32 result_render_size;
+    __u32 result_compute_size;
+
+    __u32 firmware_version[4];
+};
+
+struct drm_asahi_get_params
+{
+    /** @extensions: Pointer to the first extension struct, if any */
+    __u64 extensions;
+
+    /** @param: Parameter group to fetch (MBZ) */
+    __u32 param_group;
+
+    /** @pad: MBZ */
+    __u32 pad;
+
+    /** @value: User pointer to write parameter struct */
+    __u64 pointer;
+
+    /** @value: Size of user buffer, max size supported on return */
+    __u64 size;
+};
+
+enum
+{
+    DRM_IOCTL_ASAHI_GET_PARAMS       = DRM_IOWR(DRM_COMMAND_BASE + DRM_ASAHI_GET_PARAMS, struct drm_asahi_get_params),
+};
+
+#endif // __has_include
+
+#endif // FF_HAVE_DRM

src/detection/gpu/gpu_bsd.c

@@ -8,20 +8,6 @@
 #include <dev/pci/pcireg.h>
 #include <sys/pciio.h>
 #include <fcntl.h>
-#include <paths.h>
-
-static bool loadPciIds(FFstrbuf* pciids)
-{
-    // https://github.com/freebsd/freebsd-src/blob/main/usr.sbin/pciconf/pathnames.h
-
-    ffReadFileBuffer(_PATH_LOCALBASE "/share/pciids/pci.ids", pciids);
-    if (pciids->length > 0) return true;
-
-    ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/share/pciids/pci.ids", pciids);
-    if (pciids->length > 0) return true;
-
-    return false;
-}
 
 const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
 {
@@ -45,8 +31,6 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
     if (pcio.status == PCI_GETCONF_ERROR)
         return "ioctl(fd, PCIOCGETCONF, &pc) returned error";
 
-    FF_STRBUF_AUTO_DESTROY pciids = ffStrbufCreate();
-
     for (uint32_t i = 0; i < pcio.num_matches; ++i)
     {
         struct pci_conf* pc = &confs[i];
@@ -56,29 +40,15 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
         ffStrbufInit(&gpu->name);
         ffStrbufInitS(&gpu->driver, pc->pd_name);
         ffStrbufInit(&gpu->platformApi);
+        gpu->index = FF_GPU_INDEX_UNSET;
         gpu->temperature = FF_GPU_TEMP_UNSET;
         gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
         gpu->coreUsage = FF_GPU_CORE_USAGE_UNSET;
         gpu->type = FF_GPU_TYPE_UNKNOWN;
         gpu->dedicated.total = gpu->dedicated.used = gpu->shared.total = gpu->shared.used = FF_GPU_VMEM_SIZE_UNSET;
-        gpu->deviceId = ((uint64_t) pc->pc_sel.pc_domain << 6) | ((uint64_t) pc->pc_sel.pc_bus << 4) | ((uint64_t) pc->pc_sel.pc_dev << 2) | pc->pc_sel.pc_func;
+        gpu->deviceId = (pc->pc_sel.pc_domain * 100000ull) + (pc->pc_sel.pc_bus * 1000ull) + (pc->pc_sel.pc_dev * 10ull) + pc->pc_sel.pc_func;
         gpu->frequency = FF_GPU_FREQUENCY_UNSET;
 
-        if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_AMD)
-        {
-            char query[32];
-            snprintf(query, sizeof(query), "%X,\t%X,", (unsigned) pc->pc_device, (unsigned) pc->pc_revid);
-            ffParsePropFileData("libdrm/amdgpu.ids", query, &gpu->name);
-        }
-
-        FF_STRBUF_AUTO_DESTROY coreName = ffStrbufCreate();
-        if (gpu->name.length == 0)
-        {
-            if (pciids.length == 0)
-                loadPciIds(&pciids);
-            ffGPUParsePciIds(&pciids, pc->pc_subclass, pc->pc_vendor, pc->pc_device, gpu, &coreName);
-        }
-
         if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_NVIDIA && (options->temp || options->driverSpecific))
         {
             ffDetectNvidiaGpuInfo(&(FFGpuDriverCondition) {
@@ -90,16 +60,29 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
                     .func = pc->pc_sel.pc_func,
                 },
             }, (FFGpuDriverResult) {
+                .index = &gpu->index,
                 .temp = options->temp ? &gpu->temperature : NULL,
                 .memory = options->driverSpecific ? &gpu->dedicated : NULL,
                 .coreCount = options->driverSpecific ? (uint32_t*) &gpu->coreCount : NULL,
                 .type = &gpu->type,
                 .frequency = &gpu->frequency,
                 .coreUsage = &gpu->coreUsage,
-                .name = options->driverSpecific ? &gpu->name : NULL,
+                .name = &gpu->name,
             }, "libnvidia-ml.so");
         }
 
+        if (gpu->name.length == 0)
+        {
+            if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_AMD)
+            {
+                char query[32];
+                snprintf(query, sizeof(query), "%X,\t%X,", (unsigned) pc->pc_device, (unsigned) pc->pc_revid);
+                ffParsePropFileData("libdrm/amdgpu.ids", query, &gpu->name);
+            }
+            if (gpu->name.length == 0)
+            ffGPUFillVendorAndName(pc->pc_subclass, pc->pc_vendor, pc->pc_device, gpu);
+        }
+
         if (gpu->type == FF_GPU_TYPE_UNKNOWN)
         {
             if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_NVIDIA)
@@ -116,12 +99,8 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
             }
             else if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_INTEL)
             {
-                if ((coreName.chars[0] == 'D' || coreName.chars[0] == 'S') &&
-                        coreName.chars[1] == 'G' &&
-                        ffCharIsDigit(coreName.chars[2]))
-                    gpu->type = FF_GPU_TYPE_DISCRETE; // DG1 / DG2 / SG1
-                else
-                    gpu->type = FF_GPU_TYPE_INTEGRATED;
+                // 0000:00:02.0 is reserved for Intel integrated graphics
+                gpu->type = gpu->deviceId == 20 ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
             }
         }
     }

src/detection/gpu/gpu_driver_specific.h

@@ -37,6 +37,7 @@ typedef struct FFGpuDriverCondition
 // detect x if not NULL
 typedef struct FFGpuDriverResult
 {
+    uint32_t* index;
     double* temp;
     FFGPUMemory* memory;
     uint32_t* coreCount;

src/detection/gpu/gpu_intel.c

@@ -195,5 +195,8 @@ const char* ffDetectIntelGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverRe
         }
     }
 
+    if (result.name)
+        ffStrbufSetS(result.name, properties.name);
+
     return NULL;
 }

src/detection/gpu/gpu_linux.c

@@ -1,100 +1,33 @@
 #include "detection/gpu/gpu.h"
 #include "detection/vulkan/vulkan.h"
-#include "detection/temps/temps_linux.h"
 #include "detection/cpu/cpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
 #include "common/io/io.h"
+#include "common/library.h"
 #include "common/properties.h"
 #include "util/stringUtils.h"
+#include "util/mallocHelper.h"
 
 #include <inttypes.h>
 
-#if __aarch64__ && FF_HAVE_DRM
-    #include <drm.h>
+#ifdef FF_HAVE_DRM_AMDGPU
+    #include <amdgpu.h>
+    #include <amdgpu_drm.h>
+    #include <fcntl.h>
+#endif
+
+#ifdef FF_HAVE_DRM
+    #include "intel_drm.h"
     #include <fcntl.h>
     #include <sys/ioctl.h>
-
-    // https://github.com/AsahiLinux/linux/blob/asahi/include/uapi/drm/asahi_drm.h
-    /* SPDX-License-Identifier: MIT */
-    /* Copyright (C) The Asahi Linux Contributors */
-
-    #define DRM_ASAHI_UNSTABLE_UABI_VERSION		10011
-
-    #define DRM_ASAHI_GET_PARAMS			0x00
-    #define DRM_ASAHI_MAX_CLUSTERS	32
-    struct drm_asahi_params_global
-    {
-        __u32 unstable_uabi_version;
-        __u32 pad0;
-
-        __u64 feat_compat;
-        __u64 feat_incompat;
-
-        __u32 gpu_generation;
-        __u32 gpu_variant;
-        __u32 gpu_revision;
-        __u32 chip_id;
-
-        __u32 num_dies;
-        __u32 num_clusters_total;
-        __u32 num_cores_per_cluster;
-        __u32 num_frags_per_cluster;
-        __u32 num_gps_per_cluster;
-        __u32 num_cores_total_active;
-        __u64 core_masks[DRM_ASAHI_MAX_CLUSTERS];
-
-        __u32 vm_page_size;
-        __u32 pad1;
-        __u64 vm_user_start;
-        __u64 vm_user_end;
-        __u64 vm_usc_start;
-        __u64 vm_usc_end;
-        __u64 vm_kernel_min_size;
-
-        __u32 max_syncs_per_submission;
-        __u32 max_commands_per_submission;
-        __u32 max_commands_in_flight;
-        __u32 max_attachments;
-
-        __u32 timer_frequency_hz;
-        __u32 min_frequency_khz;
-        __u32 max_frequency_khz;
-        __u32 max_power_mw;
-
-        __u32 result_render_size;
-        __u32 result_compute_size;
-
-        __u32 firmware_version[4];
-    };
-
-    struct drm_asahi_get_params
-    {
-        /** @extensions: Pointer to the first extension struct, if any */
-        __u64 extensions;
-
-        /** @param: Parameter group to fetch (MBZ) */
-        __u32 param_group;
-
-        /** @pad: MBZ */
-        __u32 pad;
-
-        /** @value: User pointer to write parameter struct */
-        __u64 pointer;
-
-        /** @value: Size of user buffer, max size supported on return */
-        __u64 size;
-    };
-
-    enum
-    {
-        DRM_IOCTL_ASAHI_GET_PARAMS       = DRM_IOWR(DRM_COMMAND_BASE + DRM_ASAHI_GET_PARAMS, struct drm_asahi_get_params),
-    };
 #endif
 
+#include "gpu_asahi.h"
+
 #define FF_STR_INDIR(x) #x
 #define FF_STR(x) FF_STR_INDIR(x)
 
-static bool pciDetectDriver(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer, FF_MAYBE_UNUSED const char* drmKey)
+static bool pciDetectDriver(FFstrbuf* result, FFstrbuf* pciDir, FFstrbuf* buffer, FF_MAYBE_UNUSED const char* drmKey)
 {
     uint32_t pciDirLength = pciDir->length;
     ffStrbufAppendS(pciDir, "/driver");
@@ -106,17 +39,17 @@ static bool pciDetectDriver(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer
     if (slash)
     {
         slash++;
-        ffStrbufSetNS(&gpu->driver, (uint32_t) (resultLength - (slash - pathBuf)), slash);
+        ffStrbufSetNS(result, (uint32_t) (resultLength - (slash - pathBuf)), slash);
     }
 
-    if (ffStrbufEqualS(&gpu->driver, "nvidia"))
+    if (ffStrbufEqualS(result, "nvidia"))
     {
         if (ffReadFileBuffer("/proc/driver/nvidia/version", buffer))
         {
             if (ffStrbufContainS(buffer, " Open "))
-                ffStrbufAppendS(&gpu->driver, " (open source)");
+                ffStrbufAppendS(result, " (open source)");
             else
-                ffStrbufAppendS(&gpu->driver, " (proprietary)");
+                ffStrbufAppendS(result, " (proprietary)");
         }
     }
 
@@ -126,18 +59,18 @@ static bool pciDetectDriver(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer
         if (ffReadFileBuffer(pciDir->chars, buffer))
         {
             ffStrbufTrimRightSpace(buffer);
-            ffStrbufAppendC(&gpu->driver, ' ');
-            ffStrbufAppend(&gpu->driver, buffer);
+            ffStrbufAppendC(result, ' ');
+            ffStrbufAppend(result, buffer);
         }
-        else if (ffStrbufEqualS(&gpu->driver, "zx"))
+        else if (ffStrbufEqualS(result, "zx"))
         {
             ffStrbufSubstrBefore(pciDir, pciDirLength);
             ffStrbufAppendS(pciDir, "/zx_info/driver_version");
             if (ffReadFileBuffer(pciDir->chars, buffer))
             {
                 ffStrbufTrimRightSpace(buffer);
-                ffStrbufAppendC(&gpu->driver, ' ');
-                ffStrbufAppend(&gpu->driver, buffer);
+                ffStrbufAppendC(result, ' ');
+                ffStrbufAppend(result, buffer);
             }
         }
     }
@@ -145,6 +78,98 @@ static bool pciDetectDriver(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer
     return true;
 }
 
+static const char* drmFindRenderFromCard(const char* drmCardKey, FFstrbuf* result)
+{
+    char path[PATH_MAX];
+    sprintf(path, "/sys/class/drm/%s/device/drm", drmCardKey);
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(path);
+    if (!dirp) return "Failed to open `/sys/class/drm/{drmCardKey}/device/drm`";
+
+    struct dirent* entry;
+    while ((entry = readdir(dirp)) != NULL)
+    {
+        if (ffStrStartsWith(entry->d_name, "render"))
+        {
+            ffStrbufSetS(result, "/dev/dri/");
+            ffStrbufAppendS(result, entry->d_name);
+            return NULL;
+        }
+    }
+    return "Failed to find render device";
+}
+
+static const char* drmDetectAmdSpecific(const FFGPUOptions* options, FFGPUResult* gpu, const char* drmKey, FFstrbuf* buffer)
+{
+    #if FF_HAVE_DRM_AMDGPU
+
+    FF_LIBRARY_LOAD(libdrm, "dlopen libdrm_amdgpu" FF_LIBRARY_EXTENSION " failed", "libdrm_amdgpu" FF_LIBRARY_EXTENSION, 1)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_device_initialize)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_get_marketing_name)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_query_gpu_info)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_query_sensor_info)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_query_heap_info)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, amdgpu_device_deinitialize)
+
+    {
+        const char* error = drmFindRenderFromCard(drmKey, buffer);
+        if (error) return error;
+    }
+    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY);
+    if (fd < 0) return "Failed to open DRM device";
+
+    amdgpu_device_handle handle;
+    uint32_t majorVersion, minorVersion;
+    if (ffamdgpu_device_initialize(fd, &majorVersion, &minorVersion, &handle) < 0)
+        return "Failed to initialize AMDGPU device";
+
+    ffStrbufAppendF(&gpu->driver, " %u.%u", (unsigned) majorVersion, (unsigned) minorVersion);
+
+    uint32_t value;
+
+    if (options->temp)
+    {
+        if (ffamdgpu_query_sensor_info(handle, AMDGPU_INFO_SENSOR_GPU_TEMP, sizeof(value), &value) >= 0)
+            gpu->temperature = value / 1000.;
+    }
+
+    ffStrbufSetS(&gpu->name, ffamdgpu_get_marketing_name(handle));
+
+    struct amdgpu_gpu_info gpuInfo;
+    if (ffamdgpu_query_gpu_info(handle, &gpuInfo) >= 0)
+    {
+        gpu->coreCount = (int32_t) gpuInfo.cu_active_number;
+        gpu->frequency = (uint32_t) (gpuInfo.max_engine_clk / 1000u);
+        gpu->index = FF_GPU_INDEX_UNSET;
+        gpu->type = gpuInfo.ids_flags & AMDGPU_IDS_FLAGS_FUSION ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
+
+        struct amdgpu_heap_info heapInfo;
+        if (ffamdgpu_query_heap_info(handle, AMDGPU_GEM_DOMAIN_VRAM, 0, &heapInfo) >= 0)
+        {
+            if (gpu->type == FF_GPU_TYPE_DISCRETE)
+            {
+                gpu->dedicated.total = heapInfo.heap_size;
+                gpu->dedicated.used = heapInfo.heap_usage;
+            }
+            else
+            {
+                gpu->shared.total = heapInfo.heap_size;
+                gpu->shared.used = heapInfo.heap_usage;
+            }
+        }
+    }
+
+    if (ffamdgpu_query_sensor_info(handle, AMDGPU_INFO_SENSOR_GPU_LOAD, sizeof(value), &value) >= 0)
+        gpu->coreUsage = value;
+
+    ffamdgpu_device_deinitialize(handle);
+
+    return NULL;
+    #else
+    FF_UNUSED(options, gpu, drmKey, buffer);
+    return "Fastfetch is compiled without libdrm support";
+    #endif
+}
+
 static void pciDetectAmdSpecific(const FFGPUOptions* options, FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer)
 {
     // https://www.kernel.org/doc/html/v5.10/gpu/amdgpu.html#mem-info-vis-vram-total
@@ -186,6 +211,11 @@ static void pciDetectAmdSpecific(const FFGPUOptions* options, FFGPUResult* gpu,
         ffStrbufAppendS(pciDir, "/mem_info_vis_vram_total");
         if (ffReadFileBuffer(pciDir->chars, buffer) && (value = ffStrbufToUInt(buffer, 0)))
         {
+            if (gpu->type == FF_GPU_TYPE_DISCRETE)
+                gpu->dedicated.total = value;
+            else
+                gpu->shared.total = value;
+
             ffStrbufSubstrBefore(pciDir, pciDir->length - (uint32_t) strlen("/mem_info_vis_vram_total"));
             ffStrbufAppendS(pciDir, "/mem_info_vis_vram_used");
             if (ffReadFileBuffer(pciDir->chars, buffer) && (value = ffStrbufToUInt(buffer, 0)))
@@ -199,61 +229,174 @@ static void pciDetectAmdSpecific(const FFGPUOptions* options, FFGPUResult* gpu,
     }
 }
 
-static void pciDetectIntelSpecific(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer, const FFstrbuf* coreName)
+static void pciDetectIntelSpecific(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer, const char* drmKey)
 {
     // Works for Intel GPUs
     // https://patchwork.kernel.org/project/intel-gfx/patch/1422039866-11572-3-git-send-email-ville.syrjala@linux.intel.com/
 
-    if ((coreName->chars[0] == 'D' || coreName->chars[0] == 'S') &&
-            coreName->chars[1] == 'G' &&
-            ffCharIsDigit(coreName->chars[2]))
-        gpu->type = FF_GPU_TYPE_DISCRETE; // DG1 / DG2 / SG1
-    else
-        gpu->type = FF_GPU_TYPE_INTEGRATED;
+    // 0000:00:02.0 is reserved for Intel integrated graphics
+    gpu->type = gpu->deviceId == 20 ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
+
+    if (!drmKey) return;
 
     if (ffStrbufEqualS(&gpu->driver, "xe"))
-    {
         ffStrbufAppendS(pciDir, "/tile0/gt0/freq0/max_freq");
-    }
     else
-    {
-        ffStrbufAppendS(pciDir, "/drm/");
-        FF_AUTO_CLOSE_DIR DIR* dirp = opendir(pciDir->chars);
-        if (!dirp) return;
-        struct dirent* entry;
-        while ((entry = readdir(dirp)) != NULL)
-        {
-            if (ffStrStartsWith(entry->d_name, "card")) break;
-        }
-        if (!entry) return;
-        ffStrbufAppendS(pciDir, entry->d_name);
-        ffStrbufAppendS(pciDir, "/gt_max_freq_mhz");
-    }
+        ffStrbufAppendF(pciDir, "/drm/%s/gt_max_freq_mhz", drmKey);
     if (ffReadFileBuffer(pciDir->chars, buffer))
         gpu->frequency = (uint32_t) ffStrbufToUInt(buffer, 0);
 }
 
-static bool loadPciIds(FFstrbuf* pciids)
+static inline int popcountBytes(uint8_t* bytes, uint32_t length)
 {
-    #ifdef FF_CUSTOM_PCI_IDS_PATH
+    int count = 0;
+    while (length >= 8)
+    {
+        count += __builtin_popcountll(*(uint64_t*) bytes);
+        bytes += 8;
+        length -= 8;
+    }
+    if (length >= 4)
+    {
+        count += __builtin_popcountl(*(uint32_t*) bytes);
+        bytes += 4;
+        length -= 4;
+    }
+    if (length >= 2)
+    {
+        count += __builtin_popcountl(*(uint16_t*) bytes);
+        bytes += 2;
+        length -= 2;
+    }
+    if (length)
+    {
+        count += __builtin_popcountl(*(uint8_t*) bytes);
+    }
+    return count;
+}
 
-    ffReadFileBuffer(FF_STR(FF_CUSTOM_PCI_IDS_PATH), pciids);
-    if (pciids->length > 0) return true;
+static const char* drmDetectIntelSpecific(FFGPUResult* gpu, const char* drmKey, FFstrbuf* buffer)
+{
+    #if FF_HAVE_DRM
+    ffStrbufSetS(buffer, "/dev/dri/");
+    ffStrbufAppendS(buffer, drmKey);
+    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY);
+    if (fd < 0) return "Failed to open drm device";
 
+    if (ffStrbufEqualS(&gpu->driver, "xe"))
+    {
+        {
+            struct drm_xe_device_query query = {
+                .extensions = 0,
+                .query = DRM_XE_DEVICE_QUERY_GT_TOPOLOGY,
+                .size = 0,
+                .data = 0,
+            };
+            if (ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query) >= 0)
+            {
+                FF_AUTO_FREE uint8_t* buffer = malloc(query.size);
+                query.data = (uintptr_t) buffer;
+                if (ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query) >= 0)
+                {
+                    int dssCount = 0, euPerDssCount = 0;
+                    for (struct drm_xe_query_topology_mask* topo = (void*) buffer;
+                        (uint8_t*) topo < buffer + query.size;
+                        topo = (void*) (topo->mask + topo->num_bytes)
+                    ) {
+                        switch (topo->type)
+                        {
+                            case DRM_XE_TOPO_DSS_COMPUTE:
+                            case DRM_XE_TOPO_DSS_GEOMETRY:
+                                dssCount += popcountBytes(topo->mask, topo->num_bytes);
+                                break;
+                            case DRM_XE_TOPO_EU_PER_DSS:
+                                euPerDssCount += popcountBytes(topo->mask, topo->num_bytes);
+                                break;
+                        }
+                    }
+                    gpu->coreCount = dssCount * euPerDssCount;
+                }
+            }
+        }
+
+        {
+            struct drm_xe_device_query query = {
+                .query = DRM_XE_DEVICE_QUERY_MEM_REGIONS,
+            };
+            if (ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query) >= 0)
+            {
+                FF_AUTO_FREE uint8_t* buffer = malloc(query.size);
+                query.data = (uintptr_t) buffer;
+                if (ioctl(fd, DRM_IOCTL_XE_DEVICE_QUERY, &query) >= 0)
+                {
+                    gpu->dedicated.total = gpu->shared.total = gpu->dedicated.used = gpu->shared.used = 0;
+                    struct drm_xe_query_mem_regions* regionInfo = (void*) buffer;
+                    for (uint32_t i = 0; i < regionInfo->num_mem_regions; i++)
+                    {
+                        struct drm_xe_mem_region* region = regionInfo->mem_regions + i;
+                        switch (region->mem_class)
+                        {
+                            case DRM_XE_MEM_REGION_CLASS_SYSMEM:
+                                gpu->shared.total += region->total_size;
+                                gpu->shared.used += region->used;
+                                break;
+                            case DRM_XE_MEM_REGION_CLASS_VRAM:
+                                gpu->dedicated.total += region->total_size;
+                                gpu->dedicated.used += region->used;
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    else if (ffStrbufEqualS(&gpu->driver, "i915"))
+    {
+        {
+            int value;
+            drm_i915_getparam_t getparam = { .param = I915_PARAM_EU_TOTAL, .value = &value };
+            if (ioctl(fd, DRM_IOCTL_I915_GETPARAM, &getparam) >= 0)
+                gpu->coreCount = value;
+        }
+        {
+            struct drm_i915_query_item queryItem = {
+                .query_id = DRM_I915_QUERY_MEMORY_REGIONS,
+            };
+            struct drm_i915_query query = {
+                .items_ptr = (uintptr_t) &queryItem,
+                .num_items = 1,
+            };
+            if (ioctl(fd, DRM_IOCTL_I915_QUERY, &query) >= 0 )
+            {
+                FF_AUTO_FREE uint8_t* buffer = calloc(1, (size_t) queryItem.length);
+                queryItem.data_ptr = (uintptr_t) buffer;
+                if (ioctl(fd, DRM_IOCTL_I915_QUERY, &query) >= 0)
+                {
+                    gpu->dedicated.total = gpu->shared.total = gpu->dedicated.used = gpu->shared.used = 0;
+                    struct drm_i915_query_memory_regions* regionInfo = (void*) buffer;
+                    for (uint32_t i = 0; i < regionInfo->num_regions; i++)
+                    {
+                        struct drm_i915_memory_region_info* region = regionInfo->regions + i;
+                        switch (region->region.memory_class)
+                        {
+                            case I915_MEMORY_CLASS_SYSTEM:
+                                gpu->shared.total += region->probed_size;
+                                gpu->shared.used += region->probed_size - region->unallocated_size;
+                                break;
+                            case I915_MEMORY_CLASS_DEVICE:
+                                gpu->dedicated.total += region->probed_size;
+                                gpu->dedicated.used += region->probed_size - region->unallocated_size;
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return NULL;
     #else
-
-    ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/share/hwdata/pci.ids", pciids);
-    if (pciids->length > 0) return true;
-
-    ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/share/misc/pci.ids", pciids); // debian?
-    if (pciids->length > 0) return true;
-
-    ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/local/share/hwdata/pci.ids", pciids);
-    if (pciids->length > 0) return true;
-
+    return "Fastfetch is not compiled with drm support";
     #endif
-
-    return false;
 }
 
 static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf* buffer, FFstrbuf* deviceDir, const char* drmKey)
@@ -262,7 +405,7 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
     uint32_t vendorId, deviceId, subVendorId, subDeviceId;
     uint8_t classId, subclassId;
     if (sscanf(buffer->chars + strlen("pci:"), "v%8" SCNx32 "d%8" SCNx32 "sv%8" SCNx32 "sd%8" SCNx32 "bc%2" SCNx8 "sc%2" SCNx8, &vendorId, &deviceId, &subVendorId, &subDeviceId, &classId, &subclassId) != 6)
-        return "Invalid modalias string";
+        return "Failed to parse pci modalias";
 
     if (classId != 0x03 /*PCI_BASE_CLASS_DISPLAY*/)
         return "Not a GPU device";
@@ -295,61 +438,78 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
     ffStrbufInit(&gpu->name);
     ffStrbufInit(&gpu->driver);
     ffStrbufInit(&gpu->platformApi);
+    gpu->index = FF_GPU_INDEX_UNSET;
     gpu->temperature = FF_GPU_TEMP_UNSET;
     gpu->coreUsage = FF_GPU_CORE_USAGE_UNSET;
     gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
     gpu->type = FF_GPU_TYPE_UNKNOWN;
     gpu->dedicated.total = gpu->dedicated.used = gpu->shared.total = gpu->shared.used = FF_GPU_VMEM_SIZE_UNSET;
-    gpu->deviceId = ((uint64_t) pciDomain << 6) | ((uint64_t) pciBus << 4) | (deviceId << 2) | pciFunc;
+    gpu->deviceId = (pciDomain * 100000ull) + (pciBus * 1000ull) + (pciDevice * 10ull) + pciFunc;
     gpu->frequency = FF_GPU_FREQUENCY_UNSET;
 
-    if (drmKey) ffStrbufSetF(&gpu->platformApi, "DRM (%s)", drmKey);
-
-    if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_AMD)
+    char drmKeyBuffer[8];
+    if (!drmKey)
     {
-        ffStrbufAppendS(deviceDir, "/revision");
-        if (ffReadFileBuffer(deviceDir->chars, buffer))
+        ffStrbufAppendS(deviceDir, "/drm");
+        FF_AUTO_CLOSE_DIR DIR* dirp = opendir(deviceDir->chars);
+        if (dirp)
         {
-            char* pend;
-            uint64_t revision = strtoul(buffer->chars, &pend, 16);
-            if (pend != buffer->chars)
+            struct dirent* entry;
+            while ((entry = readdir(dirp)) != NULL)
             {
-                char query[32];
-                snprintf(query, sizeof(query), "%X,\t%X,", (unsigned) deviceId, (unsigned) revision);
-                #ifdef FF_CUSTOM_AMDGPU_IDS_PATH
-                ffParsePropFile(FF_STR(FF_CUSTOM_AMDGPU_IDS_PATH), query, &gpu->name);
-                #else
-                ffParsePropFileData("libdrm/amdgpu.ids", query, &gpu->name);
-                #endif
+                if (ffStrStartsWith(entry->d_name, "card"))
+                {
+                    strncpy(drmKeyBuffer, entry->d_name, sizeof(drmKeyBuffer) - 1);
+                    drmKeyBuffer[sizeof(drmKeyBuffer) - 1] = '\0';
+                    drmKey = drmKeyBuffer;
+                    break;
+                }
             }
         }
         ffStrbufSubstrBefore(deviceDir, drmDirPathLength);
     }
 
-    FF_STRBUF_AUTO_DESTROY coreName = ffStrbufCreate();
-    if (gpu->name.length == 0)
-    {
-        static FFstrbuf pciids;
-        if (pciids.chars == NULL)
-        {
-            ffStrbufInit(&pciids);
-            loadPciIds(&pciids);
-        }
-        ffGPUParsePciIds(&pciids, subclassId, (uint16_t) vendorId, (uint16_t) deviceId, gpu, &coreName);
-    }
+    if (drmKey) ffStrbufSetF(&gpu->platformApi, "DRM (%s)", drmKey);
 
-    pciDetectDriver(gpu, deviceDir, buffer, drmKey);
+    pciDetectDriver(&gpu->driver, deviceDir, buffer, drmKey);
     ffStrbufSubstrBefore(deviceDir, drmDirPathLength);
 
     if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_AMD)
     {
-        pciDetectAmdSpecific(options, gpu, deviceDir, buffer);
-        ffStrbufSubstrBefore(deviceDir, drmDirPathLength);
+        bool ok = false;
+        if (drmKey && options->driverSpecific)
+            ok = drmDetectAmdSpecific(options, gpu, drmKey, buffer) == NULL;
+
+        if (!ok)
+        {
+            pciDetectAmdSpecific(options, gpu, deviceDir, buffer);
+            ffStrbufSubstrBefore(deviceDir, drmDirPathLength);
+
+            ffStrbufAppendS(deviceDir, "/revision");
+            if (ffReadFileBuffer(deviceDir->chars, buffer))
+            {
+                char* pend;
+                uint64_t revision = strtoul(buffer->chars, &pend, 16);
+                if (pend != buffer->chars)
+                {
+                    char query[32];
+                    snprintf(query, sizeof(query), "%X,\t%X,", (unsigned) deviceId, (unsigned) revision);
+                    #ifdef FF_CUSTOM_AMDGPU_IDS_PATH
+                    ffParsePropFile(FF_STR(FF_CUSTOM_AMDGPU_IDS_PATH), query, &gpu->name);
+                    #else
+                    ffParsePropFileData("libdrm/amdgpu.ids", query, &gpu->name);
+                    #endif
+                }
+            }
+            ffStrbufSubstrBefore(deviceDir, drmDirPathLength);
+        }
     }
     else if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_INTEL)
     {
-        pciDetectIntelSpecific(gpu, deviceDir, buffer, &coreName);
+        pciDetectIntelSpecific(gpu, deviceDir, buffer, drmKey);
         ffStrbufSubstrBefore(deviceDir, drmDirPathLength);
+        if (options->driverSpecific && drmKey)
+            drmDetectIntelSpecific(gpu, drmKey, buffer);
     }
     else
     {
@@ -366,13 +526,14 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
                     .func = pciFunc,
                 },
             }, (FFGpuDriverResult) {
+                .index = &gpu->index,
                 .temp = options->temp ? &gpu->temperature : NULL,
                 .memory = options->driverSpecific ? &gpu->dedicated : NULL,
                 .coreCount = options->driverSpecific ? (uint32_t*) &gpu->coreCount : NULL,
                 .coreUsage = options->driverSpecific ? &gpu->coreUsage : NULL,
                 .type = &gpu->type,
                 .frequency = options->driverSpecific ? &gpu->frequency : NULL,
-                .name = options->driverSpecific ? &gpu->name : NULL,
+                .name = &gpu->name,
             }, soName);
         }
 
@@ -393,23 +554,92 @@ static const char* detectPci(const FFGPUOptions* options, FFlist* gpus, FFstrbuf
         }
     }
 
+    if (gpu->name.length == 0)
+        ffGPUFillVendorAndName(subclassId, (uint16_t) vendorId, (uint16_t) deviceId, gpu);
+
     return NULL;
 }
 
 #if __aarch64__
 
-FF_MAYBE_UNUSED static const char* detectAsahi(FFlist* gpus, FFstrbuf* buffer, FFstrbuf* drmDir, const char* drmKey)
+FF_MAYBE_UNUSED static const char* drmDetectAsahiSpecific(FFGPUResult* gpu, const char* name, FFstrbuf* buffer, const char* drmKey)
 {
-    uint32_t index = ffStrbufFirstIndexS(buffer, "apple,agx-t");
-    if (index == buffer->length) return "display-subsystem?";
-    index += (uint32_t) strlen("apple,agx-t");
+    if (sscanf(name, "agx-t%lu", &gpu->deviceId) == 1)
+        ffStrbufSetStatic(&gpu->name, ffCPUAppleCodeToName((uint32_t) gpu->deviceId));
+    ffStrbufSetStatic(&gpu->vendor, FF_GPU_VENDOR_NAME_APPLE);
+
+    #if FF_HAVE_DRM
+    ffStrbufSetS(buffer, "/dev/dri/");
+    ffStrbufAppendS(buffer, drmKey);
+    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY);
+    if (fd >= 0)
+    {
+        struct drm_asahi_params_global paramsGlobal = {};
+        if (ioctl(fd, DRM_IOCTL_ASAHI_GET_PARAMS, &(struct drm_asahi_get_params) {
+            .param_group = DRM_ASAHI_GET_PARAMS,
+            .pointer = (uint64_t) &paramsGlobal,
+            .size = sizeof(paramsGlobal),
+        }) >= 0)
+        {
+            ffStrbufAppendF(&gpu->driver, " %u", paramsGlobal.unstable_uabi_version);
+
+            // FIXME: They will introduce ABI breaking changes. Always check the latest version
+            // https://www.reddit.com/r/AsahiLinux/comments/1ei2qiv/comment/lgm0v5s/
+            if (paramsGlobal.unstable_uabi_version == DRM_ASAHI_UNSTABLE_UABI_VERSION)
+            {
+                gpu->coreCount = (int) paramsGlobal.num_cores_total_active;
+                gpu->frequency = paramsGlobal.max_frequency_khz / 1000;
+                gpu->deviceId = paramsGlobal.chip_id;
+
+                if (!gpu->name.length)
+                {
+                    const char* variant = " Unknown";
+                    switch (paramsGlobal.gpu_variant) {
+                    case 'G':
+                        variant = "";
+                        break;
+                    case 'S':
+                        variant = " Pro";
+                        break;
+                    case 'C':
+                        variant = " Max";
+                        break;
+                    case 'D':
+                        variant = " Ultra";
+                        break;
+                    }
+                    ffStrbufSetF(&gpu->name, "Apple M%d%s (G%d%c %02X)",
+                        paramsGlobal.gpu_generation - 12, variant,
+                        paramsGlobal.gpu_generation, paramsGlobal.gpu_variant,
+                        paramsGlobal.gpu_revision + 0xA0);
+                }
+            }
+        }
+    }
+    #endif
+
+    return NULL;
+}
+#endif
+
+static const char* detectOf(FFlist* gpus, FFstrbuf* buffer, FFstrbuf* drmDir, const char* drmKey)
+{
+    char compatible[256]; // vendor,model-name
+    if (sscanf(buffer->chars + strlen("of:"), "NgpuT%*[^C]C%256[^C]", compatible) != 1)
+        return "Failed to parse of modalias or not a GPU device";
+
+    char* name = strchr(compatible, ',');
+    if (name)
+    {
+        *name = '\0';
+        ++name;
+    }
 
     FFGPUResult* gpu = (FFGPUResult*)ffListAdd(gpus);
-    gpu->deviceId = strtoul(buffer->chars + index, NULL, 10);
-    ffStrbufInitStatic(&gpu->name, ffCPUAppleCodeToName((uint32_t) gpu->deviceId));
-    if (!gpu->name.length)
-        ffStrbufAppendF(&gpu->name, "Apple Silicon T%u", (uint32_t) gpu->deviceId);
-    ffStrbufInitStatic(&gpu->vendor, FF_GPU_VENDOR_NAME_APPLE);
+    gpu->index = FF_GPU_INDEX_UNSET;
+    gpu->deviceId = 0;
+    ffStrbufInit(&gpu->name);
+    ffStrbufInit(&gpu->vendor);
     ffStrbufInit(&gpu->driver);
     ffStrbufInitF(&gpu->platformApi, "DRM (%s)", drmKey);
     gpu->temperature = FF_GPU_TEMP_UNSET;
@@ -419,36 +649,23 @@ FF_MAYBE_UNUSED static const char* detectAsahi(FFlist* gpus, FFstrbuf* buffer, F
     gpu->dedicated.total = gpu->dedicated.used = gpu->shared.total = gpu->shared.used = FF_GPU_VMEM_SIZE_UNSET;
     gpu->frequency = FF_GPU_FREQUENCY_UNSET;
 
-    pciDetectDriver(gpu, drmDir, buffer, drmKey);
+    pciDetectDriver(&gpu->driver, drmDir, buffer, drmKey);
 
-    #if FF_HAVE_DRM
-    ffStrbufSetS(buffer, "/dev/dri/");
-    ffStrbufAppendS(buffer, drmKey);
-    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY);
-    if (fd >= 0)
-    {
-        struct drm_asahi_params_global paramsGlobal = {};
-        if (ioctl(fd, DRM_IOCTL_ASAHI_GET_PARAMS, &(struct drm_asahi_get_params){
-            .param_group = DRM_ASAHI_GET_PARAMS,
-            .pointer = (uint64_t) &paramsGlobal,
-            .size = sizeof(paramsGlobal),
-        }) >= 0)
-        {
-            // FIXME: They will introduce ABI breaking changes. Always check the latest version
-            // https://www.reddit.com/r/AsahiLinux/comments/1ei2qiv/comment/lgm0v5s/
-            if (paramsGlobal.unstable_uabi_version == DRM_ASAHI_UNSTABLE_UABI_VERSION)
-            {
-                gpu->coreCount = (int) paramsGlobal.num_cores_total_active;
-                gpu->frequency = paramsGlobal.max_frequency_khz / 1000;
-                gpu->deviceId = paramsGlobal.chip_id;
-            }
-        }
-    }
+    #ifdef __aarch64__
+    if (ffStrbufEqualS(&gpu->driver, "asahi"))
+        drmDetectAsahiSpecific(gpu, name, buffer, drmKey);
     #endif
 
+    if (!gpu->name.length)
+        ffStrbufSetS(&gpu->name, name ? name : compatible);
+    if (!gpu->vendor.length && name)
+    {
+        compatible[0] = (char) toupper(compatible[0]);
+        ffStrbufSetS(&gpu->vendor, compatible);
+    }
+
     return NULL;
 }
-#endif
 
 static const char* drmDetectGPUs(const FFGPUOptions* options, FFlist* gpus)
 {
@@ -478,10 +695,8 @@ static const char* drmDetectGPUs(const FFGPUOptions* options, FFlist* gpus)
 
         if (ffStrbufStartsWithS(&buffer, "pci:"))
             detectPci(options, gpus, &buffer, &drmDir, entry->d_name);
-        #ifdef __aarch64__
         else if (ffStrbufStartsWithS(&buffer, "of:"))
-            detectAsahi(gpus, &buffer, &drmDir, entry->d_name);
-        #endif
+            detectOf(gpus, &buffer, &drmDir, entry->d_name);
 
         ffStrbufSubstrBefore(&drmDir, drmDirLength);
     }

src/detection/gpu/gpu_mthreads.c

@@ -5,6 +5,7 @@
 
 struct FFMtmlData
 {
+    FF_LIBRARY_SYMBOL(mtmlDeviceCountGpuCores)
     FF_LIBRARY_SYMBOL(mtmlDeviceGetBrand)
     FF_LIBRARY_SYMBOL(mtmlDeviceGetIndex)
     FF_LIBRARY_SYMBOL(mtmlDeviceGetName)
@@ -29,7 +30,7 @@ struct FFMtmlData
     MtmlSystem *sys;
 } mtmlData;
 
-static void shutdownMtml()
+FF_MAYBE_UNUSED static void shutdownMtml(void)
 {
     mtmlData.ffmtmlLibraryShutDown(mtmlData.lib);
 }
@@ -43,6 +44,7 @@ const char *ffDetectMthreadsGpuInfo(const FFGpuDriverCondition *cond, FFGpuDrive
         mtmlData.inited = true;
         FF_LIBRARY_LOAD(libmtml, "dlopen mtml failed", soName, 1);
         FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libmtml, mtmlLibraryInit)
+        FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libmtml, mtmlData, mtmlDeviceCountGpuCores)
         FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libmtml, mtmlData, mtmlDeviceGetBrand)
         FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libmtml, mtmlData, mtmlDeviceGetIndex)
         FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libmtml, mtmlData, mtmlDeviceGetName)
@@ -132,6 +134,13 @@ const char *ffDetectMthreadsGpuInfo(const FFGpuDriverCondition *cond, FFGpuDrive
         }
     }
 
+    if (result.index)
+    {
+        unsigned int value;
+        if (mtmlData.ffmtmlDeviceGetIndex(device, &value) == MTML_SUCCESS)
+            *result.index = value;
+    }
+
     if (result.temp)
     {
         MtmlGpu *gpu = NULL;
@@ -158,6 +167,9 @@ const char *ffDetectMthreadsGpuInfo(const FFGpuDriverCondition *cond, FFGpuDrive
         }
     }
 
+    if (result.coreCount)
+        mtmlData.ffmtmlDeviceCountGpuCores(device, result.coreCount);
+
     if (result.frequency)
     {
         MtmlGpu *gpu = NULL;

src/detection/gpu/gpu_nvidia.c

@@ -14,6 +14,7 @@ struct FFNvmlData {
     FF_LIBRARY_SYMBOL(nvmlDeviceGetMaxClockInfo)
     FF_LIBRARY_SYMBOL(nvmlDeviceGetUtilizationRates)
     FF_LIBRARY_SYMBOL(nvmlDeviceGetBrand)
+    FF_LIBRARY_SYMBOL(nvmlDeviceGetIndex)
     FF_LIBRARY_SYMBOL(nvmlDeviceGetName)
 
     bool inited;
@@ -39,6 +40,7 @@ const char* ffDetectNvidiaGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverR
         FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libnvml, nvmlData, nvmlDeviceGetMaxClockInfo)
         FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libnvml, nvmlData, nvmlDeviceGetUtilizationRates)
         FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libnvml, nvmlData, nvmlDeviceGetBrand)
+        FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libnvml, nvmlData, nvmlDeviceGetIndex)
         FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libnvml, nvmlData, nvmlDeviceGetName)
 
         if (ffnvmlInit_v2() != NVML_SUCCESS)
@@ -105,6 +107,14 @@ const char* ffDetectNvidiaGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverR
         }
     }
 
+    if (result.index)
+    {
+        unsigned int value;
+        if (nvmlData.ffnvmlDeviceGetIndex(device, &value) == NVML_SUCCESS)
+            *result.index = value;
+    }
+
+
     if (result.temp)
     {
         uint32_t value;

src/detection/gpu/gpu_pci.c

@@ -1,6 +1,54 @@
 #include "gpu.h"
+#include "common/io/io.h"
 
-void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu, FFstrbuf* coreName)
+#include <stdlib.h>
+#ifdef __FreeBSD__
+#include <paths.h>
+#endif
+
+#if FF_HAVE_EMBEDDED_PCIIDS
+#include "fastfetch_pciids.c.inc"
+#endif
+
+#define FF_STR_INDIR(x) #x
+#define FF_STR(x) FF_STR_INDIR(x)
+
+static const FFstrbuf* loadPciIds()
+{
+    static FFstrbuf pciids;
+
+    if (pciids.chars) return &pciids;
+    ffStrbufInit(&pciids);
+
+    #ifdef FF_CUSTOM_PCI_IDS_PATH
+
+        ffReadFileBuffer(FF_STR(FF_CUSTOM_PCI_IDS_PATH), &pciids);
+
+    #else // FF_CUSTOM_PCI_IDS_PATH
+
+        #if __linux__
+        ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/share/hwdata/pci.ids", &pciids);
+        if (pciids.length == 0)
+        {
+            ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/share/misc/pci.ids", &pciids); // debian?
+            if (pciids.length == 0)
+                ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/local/share/hwdata/pci.ids", &pciids);
+        }
+        #elif __FreeBSD__
+        // https://github.com/freebsd/freebsd-src/blob/main/usr.sbin/pciconf/pathnames.h
+        ffReadFileBuffer(_PATH_LOCALBASE "/share/pciids/pci.ids", &pciids);
+        if (pciids.length == 0)
+            ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/share/pciids/pci.ids", &pciids);
+        #elif __sun
+        ffReadFileBuffer(FASTFETCH_TARGET_DIR_ROOT "/usr/share/hwdata/pci.ids", &pciids);
+        #endif
+
+    #endif // FF_CUSTOM_PCI_IDS_PATH
+
+    return &pciids;
+}
+
+static void parsePciIdsFile(const FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu)
 {
     if (content->length)
     {
@@ -52,11 +100,6 @@ void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint
                     {
                         openingBracket++;
                         ffStrbufSetNS(&gpu->name, (uint32_t) (closingBracket - openingBracket), openingBracket);
-                        if (coreName)
-                        {
-                            ffStrbufSetNS(coreName, (uint32_t) (openingBracket - start) - 1, start);
-                            ffStrbufTrimRight(coreName, ' ');
-                        }
                     }
                 }
                 if (!gpu->name.length)
@@ -79,3 +122,66 @@ void ffGPUParsePciIds(FFstrbuf* content, uint8_t subclass, uint16_t vendor, uint
         ffStrbufSetF(&gpu->name, "%s Device %04X%s", gpu->vendor.length ? gpu->vendor.chars : "Unknown", device, subclassStr);
     }
 }
+
+#if FF_HAVE_EMBEDDED_PCIIDS
+static inline int pciDeviceCmp(const uint16_t* key, const FFPciDevice* element)
+{
+    return (int) *key - (int) element->id;
+}
+
+static bool loadPciidsInc(uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu)
+{
+    for (const FFPciVendor* pvendor = ffPciVendors; pvendor->name; pvendor++)
+    {
+        if (pvendor->id != vendor) continue;
+
+        if (!gpu->vendor.length)
+            ffStrbufSetS(&gpu->vendor, pvendor->name);
+
+        const FFPciDevice* pdevice = (const FFPciDevice*) bsearch(&device, pvendor->devices, pvendor->nDevices, sizeof(FFPciDevice), (void*) pciDeviceCmp);
+
+        if (pdevice)
+        {
+            uint32_t nameLen = (uint32_t) strlen(pdevice->name);
+            const char* closingBracket = pdevice->name + nameLen - 1;
+            if (*closingBracket == ']')
+            {
+                const char* openingBracket = memrchr(pdevice->name, '[', nameLen - 1);
+                if (openingBracket)
+                {
+                    openingBracket++;
+                    ffStrbufSetNS(&gpu->name, (uint32_t) (closingBracket - openingBracket), openingBracket);
+                }
+            }
+            if (!gpu->name.length)
+                ffStrbufSetNS(&gpu->name, nameLen, pdevice->name);
+            return true;
+        }
+
+        if (!gpu->name.length)
+        {
+            const char* subclassStr;
+            switch (subclass)
+            {
+            case 0 /*PCI_CLASS_DISPLAY_VGA*/: subclassStr = " (VGA compatible)"; break;
+            case 1 /*PCI_CLASS_DISPLAY_XGA*/: subclassStr = " (XGA compatible)"; break;
+            case 2 /*PCI_CLASS_DISPLAY_3D*/: subclassStr = " (3D)"; break;
+            default: subclassStr = ""; break;
+            }
+
+            ffStrbufSetF(&gpu->name, "%s Device %04X%s", gpu->vendor.length ? gpu->vendor.chars : "Unknown", device, subclassStr);
+        }
+        return true;
+    }
+    return false;
+}
+#endif
+
+void ffGPUFillVendorAndName(uint8_t subclass, uint16_t vendor, uint16_t device, FFGPUResult* gpu)
+{
+    #if FF_HAVE_EMBEDDED_PCIIDS
+    bool ok = loadPciidsInc(subclass, vendor, device, gpu);
+    if (ok) return;
+    #endif
+    return parsePciIdsFile(loadPciIds(), subclass, vendor, device, gpu);
+}

src/detection/gpu/gpu_sunos.c

@@ -20,8 +20,6 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
     if (!ffStrbufStartsWithS(&buffer, "\npci "))
         return "Invalid scanpci result";
 
-    FF_STRBUF_AUTO_DESTROY pciids = ffStrbufCreate();
-
     // pci bus 0x0000 cardnum 0x00 function 0x00: vendor 0x1414 device 0x008e
     //  Device unknown
     //  CardVendor 0x0000 card 0x0000 (Card unknown)
@@ -57,6 +55,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
         ffStrbufInit(&gpu->name);
         ffStrbufInit(&gpu->driver);
         ffStrbufInit(&gpu->platformApi);
+        gpu->index = FF_GPU_INDEX_UNSET;
         gpu->temperature = FF_GPU_TEMP_UNSET;
         gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
         gpu->coreUsage = FF_GPU_CORE_USAGE_UNSET;
@@ -74,9 +73,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
 
         if (gpu->name.length == 0)
         {
-            if (pciids.length == 0)
-                ffReadFileBuffer(FASTFETCH_TARGET_DIR_ROOT "/usr/share/hwdata/pci.ids", &pciids);
-            ffGPUParsePciIds(&pciids, (uint8_t) subclass, (uint16_t) vendorId, (uint16_t) deviceId, gpu, NULL);
+            ffGPUFillVendorAndName((uint8_t) subclass, (uint16_t) vendorId, (uint16_t) deviceId, gpu);
         }
     }
 

src/detection/gpu/gpu_windows.c

@@ -38,6 +38,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
         ffStrbufInit(&gpu->name);
         ffStrbufInit(&gpu->driver);
         ffStrbufInitStatic(&gpu->platformApi, "SetupAPI");
+        gpu->index = FF_GPU_INDEX_UNSET;
         gpu->temperature = FF_GPU_TEMP_UNSET;
         gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
         gpu->coreUsage = FF_GPU_CORE_USAGE_UNSET;
@@ -46,9 +47,18 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
         gpu->deviceId = 0;
         gpu->frequency = FF_GPU_FREQUENCY_UNSET;
 
+        uint32_t pciBus = 0, pciAddr = UINT32_MAX, pciDev = 0, pciFunc = 0;
+        if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_BUSNUMBER, NULL, (PBYTE) &pciBus, sizeof(pciBus), NULL) &&
+            SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_ADDRESS, NULL, (PBYTE) &pciAddr, sizeof(pciAddr), NULL))
+        {
+            pciDev = (pciAddr >> 16) & 0xFFFF;
+            pciFunc = pciAddr & 0xFFFF;
+            gpu->deviceId = (pciBus * 1000ull) + (pciDev * 10ull) + pciFunc;
+        }
+
         wchar_t buffer[256];
-        if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_DEVICEDESC, NULL, (PBYTE) buffer, sizeof(buffer), NULL))
-            ffStrbufSetWS(&gpu->name, buffer);
+
+        uint64_t adapterLuid = 0;
 
         FF_HKEY_AUTO_DESTROY hVideoIdKey = SetupDiOpenDevRegKey(hdev, &did, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_QUERY_VALUE);
         if (!hVideoIdKey) continue;
@@ -60,9 +70,19 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
             FF_HKEY_AUTO_DESTROY hDirectxKey = NULL;
             if (ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, regDirectxKey, &hDirectxKey, NULL))
             {
+                uint32_t vendorId = 0;
+                if(ffRegReadUint(hDirectxKey, L"VendorId", &vendorId, NULL) && vendorId)
+                    ffStrbufSetStatic(&gpu->vendor, ffGetGPUVendorString(vendorId));
+
+                if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_INTEL)
+                    gpu->type = gpu->deviceId == 20 ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
+
                 uint64_t dedicatedVideoMemory = 0;
                 if(ffRegReadUint64(hDirectxKey, L"DedicatedVideoMemory", &dedicatedVideoMemory, NULL))
-                    gpu->type = dedicatedVideoMemory >= 1024 * 1024 * 1024 ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
+                {
+                    if (gpu->type == FF_GPU_TYPE_UNKNOWN)
+                        gpu->type = dedicatedVideoMemory >= 1024 * 1024 * 1024 ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
+                }
 
                 uint64_t dedicatedSystemMemory, sharedSystemMemory;
                 if(ffRegReadUint64(hDirectxKey, L"DedicatedSystemMemory", &dedicatedSystemMemory, NULL) &&
@@ -72,7 +92,10 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
                     gpu->shared.total = sharedSystemMemory;
                 }
 
-                ffRegReadUint64(hDirectxKey, L"AdapterLuid", &gpu->deviceId, NULL);
+                if (ffRegReadUint64(hDirectxKey, L"AdapterLuid", &adapterLuid, NULL))
+                {
+                    if (!gpu->deviceId) gpu->deviceId = adapterLuid;
+                }
 
                 uint32_t featureLevel = 0;
                 if(ffRegReadUint(hDirectxKey, L"MaxD3D12FeatureLevel", &featureLevel, NULL) && featureLevel)
@@ -90,10 +113,6 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
                         (unsigned) (driverVersion >> 0) & 0xFFFF
                     );
                 }
-
-                uint32_t vendorId = 0;
-                if(ffRegReadUint(hDirectxKey, L"VendorId", &vendorId, NULL) && vendorId)
-                    ffStrbufSetStatic(&gpu->vendor, ffGetGPUVendorString(vendorId));
             }
         }
 
@@ -131,43 +150,43 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
                 ffStrbufSetStatic(&gpu->vendor, ffGetGPUVendorString(vendorId));
             }
 
-            uint32_t pciBus, pciAddr;
-            if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_BUSNUMBER, NULL, (PBYTE) &pciBus, sizeof(pciBus), NULL) &&
-                SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_ADDRESS, NULL, (PBYTE) &pciAddr, sizeof(pciAddr), NULL))
-            {
-                uint32_t pciDev = (pciAddr >> 16) & 0xFFFF;
-                uint32_t pciFunc = pciAddr & 0xFFFF;
+            detectFn(
+                &(FFGpuDriverCondition) {
+                    .type = FF_GPU_DRIVER_CONDITION_TYPE_DEVICE_ID
+                            | (adapterLuid > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_LUID : 0)
+                            | (pciAddr > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_BUS_ID : 0),
+                    .pciDeviceId = {
+                        .deviceId = deviceId,
+                        .vendorId = vendorId,
+                        .subSystemId = subSystemId,
+                        .revId = revId,
+                    },
+                    .pciBusId = {
+                        .domain = 0,
+                        .bus = pciBus,
+                        .device = pciDev,
+                        .func = pciFunc,
+                    },
+                    .luid = adapterLuid,
+                },
+                (FFGpuDriverResult){
+                    .index = &gpu->index,
+                    .temp = options->temp ? &gpu->temperature : NULL,
+                    .memory = options->driverSpecific ? &gpu->dedicated : NULL,
+                    .coreCount = options->driverSpecific ? (uint32_t*) &gpu->coreCount : NULL,
+                    .coreUsage = options->driverSpecific ? &gpu->coreUsage : NULL,
+                    .type = &gpu->type,
+                    .name = &gpu->name,
+                    .frequency = options->driverSpecific ? &gpu->frequency : NULL,
+                },
+                dllName
+            );
+        }
 
-                detectFn(
-                    &(FFGpuDriverCondition) {
-                        .type = FF_GPU_DRIVER_CONDITION_TYPE_DEVICE_ID
-                              | (gpu->deviceId > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_LUID : 0)
-                              | (vendorId > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_BUS_ID : 0),
-                        .pciDeviceId = {
-                            .deviceId = deviceId,
-                            .vendorId = vendorId,
-                            .subSystemId = subSystemId,
-                            .revId = revId,
-                        },
-                        .pciBusId = {
-                            .domain = 0,
-                            .bus = pciBus,
-                            .device = pciDev,
-                            .func = pciFunc,
-                        },
-                        .luid = gpu->deviceId,
-                    },
-                    (FFGpuDriverResult) {
-                        .temp = options->temp ? &gpu->temperature : NULL,
-                        .memory = options->driverSpecific ? &gpu->dedicated : NULL,
-                        .coreCount = options->driverSpecific ? (uint32_t*) &gpu->coreCount : NULL,
-                        .coreUsage = options->driverSpecific ? &gpu->coreUsage : NULL,
-                        .type = &gpu->type,
-                        .frequency = options->driverSpecific ? &gpu->frequency : NULL,
-                    },
-                    dllName
-                );
-            }
+        if (!gpu->name.length)
+        {
+            if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_DEVICEDESC, NULL, (PBYTE) buffer, sizeof(buffer), NULL))
+                ffStrbufSetWS(&gpu->name, buffer);
         }
     }
 

src/detection/gpu/gpu_wsl.cpp

@@ -70,6 +70,7 @@ const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FF
 
         FFGPUResult* gpu = (FFGPUResult*) ffListAdd(gpus);
         ffStrbufInitS(&gpu->name, desc);
+        gpu->index = FF_GPU_INDEX_UNSET;
         gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
         gpu->coreUsage = FF_GPU_CORE_USAGE_UNSET;
         gpu->temperature = FF_GPU_TEMP_UNSET;
@@ -117,7 +118,8 @@ const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FF
                         .revId = hardwareId.revision,
                     },
                 };
-                ffDetectNvidiaGpuInfo(&cond, (FFGpuDriverResult) {
+                ffDetectNvidiaGpuInfo(&cond, (FFGpuDriverResult){
+                    .index = &gpu->index,
                     .temp = options->temp ? &gpu->temperature : NULL,
                     .memory = options->driverSpecific ? &gpu->dedicated : NULL,
                     .coreCount = options->driverSpecific ? (uint32_t*) &gpu->coreCount : NULL,

src/detection/gpu/intel_drm.h

@@ -0,0 +1,125 @@
+#pragma once
+
+/* SPDX-License-Identifier: MIT */
+#include <drm.h>
+
+// xe_drm.h
+
+/*
+ * Copyright © 2023 Intel Corporation
+ */
+
+#define DRM_XE_DEVICE_QUERY		0x00
+
+#define DRM_IOCTL_XE_DEVICE_QUERY		DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_DEVICE_QUERY, struct drm_xe_device_query)
+
+enum drm_xe_memory_class {
+	DRM_XE_MEM_REGION_CLASS_SYSMEM = 0,
+	DRM_XE_MEM_REGION_CLASS_VRAM
+};
+
+struct drm_xe_mem_region {
+	__u16 mem_class;
+	__u16 instance;
+	__u32 min_page_size;
+	__u64 total_size;
+	__u64 used;
+	__u64 cpu_visible_size;
+	__u64 cpu_visible_used;
+	__u64 reserved[6];
+};
+
+struct drm_xe_query_mem_regions {
+	__u32 num_mem_regions;
+	__u32 pad;
+	struct drm_xe_mem_region mem_regions[];
+};
+
+struct drm_xe_query_topology_mask {
+	__u16 gt_id;
+
+#define DRM_XE_TOPO_DSS_GEOMETRY	1
+#define DRM_XE_TOPO_DSS_COMPUTE		2
+#define DRM_XE_TOPO_EU_PER_DSS		4
+	__u16 type;
+	__u32 num_bytes;
+	__u8 mask[];
+};
+
+struct drm_xe_device_query {
+	__u64 extensions;
+
+#define DRM_XE_DEVICE_QUERY_MEM_REGIONS		1
+#define DRM_XE_DEVICE_QUERY_GT_TOPOLOGY		5
+	__u32 query;
+	__u32 size;
+	__u64 data;
+	__u64 reserved[2];
+};
+
+// i915_drm.h
+
+/*
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ */
+
+#define DRM_IOCTL_I915_GETPARAM         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GETPARAM, drm_i915_getparam_t)
+
+struct drm_i915_getparam {
+	__s32 param;
+	int *value;
+};
+typedef struct drm_i915_getparam drm_i915_getparam_t;
+
+#define DRM_I915_GETPARAM	0x06
+#define DRM_I915_QUERY			0x39
+#define DRM_I915_QUERY_MEMORY_REGIONS		4
+#define DRM_IOCTL_I915_QUERY			DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_QUERY, struct drm_i915_query)
+#define I915_PARAM_EU_TOTAL		 34
+
+struct drm_i915_query_item {
+	__u64 query_id;
+#define DRM_I915_QUERY_MEMORY_REGIONS		4
+
+	__s32 length;
+	__u32 flags;
+	__u64 data_ptr;
+};
+
+struct drm_i915_query {
+	__u32 num_items;
+	__u32 flags;
+	__u64 items_ptr;
+};
+
+enum drm_i915_gem_memory_class {
+	I915_MEMORY_CLASS_SYSTEM = 0,
+	I915_MEMORY_CLASS_DEVICE,
+};
+
+struct drm_i915_gem_memory_class_instance {
+	__u16 memory_class;
+	__u16 memory_instance;
+};
+
+struct drm_i915_memory_region_info {
+	struct drm_i915_gem_memory_class_instance region;
+	__u32 rsvd0;
+	__u64 probed_size;
+	__u64 unallocated_size;
+
+	union {
+		__u64 rsvd1[8];
+		struct {
+			__u64 probed_cpu_visible_size;
+			__u64 unallocated_cpu_visible_size;
+		};
+	};
+};
+
+struct drm_i915_query_memory_regions {
+	__u32 num_regions;
+	__u32 rsvd[3];
+	struct drm_i915_memory_region_info regions[];
+};

src/detection/gpu/mtml.h

@@ -56,6 +56,8 @@ typedef struct
     int rsvd[6];                                 //!< Reserved for future extension.
 } MtmlPciInfo;
 
+// Retrieves the number of cores of a device.
+MtmlReturn MTML_API mtmlDeviceCountGpuCores(const MtmlDevice* device, unsigned int* numCores);
 // Retrieves the brand of a device.
 MtmlReturn MTML_API mtmlDeviceGetBrand(const MtmlDevice *dev, MtmlBrandType *type);
 // Retrieves the index associated with the specified device.

src/detection/gpu/nvml.h

@@ -132,5 +132,7 @@ extern nvmlReturn_t nvmlDeviceGetMaxClockInfo(nvmlDevice_t device, nvmlClockType
 extern nvmlReturn_t nvmlDeviceGetBrand(nvmlDevice_t device, nvmlBrandType_t* type);
 // Retrieves the current utilization rates for the device
 extern nvmlReturn_t nvmlDeviceGetUtilizationRates(nvmlDevice_t device, nvmlUtilization_t *utilization);
+// Retrieves the globally unique immutable UUID associated with this device, as a 5 part hexadecimal string, that augments the immutable, board serial identifier.
+extern nvmlReturn_t nvmlDeviceGetIndex(nvmlDevice_t device, unsigned int *index);
 // Retrieves the name of this device.
 extern nvmlReturn_t nvmlDeviceGetName(nvmlDevice_t device, char *name, unsigned int length);

src/detection/localip/localip_linux.c

@@ -172,403 +172,416 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
 
     if (ifAddrStruct) freeifaddrs(ifAddrStruct);
 
-    FF_AUTO_CLOSE_FD int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sockfd > 0)
+    if ((options->showType & FF_LOCALIP_TYPE_MTU_BIT) || (options->showType & FF_LOCALIP_TYPE_SPEED_BIT)
+        #ifdef __sun
+        || (options->showType & FF_LOCALIP_TYPE_MAC_BIT)
+        #endif
+    )
     {
-        FF_LIST_FOR_EACH(FFLocalIpResult, iface, *results)
+        FF_AUTO_CLOSE_FD int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+        if (sockfd > 0)
         {
-            struct ifreq ifr;
-            strncpy(ifr.ifr_name, iface->name.chars, IFNAMSIZ - 1);
-
-            if (ioctl(sockfd, SIOCGIFMTU, &ifr) == 0)
-                iface->mtu = (int32_t) ifr.ifr_mtu;
-
-            #ifdef __linux__
-            struct ethtool_cmd edata = { .cmd = ETHTOOL_GSET };
-            ifr.ifr_data = (void*) &edata;
-            if (ioctl(sockfd, SIOCETHTOOL, &ifr) == 0)
-                iface->speed = (edata.speed_hi << 16) | edata.speed; // ethtool_cmd_speed is not available on Android
-            #elif __FreeBSD__ || __APPLE__
-            struct ifmediareq ifmr = {};
-            strncpy(ifmr.ifm_name, iface->name.chars, IFNAMSIZ - 1);
-            if (ioctl(sockfd, SIOCGIFMEDIA, &ifmr) == 0)
+            FF_LIST_FOR_EACH(FFLocalIpResult, iface, *results)
             {
-                switch (IFM_SUBTYPE(ifmr.ifm_active))
+                struct ifreq ifr;
+                strncpy(ifr.ifr_name, iface->name.chars, IFNAMSIZ - 1);
+
+                if (options->showType & FF_LOCALIP_TYPE_MTU_BIT)
                 {
-                #ifdef IFM_HPNA_1
-                case IFM_HPNA_1:
-                #endif
-                    iface->speed = 1; break;
-                #ifdef IFM_1000_CX
-                case IFM_1000_CX:
-                #endif
-                #ifdef IFM_1000_CX_SGMII
-                case IFM_1000_CX_SGMII:
-                #endif
-                #ifdef IFM_1000_KX
-                case IFM_1000_KX:
-                #endif
-                #ifdef IFM_1000_LX
-                case IFM_1000_LX:
-                #endif
-                #ifdef IFM_1000_SGMII
-                case IFM_1000_SGMII:
-                #endif
-                #ifdef IFM_1000_SX
-                case IFM_1000_SX:
-                #endif
-                #ifdef IFM_1000_T
-                case IFM_1000_T:
-                #endif
-                    iface->speed = 1000; break;
-                #ifdef IFM_100G_AUI2
-                case IFM_100G_AUI2:
-                #endif
-                #ifdef IFM_100G_AUI2_AC
-                case IFM_100G_AUI2_AC:
-                #endif
-                #ifdef IFM_100G_AUI4
-                case IFM_100G_AUI4:
-                #endif
-                #ifdef IFM_100G_AUI4_AC
-                case IFM_100G_AUI4_AC:
-                #endif
-                #ifdef IFM_100G_CAUI2
-                case IFM_100G_CAUI2:
-                #endif
-                #ifdef IFM_100G_CAUI2_AC
-                case IFM_100G_CAUI2_AC:
-                #endif
-                #ifdef IFM_100G_CAUI4
-                case IFM_100G_CAUI4:
-                #endif
-                #ifdef IFM_100G_CAUI4_AC
-                case IFM_100G_CAUI4_AC:
-                #endif
-                #ifdef IFM_100G_CP2
-                case IFM_100G_CP2:
-                #endif
-                #ifdef IFM_100G_CR4
-                case IFM_100G_CR4:
-                #endif
-                #ifdef IFM_100G_CR_PAM4
-                case IFM_100G_CR_PAM4:
-                #endif
-                #ifdef IFM_100G_DR
-                case IFM_100G_DR:
-                #endif
-                #ifdef IFM_100G_KR2_PAM4
-                case IFM_100G_KR2_PAM4:
-                #endif
-                #ifdef IFM_100G_KR4
-                case IFM_100G_KR4:
-                #endif
-                #ifdef IFM_100G_KR_PAM4
-                case IFM_100G_KR_PAM4:
-                #endif
-                #ifdef IFM_100G_LR4
-                case IFM_100G_LR4:
-                #endif
-                #ifdef IFM_100G_SR2
-                case IFM_100G_SR2:
-                #endif
-                #ifdef IFM_100G_SR4
-                case IFM_100G_SR4:
-                #endif
-                    iface->speed = 100000; break;
-                #ifdef IFM_100_FX
-                case IFM_100_FX:
-                #endif
-                #ifdef IFM_100_SGMII
-                case IFM_100_SGMII:
-                #endif
-                #ifdef IFM_100_T
-                case IFM_100_T:
-                #endif
-                #ifdef IFM_100_T2
-                case IFM_100_T2:
-                #endif
-                #ifdef IFM_100_T4
-                case IFM_100_T4:
-                #endif
-                #ifdef IFM_100_TX
-                case IFM_100_TX:
-                #endif
-                #ifdef IFM_100_VG
-                case IFM_100_VG:
-                #endif
-                    iface->speed = 100; break;
-                #ifdef IFM_10G_AOC
-                case IFM_10G_AOC:
-                #endif
-                #ifdef IFM_10G_CR1
-                case IFM_10G_CR1:
-                #endif
-                #ifdef IFM_10G_CX4
-                case IFM_10G_CX4:
-                #endif
-                #ifdef IFM_10G_ER
-                case IFM_10G_ER:
-                #endif
-                #ifdef IFM_10G_KR
-                case IFM_10G_KR:
-                #endif
-                #ifdef IFM_10G_KX4
-                case IFM_10G_KX4:
-                #endif
-                #ifdef IFM_10G_LR
-                case IFM_10G_LR:
-                #endif
-                #ifdef IFM_10G_LRM
-                case IFM_10G_LRM:
-                #endif
-                #ifdef IFM_10G_SFI
-                case IFM_10G_SFI:
-                #endif
-                #ifdef IFM_10G_SR
-                case IFM_10G_SR:
-                #endif
-                #ifdef IFM_10G_T
-                case IFM_10G_T:
-                #endif
-                #ifdef IFM_10G_TWINAX
-                case IFM_10G_TWINAX:
-                #endif
-                #ifdef IFM_10G_TWINAX_LONG
-                case IFM_10G_TWINAX_LONG:
-                #endif
-                    iface->speed = 10000; break;
-                #ifdef IFM_10_2
-                case IFM_10_2:
-                #endif
-                #ifdef IFM_10_5
-                case IFM_10_5:
-                #endif
-                #ifdef IFM_10_FL
-                case IFM_10_FL:
-                #endif
-                #ifdef IFM_10_STP
-                case IFM_10_STP:
-                #endif
-                #ifdef IFM_10_T
-                case IFM_10_T:
-                #endif
-                    iface->speed = 10; break;
-                #ifdef IFM_200G_AUI4
-                case IFM_200G_AUI4:
-                #endif
-                #ifdef IFM_200G_AUI4_AC
-                case IFM_200G_AUI4_AC:
-                #endif
-                #ifdef IFM_200G_AUI8
-                case IFM_200G_AUI8:
-                #endif
-                #ifdef IFM_200G_AUI8_AC
-                case IFM_200G_AUI8_AC:
-                #endif
-                #ifdef IFM_200G_CR4_PAM4
-                case IFM_200G_CR4_PAM4:
-                #endif
-                #ifdef IFM_200G_DR4
-                case IFM_200G_DR4:
-                #endif
-                #ifdef IFM_200G_FR4
-                case IFM_200G_FR4:
-                #endif
-                #ifdef IFM_200G_KR4_PAM4
-                case IFM_200G_KR4_PAM4:
-                #endif
-                #ifdef IFM_200G_LR4
-                case IFM_200G_LR4:
-                #endif
-                #ifdef IFM_200G_SR4
-                case IFM_200G_SR4:
-                #endif
-                    iface->speed = 200000; break;
-                #ifdef IFM_20G_KR2
-                case IFM_20G_KR2:
-                #endif
-                    iface->speed = 20000; break;
-                #ifdef IFM_2500_KX
-                case IFM_2500_KX:
-                #endif
-                #ifdef IFM_2500_SX
-                case IFM_2500_SX:
-                #endif
-                #ifdef IFM_2500_T
-                case IFM_2500_T:
-                #endif
-                #ifdef IFM_2500_X
-                case IFM_2500_X:
-                #endif
-                    iface->speed = 2500; break;
-                #ifdef IFM_25G_ACC
-                case IFM_25G_ACC:
-                #endif
-                #ifdef IFM_25G_AOC
-                case IFM_25G_AOC:
-                #endif
-                #ifdef IFM_25G_AUI
-                case IFM_25G_AUI:
-                #endif
-                #ifdef IFM_25G_CR
-                case IFM_25G_CR:
-                #endif
-                #ifdef IFM_25G_CR1
-                case IFM_25G_CR1:
-                #endif
-                #ifdef IFM_25G_CR_S
-                case IFM_25G_CR_S:
-                #endif
-                #ifdef IFM_25G_KR
-                case IFM_25G_KR:
-                #endif
-                #ifdef IFM_25G_KR1
-                case IFM_25G_KR1:
-                #endif
-                #ifdef IFM_25G_KR_S
-                case IFM_25G_KR_S:
-                #endif
-                #ifdef IFM_25G_LR
-                case IFM_25G_LR:
-                #endif
-                #ifdef IFM_25G_PCIE
-                case IFM_25G_PCIE:
-                #endif
-                #ifdef IFM_25G_SR
-                case IFM_25G_SR:
-                #endif
-                #ifdef IFM_25G_T
-                case IFM_25G_T:
-                #endif
-                    iface->speed = 25000; break;
-                #ifdef IFM_400G_AUI8
-                case IFM_400G_AUI8:
-                #endif
-                #ifdef IFM_400G_AUI8_AC
-                case IFM_400G_AUI8_AC:
-                #endif
-                #ifdef IFM_400G_DR4
-                case IFM_400G_DR4:
-                #endif
-                #ifdef IFM_400G_FR8
-                case IFM_400G_FR8:
-                #endif
-                #ifdef IFM_400G_LR8
-                case IFM_400G_LR8:
-                #endif
-                    iface->speed = 400000; break;
-                #ifdef IFM_40G_CR4
-                case IFM_40G_CR4:
-                #endif
-                #ifdef IFM_40G_ER4
-                case IFM_40G_ER4:
-                #endif
-                #ifdef IFM_40G_KR4
-                case IFM_40G_KR4:
-                #endif
-                #ifdef IFM_40G_LR4
-                case IFM_40G_LR4:
-                #endif
-                #ifdef IFM_40G_SR4
-                case IFM_40G_SR4:
-                #endif
-                #ifdef IFM_40G_XLAUI
-                case IFM_40G_XLAUI:
-                #endif
-                #ifdef IFM_40G_XLAUI_AC
-                case IFM_40G_XLAUI_AC:
-                #endif
-                #ifdef IFM_40G_XLPPI
-                case IFM_40G_XLPPI:
-                #endif
-                #ifdef IFM_40G_LM4
-                case IFM_40G_LM4:
-                #endif
-                    iface->speed = 40000; break;
-                #ifdef IFM_5000_KR
-                case IFM_5000_KR:
-                #endif
-                #ifdef IFM_5000_KR1
-                case IFM_5000_KR1:
-                #endif
-                #ifdef IFM_5000_KR_S
-                case IFM_5000_KR_S:
-                #endif
-                #ifdef IFM_5000_T
-                case IFM_5000_T:
-                #endif
-                    iface->speed = 5000; break;
-                #ifdef IFM_50G_AUI1
-                case IFM_50G_AUI1:
-                #endif
-                #ifdef IFM_50G_AUI1_AC
-                case IFM_50G_AUI1_AC:
-                #endif
-                #ifdef IFM_50G_AUI2
-                case IFM_50G_AUI2:
-                #endif
-                #ifdef IFM_50G_AUI2_AC
-                case IFM_50G_AUI2_AC:
-                #endif
-                #ifdef IFM_50G_CP
-                case IFM_50G_CP:
-                #endif
-                #ifdef IFM_50G_CR2
-                case IFM_50G_CR2:
-                #endif
-                #ifdef IFM_50G_FR
-                case IFM_50G_FR:
-                #endif
-                #ifdef IFM_50G_KR2
-                case IFM_50G_KR2:
-                #endif
-                #ifdef IFM_50G_KR_PAM4
-                case IFM_50G_KR_PAM4:
-                #endif
-                #ifdef IFM_50G_LAUI2
-                case IFM_50G_LAUI2:
-                #endif
-                #ifdef IFM_50G_LAUI2_AC
-                case IFM_50G_LAUI2_AC:
-                #endif
-                #ifdef IFM_50G_LR
-                case IFM_50G_LR:
-                #endif
-                #ifdef IFM_50G_LR2
-                case IFM_50G_LR2:
-                #endif
-                #ifdef IFM_50G_PCIE
-                case IFM_50G_PCIE:
-                #endif
-                #ifdef IFM_50G_SR
-                case IFM_50G_SR:
-                #endif
-                #ifdef IFM_50G_SR2
-                case IFM_50G_SR2:
-                #endif
-                #ifdef IFM_50G_KR4
-                case IFM_50G_KR4:
-                #endif
-                    iface->speed = 50000; break;
-                #ifdef IFM_56G_R4
-                case IFM_56G_R4:
-                #endif
-                    iface->speed = 56000; break;
-                default:
-                    iface->speed = -1;
+                    if (ioctl(sockfd, SIOCGIFMTU, &ifr) == 0)
+                        iface->mtu = (int32_t) ifr.ifr_mtu;
                 }
-            }
-            #endif
 
-            #ifdef __sun
-            if ((options->showType & FF_LOCALIP_TYPE_MAC_BIT) && ioctl(sockfd, SIOCGIFHWADDR, &ifr) == 0)
-            {
-                const uint8_t* ptr = (uint8_t*) ifr.ifr_addr.sa_data; // NOT ifr_enaddr
-                ffStrbufSetF(&iface->mac, "%02x:%02x:%02x:%02x:%02x:%02x",
-                             ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
+                if (options->showType & FF_LOCALIP_TYPE_SPEED_BIT)
+                {
+                    #ifdef __linux__
+                    struct ethtool_cmd edata = { .cmd = ETHTOOL_GSET };
+                    ifr.ifr_data = (void*) &edata;
+                    if (ioctl(sockfd, SIOCETHTOOL, &ifr) == 0)
+                        iface->speed = (edata.speed_hi << 16) | edata.speed; // ethtool_cmd_speed is not available on Android
+                    #elif __FreeBSD__ || __APPLE__
+                    struct ifmediareq ifmr = {};
+                    strncpy(ifmr.ifm_name, iface->name.chars, IFNAMSIZ - 1);
+                    if (ioctl(sockfd, SIOCGIFMEDIA, &ifmr) == 0 && (IFM_TYPE(ifmr.ifm_active) & IFM_ETHER))
+                    {
+                        switch (IFM_SUBTYPE(ifmr.ifm_active))
+                        {
+                        #ifdef IFM_HPNA_1
+                        case IFM_HPNA_1:
+                        #endif
+                            iface->speed = 1; break;
+                        #ifdef IFM_1000_CX
+                        case IFM_1000_CX:
+                        #endif
+                        #ifdef IFM_1000_CX_SGMII
+                        case IFM_1000_CX_SGMII:
+                        #endif
+                        #ifdef IFM_1000_KX
+                        case IFM_1000_KX:
+                        #endif
+                        #ifdef IFM_1000_LX
+                        case IFM_1000_LX:
+                        #endif
+                        #ifdef IFM_1000_SGMII
+                        case IFM_1000_SGMII:
+                        #endif
+                        #ifdef IFM_1000_SX
+                        case IFM_1000_SX:
+                        #endif
+                        #ifdef IFM_1000_T
+                        case IFM_1000_T:
+                        #endif
+                            iface->speed = 1000; break;
+                        #ifdef IFM_100G_AUI2
+                        case IFM_100G_AUI2:
+                        #endif
+                        #ifdef IFM_100G_AUI2_AC
+                        case IFM_100G_AUI2_AC:
+                        #endif
+                        #ifdef IFM_100G_AUI4
+                        case IFM_100G_AUI4:
+                        #endif
+                        #ifdef IFM_100G_AUI4_AC
+                        case IFM_100G_AUI4_AC:
+                        #endif
+                        #ifdef IFM_100G_CAUI2
+                        case IFM_100G_CAUI2:
+                        #endif
+                        #ifdef IFM_100G_CAUI2_AC
+                        case IFM_100G_CAUI2_AC:
+                        #endif
+                        #ifdef IFM_100G_CAUI4
+                        case IFM_100G_CAUI4:
+                        #endif
+                        #ifdef IFM_100G_CAUI4_AC
+                        case IFM_100G_CAUI4_AC:
+                        #endif
+                        #ifdef IFM_100G_CP2
+                        case IFM_100G_CP2:
+                        #endif
+                        #ifdef IFM_100G_CR4
+                        case IFM_100G_CR4:
+                        #endif
+                        #ifdef IFM_100G_CR_PAM4
+                        case IFM_100G_CR_PAM4:
+                        #endif
+                        #ifdef IFM_100G_DR
+                        case IFM_100G_DR:
+                        #endif
+                        #ifdef IFM_100G_KR2_PAM4
+                        case IFM_100G_KR2_PAM4:
+                        #endif
+                        #ifdef IFM_100G_KR4
+                        case IFM_100G_KR4:
+                        #endif
+                        #ifdef IFM_100G_KR_PAM4
+                        case IFM_100G_KR_PAM4:
+                        #endif
+                        #ifdef IFM_100G_LR4
+                        case IFM_100G_LR4:
+                        #endif
+                        #ifdef IFM_100G_SR2
+                        case IFM_100G_SR2:
+                        #endif
+                        #ifdef IFM_100G_SR4
+                        case IFM_100G_SR4:
+                        #endif
+                            iface->speed = 100000; break;
+                        #ifdef IFM_100_FX
+                        case IFM_100_FX:
+                        #endif
+                        #ifdef IFM_100_SGMII
+                        case IFM_100_SGMII:
+                        #endif
+                        #ifdef IFM_100_T
+                        case IFM_100_T:
+                        #endif
+                        #ifdef IFM_100_T2
+                        case IFM_100_T2:
+                        #endif
+                        #ifdef IFM_100_T4
+                        case IFM_100_T4:
+                        #endif
+                        #ifdef IFM_100_TX
+                        case IFM_100_TX:
+                        #endif
+                        #ifdef IFM_100_VG
+                        case IFM_100_VG:
+                        #endif
+                            iface->speed = 100; break;
+                        #ifdef IFM_10G_AOC
+                        case IFM_10G_AOC:
+                        #endif
+                        #ifdef IFM_10G_CR1
+                        case IFM_10G_CR1:
+                        #endif
+                        #ifdef IFM_10G_CX4
+                        case IFM_10G_CX4:
+                        #endif
+                        #ifdef IFM_10G_ER
+                        case IFM_10G_ER:
+                        #endif
+                        #ifdef IFM_10G_KR
+                        case IFM_10G_KR:
+                        #endif
+                        #ifdef IFM_10G_KX4
+                        case IFM_10G_KX4:
+                        #endif
+                        #ifdef IFM_10G_LR
+                        case IFM_10G_LR:
+                        #endif
+                        #ifdef IFM_10G_LRM
+                        case IFM_10G_LRM:
+                        #endif
+                        #ifdef IFM_10G_SFI
+                        case IFM_10G_SFI:
+                        #endif
+                        #ifdef IFM_10G_SR
+                        case IFM_10G_SR:
+                        #endif
+                        #ifdef IFM_10G_T
+                        case IFM_10G_T:
+                        #endif
+                        #ifdef IFM_10G_TWINAX
+                        case IFM_10G_TWINAX:
+                        #endif
+                        #ifdef IFM_10G_TWINAX_LONG
+                        case IFM_10G_TWINAX_LONG:
+                        #endif
+                            iface->speed = 10000; break;
+                        #ifdef IFM_10_2
+                        case IFM_10_2:
+                        #endif
+                        #ifdef IFM_10_5
+                        case IFM_10_5:
+                        #endif
+                        #ifdef IFM_10_FL
+                        case IFM_10_FL:
+                        #endif
+                        #ifdef IFM_10_STP
+                        case IFM_10_STP:
+                        #endif
+                        #ifdef IFM_10_T
+                        case IFM_10_T:
+                        #endif
+                            iface->speed = 10; break;
+                        #ifdef IFM_200G_AUI4
+                        case IFM_200G_AUI4:
+                        #endif
+                        #ifdef IFM_200G_AUI4_AC
+                        case IFM_200G_AUI4_AC:
+                        #endif
+                        #ifdef IFM_200G_AUI8
+                        case IFM_200G_AUI8:
+                        #endif
+                        #ifdef IFM_200G_AUI8_AC
+                        case IFM_200G_AUI8_AC:
+                        #endif
+                        #ifdef IFM_200G_CR4_PAM4
+                        case IFM_200G_CR4_PAM4:
+                        #endif
+                        #ifdef IFM_200G_DR4
+                        case IFM_200G_DR4:
+                        #endif
+                        #ifdef IFM_200G_FR4
+                        case IFM_200G_FR4:
+                        #endif
+                        #ifdef IFM_200G_KR4_PAM4
+                        case IFM_200G_KR4_PAM4:
+                        #endif
+                        #ifdef IFM_200G_LR4
+                        case IFM_200G_LR4:
+                        #endif
+                        #ifdef IFM_200G_SR4
+                        case IFM_200G_SR4:
+                        #endif
+                            iface->speed = 200000; break;
+                        #ifdef IFM_20G_KR2
+                        case IFM_20G_KR2:
+                        #endif
+                            iface->speed = 20000; break;
+                        #ifdef IFM_2500_KX
+                        case IFM_2500_KX:
+                        #endif
+                        #ifdef IFM_2500_SX
+                        case IFM_2500_SX:
+                        #endif
+                        #ifdef IFM_2500_T
+                        case IFM_2500_T:
+                        #endif
+                        #ifdef IFM_2500_X
+                        case IFM_2500_X:
+                        #endif
+                            iface->speed = 2500; break;
+                        #ifdef IFM_25G_ACC
+                        case IFM_25G_ACC:
+                        #endif
+                        #ifdef IFM_25G_AOC
+                        case IFM_25G_AOC:
+                        #endif
+                        #ifdef IFM_25G_AUI
+                        case IFM_25G_AUI:
+                        #endif
+                        #ifdef IFM_25G_CR
+                        case IFM_25G_CR:
+                        #endif
+                        #ifdef IFM_25G_CR1
+                        case IFM_25G_CR1:
+                        #endif
+                        #ifdef IFM_25G_CR_S
+                        case IFM_25G_CR_S:
+                        #endif
+                        #ifdef IFM_25G_KR
+                        case IFM_25G_KR:
+                        #endif
+                        #ifdef IFM_25G_KR1
+                        case IFM_25G_KR1:
+                        #endif
+                        #ifdef IFM_25G_KR_S
+                        case IFM_25G_KR_S:
+                        #endif
+                        #ifdef IFM_25G_LR
+                        case IFM_25G_LR:
+                        #endif
+                        #ifdef IFM_25G_PCIE
+                        case IFM_25G_PCIE:
+                        #endif
+                        #ifdef IFM_25G_SR
+                        case IFM_25G_SR:
+                        #endif
+                        #ifdef IFM_25G_T
+                        case IFM_25G_T:
+                        #endif
+                            iface->speed = 25000; break;
+                        #ifdef IFM_400G_AUI8
+                        case IFM_400G_AUI8:
+                        #endif
+                        #ifdef IFM_400G_AUI8_AC
+                        case IFM_400G_AUI8_AC:
+                        #endif
+                        #ifdef IFM_400G_DR4
+                        case IFM_400G_DR4:
+                        #endif
+                        #ifdef IFM_400G_FR8
+                        case IFM_400G_FR8:
+                        #endif
+                        #ifdef IFM_400G_LR8
+                        case IFM_400G_LR8:
+                        #endif
+                            iface->speed = 400000; break;
+                        #ifdef IFM_40G_CR4
+                        case IFM_40G_CR4:
+                        #endif
+                        #ifdef IFM_40G_ER4
+                        case IFM_40G_ER4:
+                        #endif
+                        #ifdef IFM_40G_KR4
+                        case IFM_40G_KR4:
+                        #endif
+                        #ifdef IFM_40G_LR4
+                        case IFM_40G_LR4:
+                        #endif
+                        #ifdef IFM_40G_SR4
+                        case IFM_40G_SR4:
+                        #endif
+                        #ifdef IFM_40G_XLAUI
+                        case IFM_40G_XLAUI:
+                        #endif
+                        #ifdef IFM_40G_XLAUI_AC
+                        case IFM_40G_XLAUI_AC:
+                        #endif
+                        #ifdef IFM_40G_XLPPI
+                        case IFM_40G_XLPPI:
+                        #endif
+                        #ifdef IFM_40G_LM4
+                        case IFM_40G_LM4:
+                        #endif
+                            iface->speed = 40000; break;
+                        #ifdef IFM_5000_KR
+                        case IFM_5000_KR:
+                        #endif
+                        #ifdef IFM_5000_KR1
+                        case IFM_5000_KR1:
+                        #endif
+                        #ifdef IFM_5000_KR_S
+                        case IFM_5000_KR_S:
+                        #endif
+                        #ifdef IFM_5000_T
+                        case IFM_5000_T:
+                        #endif
+                            iface->speed = 5000; break;
+                        #ifdef IFM_50G_AUI1
+                        case IFM_50G_AUI1:
+                        #endif
+                        #ifdef IFM_50G_AUI1_AC
+                        case IFM_50G_AUI1_AC:
+                        #endif
+                        #ifdef IFM_50G_AUI2
+                        case IFM_50G_AUI2:
+                        #endif
+                        #ifdef IFM_50G_AUI2_AC
+                        case IFM_50G_AUI2_AC:
+                        #endif
+                        #ifdef IFM_50G_CP
+                        case IFM_50G_CP:
+                        #endif
+                        #ifdef IFM_50G_CR2
+                        case IFM_50G_CR2:
+                        #endif
+                        #ifdef IFM_50G_FR
+                        case IFM_50G_FR:
+                        #endif
+                        #ifdef IFM_50G_KR2
+                        case IFM_50G_KR2:
+                        #endif
+                        #ifdef IFM_50G_KR_PAM4
+                        case IFM_50G_KR_PAM4:
+                        #endif
+                        #ifdef IFM_50G_LAUI2
+                        case IFM_50G_LAUI2:
+                        #endif
+                        #ifdef IFM_50G_LAUI2_AC
+                        case IFM_50G_LAUI2_AC:
+                        #endif
+                        #ifdef IFM_50G_LR
+                        case IFM_50G_LR:
+                        #endif
+                        #ifdef IFM_50G_LR2
+                        case IFM_50G_LR2:
+                        #endif
+                        #ifdef IFM_50G_PCIE
+                        case IFM_50G_PCIE:
+                        #endif
+                        #ifdef IFM_50G_SR
+                        case IFM_50G_SR:
+                        #endif
+                        #ifdef IFM_50G_SR2
+                        case IFM_50G_SR2:
+                        #endif
+                        #ifdef IFM_50G_KR4
+                        case IFM_50G_KR4:
+                        #endif
+                            iface->speed = 50000; break;
+                        #ifdef IFM_56G_R4
+                        case IFM_56G_R4:
+                        #endif
+                            iface->speed = 56000; break;
+                        default:
+                            iface->speed = -1;
+                        }
+                    }
+                    #endif
+                }
+
+                #ifdef __sun
+                if ((options->showType & FF_LOCALIP_TYPE_MAC_BIT) && ioctl(sockfd, SIOCGIFHWADDR, &ifr) == 0)
+                {
+                    const uint8_t* ptr = (uint8_t*) ifr.ifr_addr.sa_data; // NOT ifr_enaddr
+                    ffStrbufSetF(&iface->mac, "%02x:%02x:%02x:%02x:%02x:%02x",
+                                ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
+                }
+                #endif
             }
-            #endif
         }
     }
 

src/detection/localip/localip_windows.c

@@ -153,8 +153,10 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
         if (!newIp)
         {
             FFLocalIpResult* result = FF_LIST_GET(FFLocalIpResult, *results, results->length - 1);
-            result->speed = (int32_t) (adapter->ReceiveLinkSpeed / 1000);
-            result->mtu = (int32_t) adapter->Mtu;
+            if (options->showType & FF_LOCALIP_TYPE_SPEED_BIT)
+                result->speed = (int32_t) (adapter->ReceiveLinkSpeed / 1000);
+            if (options->showType & FF_LOCALIP_TYPE_MTU_BIT)
+                result->mtu = (int32_t) adapter->Mtu;
         }
     }
 

src/detection/monitor/monitor_apple.m

@@ -29,7 +29,7 @@ static bool detectHdrSupportWithNSScreen(FFDisplayResult* display)
         for (NSScreen* screen in NSScreen.screens)
         {
             if (screen == mainScreen) continue;
-            NSNumber* screenNumber = [screen.deviceDescription valueForKey:@"NSScreenNumber"];
+            NSNumber* screenNumber = screen.deviceDescription[@"NSScreenNumber"];
             if (screenNumber && screenNumber.longValue == (long) display->id)
             {
                 #ifdef MAC_OS_X_VERSION_10_15

src/detection/monitor/monitor_linux.c

@@ -176,7 +176,7 @@ FF_MAYBE_UNUSED static const char* detectByDrm(FFlist* results)
 {
     const char* drmDirPath = "/sys/class/drm/";
 
-    DIR* dirp = opendir(drmDirPath);
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(drmDirPath);
     if(dirp == NULL)
         return "opendir(drmDirPath) == NULL";
 
@@ -232,23 +232,23 @@ FF_MAYBE_UNUSED static const char* detectByDrm(FFlist* results)
         ffStrbufSubstrBefore(&drmDir, drmDirLength);
     }
 
-    closedir(dirp);
     return NULL;
 }
 #endif // __linux__
 
 const char* ffDetectMonitor(FFlist* results)
 {
-    const char* error = "Fastfetch was compiled without xrandr support";
+    const char* error = NULL;
+
+    #if defined(__linux__)
+        error = detectByDrm(results);
+        if (!error && results->length > 0) return NULL;
+    #endif
 
     #ifdef FF_HAVE_XRANDR
         error = detectByXrandr(results);
         if (!error) return NULL;
     #endif
 
-    #if defined(__linux__)
-        error = detectByDrm(results);
-    #endif
-
-    return error;
+    return "Fastfetch was compiled without xrandr support";
 }

src/detection/opencl/opencl.c

@@ -75,6 +75,7 @@ static const char* openCLHandleData(OpenCLData* data, FFOpenCLResult* result)
             ffStrbufInit(&gpu->vendor);
             ffStrbufInit(&gpu->driver);
             ffStrbufInit(&gpu->platformApi);
+            gpu->index = FF_GPU_INDEX_UNSET;
             gpu->temperature = FF_GPU_TEMP_UNSET;
             gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
             gpu->type = FF_GPU_TYPE_UNKNOWN;

src/detection/os/os_apple.m

@@ -19,11 +19,11 @@ static void parseSystemVersion(FFOSResult* os)
 
     NSString* value;
 
-    if((value = [dict valueForKey:@"ProductName"]))
+    if((value = dict[@"ProductName"]))
         ffStrbufInitS(&os->name, value.UTF8String);
-    if((value = [dict valueForKey:@"ProductUserVisibleVersion"]))
+    if((value = dict[@"ProductUserVisibleVersion"]))
         ffStrbufInitS(&os->version, value.UTF8String);
-    if((value = [dict valueForKey:@"ProductBuildVersion"]))
+    if((value = dict[@"ProductBuildVersion"]))
         ffStrbufInitS(&os->buildID, value.UTF8String);
 }
 

src/detection/os/os_linux.c

@@ -172,6 +172,13 @@ static bool detectDebianDerived(FFOSResult* result)
         ffStrbufSetS(&result->idLike, "debian");
         return true;
     }
+    else if (ffStrbufEqualS(&result->name, "Parrot Security"))
+    {
+        // https://github.com/ParrotSec/base-files/blob/c06f6d42ddf8d79564882306576576eddab7d907/etc/os-release
+        ffStrbufSetS(&result->id, "parrot");
+        ffStrbufSetS(&result->idLike, "debian");
+        return true;
+    }
     else if (ffPathExists("/usr/bin/pveversion", FF_PATHTYPE_FILE))
     {
         ffStrbufSetS(&result->id, "pve");

src/detection/packages/packages.c

@@ -1,7 +1,13 @@
 #include "packages.h"
+#include "common/io/io.h"
 
+#include <inttypes.h>
 #include <stddef.h>
 
+#ifdef __APPLE__
+#define st_mtim st_mtimespec
+#endif
+
 void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options);
 
 const char* ffDetectPackages(FFPackagesResult* result, FFPackagesOptions* options)
@@ -16,3 +22,66 @@ const char* ffDetectPackages(FFPackagesResult* result, FFPackagesOptions* option
 
     return NULL;
 }
+
+bool ffPackagesReadCache(FFstrbuf* cacheDir, FFstrbuf* cacheContent, const char* filePath, const char* packageId, uint32_t* result)
+{
+    #ifndef _WIN32
+    struct stat st;
+    if (stat(filePath, &st) < 0) // file doesn't exist or isn't accessible
+    {
+        *result = 0;
+        return true;
+    }
+
+    if (__builtin_expect(st.st_mtim.tv_sec <= 0, false))
+        return false;
+
+    uint64_t mtime_current = (uint64_t) st.st_mtim.tv_sec * 1000ull + (uint64_t) st.st_mtim.tv_nsec / 1000000ull;
+    #else
+    FF_AUTO_CLOSE_FD HANDLE handle = CreateFileA(filePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+    if (handle == INVALID_HANDLE_VALUE) // file doesn't exist or isn't accessible
+    {
+        *result = 0;
+        return true;
+    }
+
+    uint64_t mtime_current;
+    if (!GetFileTime(handle, NULL, NULL, (FILETIME*) &mtime_current))
+        return false;
+
+    mtime_current = (mtime_current - 116444736000000000ull) / 10000ull;
+
+    if (__builtin_expect(mtime_current == 0, false))
+        return false;
+    #endif
+
+    ffStrbufSet(cacheDir, &instance.state.platform.cacheDir);
+    ffStrbufEnsureEndsWithC(cacheDir, '/');
+    ffStrbufAppendF(cacheDir, "fastfetch/packages/%s.txt", packageId);
+
+    if (ffReadFileBuffer(cacheDir->chars, cacheContent))
+    {
+        uint64_t mtime_cached;
+        uint32_t num_cached;
+        if (sscanf(cacheContent->chars, "%" SCNu64 " %" SCNu32, &mtime_cached, &num_cached) == 2 &&
+            mtime_cached == mtime_current && num_cached > 0)
+        {
+            *result = num_cached;
+            return true;
+        }
+    }
+
+    ffStrbufSetF(cacheContent, "%" PRIu64 " ", mtime_current);
+
+    return false;
+}
+
+bool ffPackagesWriteCache(FFstrbuf* cacheDir, FFstrbuf* cacheContent, uint32_t num_elements)
+{
+    if (__builtin_expect(cacheContent->length == 0, false))
+        return false;
+
+    ffStrbufAppendF(cacheContent, "%" PRIu32, num_elements);
+    return ffWriteFileBuffer(cacheDir->chars, cacheContent);
+}

src/detection/packages/packages.h

@@ -35,6 +35,7 @@ typedef struct FFPackagesResult
     uint32_t sorcery;
     uint32_t winget;
     uint32_t xbps;
+    uint32_t pacstall;
 
     uint32_t all; //Make sure this goes last
 
@@ -42,3 +43,5 @@ typedef struct FFPackagesResult
 } FFPackagesResult;
 
 const char* ffDetectPackages(FFPackagesResult* result, FFPackagesOptions* options);
+bool ffPackagesReadCache(FFstrbuf* cacheDir, FFstrbuf* cacheContent, const char* filePath, const char* packageId, uint32_t* result);
+bool ffPackagesWriteCache(FFstrbuf* cacheDir, FFstrbuf* cacheContent, uint32_t num_elements);

src/detection/packages/packages_bsd.c

@@ -2,8 +2,26 @@
 
 #include "common/settings.h"
 
+static uint32_t getSQLite3Int(const char* dbPath, const char* query, const char* packageId)
+{
+    FF_STRBUF_AUTO_DESTROY cacheDir = ffStrbufCreate();
+    FF_STRBUF_AUTO_DESTROY cacheContent = ffStrbufCreate();
+
+    uint32_t num_elements;
+    if (ffPackagesReadCache(&cacheDir, &cacheContent, dbPath, packageId, &num_elements))
+        return num_elements;
+
+    num_elements = (uint32_t) ffSettingsGetSQLite3Int(dbPath, query);
+
+    ffPackagesWriteCache(&cacheDir, &cacheContent, num_elements);
+
+    return num_elements;
+}
+
 void ffDetectPackagesImpl(FFPackagesResult* result, FF_MAYBE_UNUSED FFPackagesOptions* options)
 {
     if (!(options->disabled & FF_PACKAGES_FLAG_PKG_BIT))
-        result->pkg = (uint32_t) ffSettingsGetSQLite3Int(FASTFETCH_TARGET_DIR_ROOT "/var/db/pkg/local.sqlite", "SELECT count(*) FROM packages");
+    {
+        result->pkg = getSQLite3Int(FASTFETCH_TARGET_DIR_ROOT "/var/db/pkg/local.sqlite", "SELECT count(*) FROM packages", "pkg");
+    }
 }

src/detection/packages/packages_linux.c

@@ -56,21 +56,49 @@ static uint32_t getNumStringsImpl(const char* filename, const char* needle)
     return count;
 }
 
-static uint32_t getNumStrings(FFstrbuf* baseDir, const char* filename, const char* needle)
+static uint32_t getNumStrings(FFstrbuf* baseDir, const char* filename, const char* needle, const char* packageId)
 {
     uint32_t baseDirLength = baseDir->length;
     ffStrbufAppendS(baseDir, filename);
-    uint32_t num_elements = getNumStringsImpl(baseDir->chars, needle);
+
+    FF_STRBUF_AUTO_DESTROY cacheDir = ffStrbufCreate();
+    FF_STRBUF_AUTO_DESTROY cacheContent = ffStrbufCreate();
+
+    uint32_t num_elements;
+    if (ffPackagesReadCache(&cacheDir, &cacheContent, baseDir->chars, packageId, &num_elements))
+    {
+        ffStrbufSubstrBefore(baseDir, baseDirLength);
+        return num_elements;
+    }
+
+    num_elements = getNumStringsImpl(baseDir->chars, needle);
     ffStrbufSubstrBefore(baseDir, baseDirLength);
+
+    ffPackagesWriteCache(&cacheDir, &cacheContent, num_elements);
+
     return num_elements;
 }
 
-static uint32_t getSQLite3Int(FFstrbuf* baseDir, const char* dbPath, const char* query)
+static uint32_t getSQLite3Int(FFstrbuf* baseDir, const char* dbPath, const char* query, const char* packageId)
 {
     uint32_t baseDirLength = baseDir->length;
     ffStrbufAppendS(baseDir, dbPath);
-    uint32_t num_elements = (uint32_t) ffSettingsGetSQLite3Int(baseDir->chars, query);
+
+    FF_STRBUF_AUTO_DESTROY cacheDir = ffStrbufCreate();
+    FF_STRBUF_AUTO_DESTROY cacheContent = ffStrbufCreate();
+
+    uint32_t num_elements;
+    if (ffPackagesReadCache(&cacheDir, &cacheContent, baseDir->chars, packageId, &num_elements))
+    {
+        ffStrbufSubstrBefore(baseDir, baseDirLength);
+        return num_elements;
+    }
+
+    num_elements = (uint32_t) ffSettingsGetSQLite3Int(baseDir->chars, query);
     ffStrbufSubstrBefore(baseDir, baseDirLength);
+
+    ffPackagesWriteCache(&cacheDir, &cacheContent, num_elements);
+
     return num_elements;
 }
 
@@ -439,14 +467,86 @@ static uint32_t getGuixPackages(FFstrbuf* baseDir, const char* dirname)
     return num_elements;
 }
 
+static inline uint32_t getFlatpakRuntimePackagesArch(FFstrbuf* baseDir)
+{
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir->chars);
+    if (dirp == NULL)
+        return 0;
+
+    uint32_t num_elements = 0;
+
+    struct dirent *entry;
+    while ((entry = readdir(dirp)) != NULL)
+    {
+        if(entry->d_type == DT_DIR && entry->d_name[0] != '.')
+        {
+            num_elements += getNumElements(baseDir, entry->d_name, DT_DIR);
+        }
+    }
+
+    return num_elements;
+}
+
+static inline uint32_t getFlatpakRuntimePackages(FFstrbuf* baseDir)
+{
+    ffStrbufAppendS(baseDir, "runtime/");
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir->chars);
+    if (dirp == NULL)
+        return 0;
+
+    uint32_t runtimeDirLength = baseDir->length;
+    uint32_t num_elements = 0;
+
+    struct dirent *entry;
+    while ((entry = readdir(dirp)) != NULL)
+    {
+        if(entry->d_type == DT_DIR && entry->d_name[0] != '.')
+        {
+            // `flatpak list` ignores `.Locale` and `.Debug` packages, and maybe others
+            const char* dot = strrchr(entry->d_name, '.');
+            if (__builtin_expect(!dot, false)) continue;
+            dot++;
+
+            if (ffStrEquals(dot, "Locale") || ffStrEquals(dot, "Debug"))
+                continue;
+
+            ffStrbufAppendS(baseDir, entry->d_name);
+            ffStrbufAppendC(baseDir, '/');
+            num_elements += getFlatpakRuntimePackagesArch(baseDir);
+            ffStrbufSubstrBefore(baseDir, runtimeDirLength);
+        }
+    }
+
+    return num_elements;
+}
+
+static uint32_t getFlatpakPackages(FFstrbuf* baseDir, const char* dirname)
+{
+    uint32_t num_elements = 0;
+    uint32_t baseDirLength = baseDir->length;
+    ffStrbufAppendS(baseDir, dirname);
+    ffStrbufAppendS(baseDir, "/flatpak/");
+    uint32_t flatpakDirLength = baseDir->length;
+
+    ffStrbufAppendS(baseDir, "app");
+    num_elements += getNumElementsImpl(baseDir->chars, DT_DIR);
+    ffStrbufSubstrBefore(baseDir, flatpakDirLength);
+
+    num_elements += getFlatpakRuntimePackages(baseDir);
+
+    ffStrbufSubstrBefore(baseDir, baseDirLength);
+
+    return num_elements;
+}
+
 static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options)
 {
-    if (!(options->disabled & FF_PACKAGES_FLAG_APK_BIT)) packageCounts->apk += getNumStrings(baseDir, "/lib/apk/db/installed", "C:Q");
-    if (!(options->disabled & FF_PACKAGES_FLAG_DPKG_BIT)) packageCounts->dpkg += getNumStrings(baseDir, "/var/lib/dpkg/status", "Status: install ok installed");
-    if (!(options->disabled & FF_PACKAGES_FLAG_LPKG_BIT)) packageCounts->lpkg += getNumStrings(baseDir, "/opt/Loc-OS-LPKG/installed-lpkg/Listinstalled-lpkg.list", "\n");
+    if (!(options->disabled & FF_PACKAGES_FLAG_APK_BIT)) packageCounts->apk += getNumStrings(baseDir, "/lib/apk/db/installed", "C:Q", "apk");
+    if (!(options->disabled & FF_PACKAGES_FLAG_DPKG_BIT)) packageCounts->dpkg += getNumStrings(baseDir, "/var/lib/dpkg/status", "Status: install ok installed", "dpkg");
+    if (!(options->disabled & FF_PACKAGES_FLAG_LPKG_BIT)) packageCounts->lpkg += getNumStrings(baseDir, "/opt/Loc-OS-LPKG/installed-lpkg/Listinstalled-lpkg.list", "\n", "lpkg");
     if (!(options->disabled & FF_PACKAGES_FLAG_EMERGE_BIT)) packageCounts->emerge += countFilesRecursive(baseDir, "/var/db/pkg", "SIZE");
     if (!(options->disabled & FF_PACKAGES_FLAG_EOPKG_BIT)) packageCounts->eopkg += getNumElements(baseDir, "/var/lib/eopkg/package", DT_DIR);
-    if (!(options->disabled & FF_PACKAGES_FLAG_FLATPAK_BIT)) packageCounts->flatpakSystem += getNumElements(baseDir, "/var/lib/flatpak/app", DT_DIR);
+    if (!(options->disabled & FF_PACKAGES_FLAG_FLATPAK_BIT)) packageCounts->flatpakSystem += getFlatpakPackages(baseDir, "/var/lib");
     if (!(options->disabled & FF_PACKAGES_FLAG_NIX_BIT))
     {
         packageCounts->nixDefault += getNixPackages(baseDir, "/nix/var/nix/profiles/default");
@@ -455,7 +555,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
     if (!(options->disabled & FF_PACKAGES_FLAG_PACMAN_BIT)) packageCounts->pacman += getNumElements(baseDir, "/var/lib/pacman/local", DT_DIR);
     if (!(options->disabled & FF_PACKAGES_FLAG_LPKGBUILD_BIT)) packageCounts->lpkgbuild += getNumElements(baseDir, "/opt/Loc-OS-LPKG/lpkgbuild/remove", DT_REG);
     if (!(options->disabled & FF_PACKAGES_FLAG_PKGTOOL_BIT)) packageCounts->pkgtool += getNumElements(baseDir, "/var/log/packages", DT_REG);
-    if (!(options->disabled & FF_PACKAGES_FLAG_RPM_BIT)) packageCounts->rpm += getSQLite3Int(baseDir, "/var/lib/rpm/rpmdb.sqlite", "SELECT count(*) FROM Packages");
+    if (!(options->disabled & FF_PACKAGES_FLAG_RPM_BIT)) packageCounts->rpm += getSQLite3Int(baseDir, "/var/lib/rpm/rpmdb.sqlite", "SELECT count(*) FROM Packages", "rpm");
     if (!(options->disabled & FF_PACKAGES_FLAG_SNAP_BIT)) packageCounts->snap += getSnap(baseDir);
     if (!(options->disabled & FF_PACKAGES_FLAG_XBPS_BIT)) packageCounts->xbps += getXBPS(baseDir, "/var/db/xbps");
     if (!(options->disabled & FF_PACKAGES_FLAG_BREW_BIT))
@@ -464,14 +564,15 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
         packageCounts->brew += getNumElements(baseDir, "/home/linuxbrew/.linuxbrew/Cellar", DT_DIR);
     }
     if (!(options->disabled & FF_PACKAGES_FLAG_PALUDIS_BIT)) packageCounts->paludis += countFilesRecursive(baseDir, "/var/db/paludis/repositories", "environment.bz2");
-    if (!(options->disabled & FF_PACKAGES_FLAG_OPKG_BIT)) packageCounts->opkg += getNumStrings(baseDir, "/usr/lib/opkg/status", "Package:"); // openwrt
+    if (!(options->disabled & FF_PACKAGES_FLAG_OPKG_BIT)) packageCounts->opkg += getNumStrings(baseDir, "/usr/lib/opkg/status", "Package:", "opkg"); // openwrt
     if (!(options->disabled & FF_PACKAGES_FLAG_AM_BIT)) packageCounts->am = getAM(baseDir);
-    if (!(options->disabled & FF_PACKAGES_FLAG_SORCERY_BIT)) packageCounts->sorcery += getNumStrings(baseDir, "/var/state/sorcery/packages", ":installed:");
+    if (!(options->disabled & FF_PACKAGES_FLAG_SORCERY_BIT)) packageCounts->sorcery += getNumStrings(baseDir, "/var/state/sorcery/packages", ":installed:", "sorcery");
     if (!(options->disabled & FF_PACKAGES_FLAG_GUIX_BIT))
     {
       packageCounts->guixSystem += getGuixPackages(baseDir, "/run/current-system/profile");
     }
     if (!(options->disabled & FF_PACKAGES_FLAG_LINGLONG_BIT)) packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/heads/main", DT_DIR);
+    if (!(options->disabled & FF_PACKAGES_FLAG_PACSTALL_BIT)) packageCounts->pacstall += getNumElements(baseDir, "/var/lib/pacstall/metadata", DT_REG);
 }
 
 static void getPackageCountsRegular(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options)
@@ -575,5 +676,5 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
     }
 
     if (!(options->disabled & FF_PACKAGES_FLAG_FLATPAK_BIT))
-        result->flatpakUser = getNumElements(&baseDir, "/.local/share/flatpak/app", DT_DIR);
+        result->flatpakUser = getFlatpakPackages(&baseDir, "/.local/share");
 }

src/detection/physicaldisk/physicaldisk_linux.c

@@ -1,12 +1,34 @@
 #include "physicaldisk.h"
 #include "common/io/io.h"
 #include "common/properties.h"
-#include "detection/temps/temps_linux.h"
 #include "util/stringUtils.h"
 
 #include <ctype.h>
 #include <limits.h>
 
+static double detectNvmeTemp(const char* devName)
+{
+    char pathSysBlock[PATH_MAX];
+    int index = snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/hwmon$/temp1_input", devName);
+    if (index <= 0) return FF_PHYSICALDISK_TEMP_UNSET;
+    index -= (int) sizeof("/temp1_input");
+
+    for (char c = '0'; c <= '9'; c++) // hopefully there's only one digit
+    {
+        pathSysBlock[index] = c;
+        char buffer[64];
+        ssize_t size = ffReadFileData(pathSysBlock, sizeof(buffer), buffer);
+        if (size > 0)
+        {
+            buffer[size] = '\0';
+            double temp = strtod(buffer, NULL);
+            return temp > 0 ? temp / 1000 : FF_PHYSICALDISK_TEMP_UNSET;
+        }
+    }
+
+    return FF_PHYSICALDISK_TEMP_UNSET;
+}
+
 const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
 {
     FF_AUTO_CLOSE_DIR DIR* sysBlockDirp = opendir("/sys/block/");
@@ -157,20 +179,10 @@ const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
             }
         }
 
-        device->temperature = FF_PHYSICALDISK_TEMP_UNSET;
         if (options->temp)
-        {
-            const FFlist* tempsResult = ffDetectTemps();
-
-            FF_LIST_FOR_EACH(FFTempValue, value, *tempsResult)
-            {
-                if (ffStrStartsWith(devName, value->deviceName.chars)) // nvme0 - nvme0n1
-                {
-                    device->temperature = value->value;
-                    break;
-                }
-            }
-        }
+            device->temperature = detectNvmeTemp(devName);
+        else
+            device->temperature = FF_PHYSICALDISK_TEMP_UNSET;
     }
 
     return NULL;

src/detection/temps/temps_bsd.c

@@ -1,24 +0,0 @@
-#include "temps_bsd.h"
-#include "common/sysctl.h"
-
-const char* ffDetectCpuTemp(double* current)
-{
-    int temp = ffSysctlGetInt("dev.cpu.0.temperature", -999999);
-    if (temp == -999999)
-        return "ffSysctlGetInt(\"dev.cpu.0.temperature\") failed";
-
-    // In tenth of degrees Celsius
-    *current = (double) temp / 10;
-    return NULL;
-}
-
-const char* ffDetectThermalTemp(double* current)
-{
-    int temp = ffSysctlGetInt("hw.acpi.thermal.tz0.temperature", -999999);
-    if (temp == -999999)
-        return "ffSysctlGetInt(\"hw.acpi.thermal.tz0.temperature\") failed";
-
-    // In tenth of degrees Kelvin
-    *current = (double) temp / 10 - 273.15;
-    return NULL;
-}

src/detection/temps/temps_bsd.h

@@ -1,4 +0,0 @@
-#pragma once
-
-const char* ffDetectCpuTemp(double* current);
-const char* ffDetectThermalTemp(double* current);

src/detection/temps/temps_linux.c

@@ -1,101 +0,0 @@
-#include "fastfetch.h"
-#include "common/io/io.h"
-#include "common/thread.h"
-#include "temps_linux.h"
-
-#include <string.h>
-#include <dirent.h>
-
-static bool parseHwmonDir(FFstrbuf* dir, FFTempValue* value)
-{
-    //https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface
-    uint32_t dirLength = dir->length;
-
-    FF_STRBUF_AUTO_DESTROY valueBuffer = ffStrbufCreate();
-
-    ffStrbufAppendS(dir, "temp1_input");
-    if(!ffReadFileBuffer(dir->chars, &valueBuffer))
-        return false;
-
-    ffStrbufSubstrBefore(dir, dirLength);
-
-    value->value = ffStrbufToDouble(&valueBuffer) / 1000; // valueBuffer is millidegree Celsius
-
-    if(value->value != value->value)
-        return false;
-
-    ffStrbufAppendS(dir, "name");
-    ffReadFileBuffer(dir->chars, &value->name);
-    ffStrbufTrimRightSpace(&value->name);
-    ffStrbufSubstrBefore(dir, dirLength);
-
-    ffStrbufAppendS(dir, "device/class");
-    if(!ffReadFileBuffer(dir->chars, &valueBuffer))
-    {
-        ffStrbufSubstrBefore(dir, dirLength);
-        ffStrbufAppendS(dir, "device/device/class");
-        ffReadFileBuffer(dir->chars, &valueBuffer);
-    }
-    ffStrbufTrimRightSpace(&valueBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
-    if(valueBuffer.length)
-        value->deviceClass = (uint32_t) strtoul(valueBuffer.chars, NULL, 16);
-
-    ffStrbufClear(&valueBuffer);
-    ffStrbufEnsureFree(&valueBuffer, 64);
-    ffStrbufAppendS(dir, "device");
-    ssize_t linkLen = readlink(dir->chars, valueBuffer.chars, valueBuffer.allocated - 1);
-    if (linkLen > 0)
-    {
-        valueBuffer.length = (uint32_t) linkLen;
-        valueBuffer.chars[linkLen] = 0;
-        ffStrbufSubstrAfterLastC(&valueBuffer, '/');
-        ffStrbufInitMove(&value->deviceName, &valueBuffer);
-    }
-    else
-        ffStrbufInit(&value->deviceName);
-
-    return value->name.length > 0 || value->deviceClass > 0;
-}
-
-const FFlist* ffDetectTemps(void)
-{
-    static FFlist result;
-
-    if(result.elementSize > 0)
-        return &result;
-
-    ffListInitA(&result, sizeof(FFTempValue), 16);
-
-    FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
-    ffStrbufAppendS(&baseDir, "/sys/class/hwmon/");
-
-    uint32_t baseDirLength = baseDir.length;
-
-    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir.chars);
-    if(dirp == NULL)
-        return &result;
-
-    struct dirent* entry;
-    while((entry = readdir(dirp)) != NULL)
-    {
-        if(entry->d_name[0] == '.')
-            continue;
-
-        ffStrbufAppendS(&baseDir, entry->d_name);
-        ffStrbufAppendC(&baseDir, '/');
-
-        FFTempValue* temp = ffListAdd(&result);
-        ffStrbufInit(&temp->name);
-        temp->deviceClass = 0;
-        if(!parseHwmonDir(&baseDir, temp))
-        {
-            ffStrbufDestroy(&temp->name);
-            --result.length;
-        }
-
-        ffStrbufSubstrBefore(&baseDir, baseDirLength);
-    }
-
-    return &result;
-}

src/detection/temps/temps_linux.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include "fastfetch.h"
-
-typedef struct FFTempValue
-{
-    FFstrbuf name;
-    FFstrbuf deviceName;
-    uint32_t deviceClass;
-    double value;
-} FFTempValue;
-
-const FFlist* /* List of FFTempValue */ ffDetectTemps();

src/detection/temps/temps_windows.h

@@ -1,3 +0,0 @@
-#pragma once
-
-const char* ffDetectSmbiosTemp(double* current, double* critical);

src/detection/terminalfont/terminalfont.c

@@ -82,7 +82,7 @@ FF_MAYBE_UNUSED static bool detectKitty(const FFstrbuf* exe, FFTerminalFontResul
     if (ffGetTerminalResponse(
         "\eP+q6b697474792d71756572792d666f6e745f66616d696c79;6b697474792d71756572792d666f6e745f73697a65\e\\", // kitty-query-font_family;kitty-query-font_size
         2,
-        "\eP1+r%*[^=]=%64[^\e]\e\\\eP1+r%*[^=]=%64[^\e]\e\\", fontHex, sizeHex) == NULL && *fontHex && *sizeHex)
+        "\eP1+r%*[^=]=%512[^\e]\e\\\eP1+r%*[^=]=%512[^\e]\e\\", fontHex, sizeHex) == NULL && *fontHex && *sizeHex)
     {
         // decode hex string
         for (const char* p = fontHex; p[0] && p[1]; p += 2)

src/detection/terminalfont/terminalfont_apple.m

@@ -26,12 +26,12 @@ static void detectIterm2(FFTerminalFontResult* terminalFont)
         return;
     }
 
-    for(NSDictionary* bookmark in [dict valueForKey:@"New Bookmarks"])
+    for(NSDictionary* bookmark in dict[@"New Bookmarks"])
     {
-        if(![[bookmark valueForKey:@"Name"] isEqualToString:@(profile)])
+        if(![bookmark[@"Name"] isEqualToString:@(profile)])
             continue;
 
-        NSString* normalFont = [bookmark valueForKey:@"Normal Font"];
+        NSString* normalFont = bookmark[@"Normal Font"];
         if(!normalFont)
         {
             ffStrbufAppendF(&terminalFont->error, "`Normal Font` key in profile `%s` doesn't exist", profile);
@@ -39,10 +39,10 @@ static void detectIterm2(FFTerminalFontResult* terminalFont)
         }
         ffFontInitWithSpace(&terminalFont->font, normalFont.UTF8String);
 
-        NSNumber* useNonAsciiFont = [bookmark valueForKey:@"Use Non-ASCII Font"];
+        NSNumber* useNonAsciiFont = bookmark[@"Use Non-ASCII Font"];
         if(useNonAsciiFont.boolValue)
         {
-            NSString* nonAsciiFont = [bookmark valueForKey:@"Non Ascii Font"];
+            NSString* nonAsciiFont = bookmark[@"Non Ascii Font"];
             if (nonAsciiFont)
                 ffFontInitWithSpace(&terminalFont->fallback, nonAsciiFont.UTF8String);
         }
@@ -78,13 +78,13 @@ static void detectWarpTerminal(FFTerminalFontResult* terminalFont)
         return;
     }
 
-    NSString* fontName = [dict valueForKey:@"FontName"];
+    NSString* fontName = dict[@"FontName"];
     if(!fontName)
         fontName = @"Hack";
     else
         fontName = [fontName stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"\""]];
 
-    NSString* fontSize = [dict valueForKey:@"FontSize"];
+    NSString* fontSize = dict[@"FontSize"];
     if(!fontSize)
         fontSize = @"13";
 

src/detection/terminalfont/terminalfont_linux.c

@@ -244,13 +244,19 @@ static void detectFootTerminal(FFTerminalFontResult* terminalFont)
         return;
     }
     uint32_t equal = ffStrbufNextIndexS(&font, colon, "size=");
-    font.chars[colon] = 0;
+    font.chars[colon] = '\0';
     if (equal == font.length)
     {
         ffFontInitValues(&terminalFont->font, font.chars, "8");
         return;
     }
-    ffFontInitValues(&terminalFont->font, font.chars, &font.chars[equal + strlen("size=")]);
+    uint32_t size = equal + strlen("size=");
+    uint32_t comma = ffStrbufNextIndexC(&font, size, ',');
+    if (comma < font.length)
+        font.chars[comma] = '\0';
+    ffFontInitValues(&terminalFont->font, font.chars, &font.chars[size]);
+    if (comma < font.length)
+        ffFontInitValues(&terminalFont->fallback, &font.chars[comma + 1], NULL);
 }
 
 static void detectQTerminal(FFTerminalFontResult* terminalFont)

src/detection/terminalshell/terminalshell.c

@@ -365,6 +365,13 @@ FF_MAYBE_UNUSED static bool getTerminalVersionKonsole(FFstrbuf* exe, FFstrbuf* v
 
 FF_MAYBE_UNUSED static bool getTerminalVersionFoot(FFstrbuf* exe, FFstrbuf* version)
 {
+    uint32_t major = 0, minor = 0, patch = 0;
+    if (ffGetTerminalResponse("\e[>c", 3, "\e[>1;%2u%2u%2u;0c", &major, &minor, &patch) == NULL)
+    {
+        ffStrbufSetF(version, "%u.%u.%u", major, minor, patch);
+        return true;
+    }
+
     if(!getExeVersionRaw(exe, version)) return false;
 
     //foot version: 1.13.1 -pgo +ime -graphemes -assertions
@@ -664,7 +671,7 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
         return getTerminalVersionKonsole(exe, version);
 
     if(ffStrbufIgnCaseEqualS(processName, "yakuake"))
-        return getExeVersionGeneral(exe, version);//yakuake 22.12.3
+        return getTerminalVersionKonsole(exe, version); // yakuake shares code with konsole
 
     if(ffStrbufIgnCaseEqualS(processName, "xfce4-terminal"))
         return getTerminalVersionXfce4Terminal(exe, version);

src/detection/terminalshell/terminalshell_linux.c

@@ -83,6 +83,8 @@ static pid_t getTerminalInfo(FFTerminalResult* result, pid_t pid)
     {
         //Known shells
         if (
+            ffStrbufEqualS(&result->processName, "sudo")       ||
+            ffStrbufEqualS(&result->processName, "su")         ||
             ffStrbufEqualS(&result->processName, "sh")         ||
             ffStrbufEqualS(&result->processName, "ash")        ||
             ffStrbufEqualS(&result->processName, "bash")       ||

src/detection/tpm/tpm.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "fastfetch.h"
+
+typedef struct FFTPMResult
+{
+    FFstrbuf version;
+    FFstrbuf description;
+} FFTPMResult;
+
+const char* ffDetectTPM(FFTPMResult* result);

src/detection/tpm/tpm_bsd.c

@@ -0,0 +1,21 @@
+#include "tpm.h"
+#include "common/sysctl.h"
+#include "util/kmod.h"
+
+const char* ffDetectTPM(FFTPMResult* result)
+{
+    if (ffSysctlGetString("dev.tpmcrb.0.%desc", &result->description) != NULL)
+    {
+        if (!ffKmodLoaded("tpm")) return "`tpm` kernel module is not loaded";
+        return "TPM device is not found";
+    }
+
+    if (ffStrbufContainS(&result->description, "2.0"))
+        ffStrbufSetStatic(&result->version, "2.0");
+    else if (ffStrbufContainS(&result->description, "1.2"))
+        ffStrbufSetStatic(&result->version, "1.2");
+    else
+        ffStrbufSetStatic(&result->version, "unknown");
+
+    return NULL;
+}

src/detection/tpm/tpm_linux.c

@@ -0,0 +1,24 @@
+#include "tpm.h"
+#include "common/io/io.h"
+
+const char* ffDetectTPM(FFTPMResult* result)
+{
+    if (!ffPathExists("/sys/class/tpm/tpm0", FF_PATHTYPE_DIRECTORY))
+    {
+        if (!ffPathExists("/sys/class/tpm", FF_PATHTYPE_DIRECTORY))
+            return "TPM is not supported by kernel";
+        return "TPM device is not found";
+    }
+
+    if (ffReadFileBuffer("/sys/class/tpm/tpm0/tpm_version_major", &result->version))
+    {
+        ffStrbufTrimRightSpace(&result->version);
+        if (ffStrbufEqualS(&result->version, "2"))
+            ffStrbufSetStatic(&result->version, "2.0");
+    }
+
+    if (ffReadFileBuffer("/sys/class/tpm/tpm0/device/description", &result->description))
+        ffStrbufTrimRightSpace(&result->description);
+
+    return NULL;
+}

src/detection/tpm/tpm_nosupport.c

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

src/detection/tpm/tpm_windows.c

@@ -0,0 +1,82 @@
+#include "tpm.h"
+#include "common/library.h"
+
+// #include <tbs.h>
+
+#define TBS_SUCCESS 0u
+#define TBS_E_INTERNAL_ERROR 0x80284001u
+#define TBS_E_INVALID_CONTEXT 0x80284004u
+typedef UINT32 TBS_RESULT;
+
+#define TPM_VERSION_UNKNOWN     0
+#define TPM_VERSION_12          1
+#define TPM_VERSION_20          2
+
+#define TPM_IFTYPE_UNKNOWN        0
+#define TPM_IFTYPE_1              1 // for 1.2 - use I/O-port or MMIO
+#define TPM_IFTYPE_TRUSTZONE      2 // 2.0: Trustzone
+#define TPM_IFTYPE_HW             3 // 2.0: HW TPM
+#define TPM_IFTYPE_EMULATOR       4 // 2.0: SW-emulator
+#define TPM_IFTYPE_SPB            5 // 2.0: SPB attached
+
+typedef struct _TPM_DEVICE_INFO
+{
+    UINT32      structVersion;      // = 1 for now
+    UINT32      tpmVersion;         // 1.2 / 2.0
+    UINT32      tpmInterfaceType;   // HW, simulator, ...
+    UINT32      tpmImpRevision;     // code-drop revision,
+                                    // implenmentation-specific
+} TPM_DEVICE_INFO, *PTPM_DEVICE_INFO;
+typedef const TPM_DEVICE_INFO *PCTPM_DEVICE_INFO;
+
+TBS_RESULT WINAPI
+Tbsi_GetDeviceInfo(
+    _In_ UINT32 Size,
+    _Out_writes_bytes_(Size) PVOID Info);
+
+const char* ffDetectTPM(FFTPMResult* result)
+{
+    FF_LIBRARY_LOAD(tbs, "dlopen TBS" FF_LIBRARY_EXTENSION " failed", "TBS" FF_LIBRARY_EXTENSION, -1)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(tbs, Tbsi_GetDeviceInfo)
+
+    TPM_DEVICE_INFO deviceInfo = {};
+    TBS_RESULT code = ffTbsi_GetDeviceInfo(sizeof(deviceInfo), &deviceInfo);
+    if (code != TBS_SUCCESS)
+        return code == (TBS_RESULT) TBS_E_INVALID_CONTEXT ? "TPM device is not found" : "Tbsi_GetDeviceInfo() failed";
+
+    switch (deviceInfo.tpmVersion)
+    {
+    case TPM_VERSION_12:
+        ffStrbufSetStatic(&result->version, "1.2");
+        break;
+    case TPM_VERSION_20:
+        ffStrbufSetStatic(&result->version, "2.0");
+        break;
+    default:
+        ffStrbufSetStatic(&result->version, "unknown");
+        break;
+    }
+
+    switch (deviceInfo.tpmInterfaceType)
+    {
+    case TPM_IFTYPE_1:
+        ffStrbufSetF(&result->description, "I/O-port or MMIO TPM %s", result->version.chars);
+        break;
+    case TPM_IFTYPE_TRUSTZONE:
+        ffStrbufSetF(&result->description, "Trustzone TPM %s", result->version.chars);
+        break;
+    case TPM_IFTYPE_HW:
+        ffStrbufSetF(&result->description, "HW TPM %s", result->version.chars);
+        break;
+    case TPM_IFTYPE_EMULATOR:
+        ffStrbufSetF(&result->description, "SW-emulator TPM %s", result->version.chars);
+        break;
+    case TPM_IFTYPE_SPB:
+        ffStrbufSetF(&result->description, "SPB attached TPM %s", result->version.chars);
+        break;
+    default:
+        break;
+    }
+
+    return NULL;
+}

src/detection/vulkan/vulkan.c

@@ -234,6 +234,7 @@ static const char* detectVulkan(FFVulkanResult* result)
         }
 
         //No way to detect those using vulkan
+        gpu->index = FF_GPU_INDEX_UNSET;
         gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;
         gpu->temperature = FF_GPU_TEMP_UNSET;
         gpu->frequency = FF_GPU_FREQUENCY_UNSET;

src/detection/wallpaper/wallpaper_apple.m

@@ -18,16 +18,16 @@ const char* ffDetectWallpaper(FFstrbuf* result)
             NSArray* choices = [dict valueForKeyPath:@"SystemDefault.Desktop.Content.Choices"];
             if (choices.count > 0)
             {
-                NSDictionary* choice = [choices objectAtIndex:0];
-                NSArray* files = [choice valueForKey:@"Files"];
+                NSDictionary* choice = choices[0];
+                NSArray* files = choice[@"Files"];
                 if (files.count > 0)
                 {
-                    NSString* file = [[files objectAtIndex: 0] valueForKey: @"relative"];
+                    NSString* file = files[0][@"relative"];
                     ffStrbufAppendS(result, [NSURL URLWithString:file].path.UTF8String);
                 }
                 else
                 {
-                    NSString* provider = [choice valueForKey:@"Provider"];
+                    NSString* provider = choice[@"Provider"];
                     NSString* builtinPrefix = @"com.apple.wallpaper.choice.";
                     if ([provider hasPrefix:builtinPrefix])
                         provider = [provider substringFromIndex:builtinPrefix.length];

src/detection/wifi/wifi_apple.m

@@ -1,5 +1,6 @@
 #include "wifi.h"
 #include "common/processing.h"
+#include "util/stringUtils.h"
 
 #import <CoreWLAN/CoreWLAN.h>
 
@@ -12,21 +13,61 @@ int Apple80211GetInfoCopy(struct Apple80211 *handle, CFDictionaryRef *info) __at
 @property (readonly) struct Apple80211* device;
 @end
 
-static NSDictionary* getWifiInfoByApple80211(CWInterface* inf)
+inline static NSDictionary* getWifiInfoByApple80211(CWInterface* inf)
 {
-    if (!Apple80211GetInfoCopy) return NULL;
+    if (!inf.device || !Apple80211GetInfoCopy) return NULL;
     CFDictionaryRef result = NULL;
     if (Apple80211GetInfoCopy(inf.device, &result) < 0) return NULL;
     return CFBridgingRelease(result);
 }
 
+static NSDictionary* getWifiInfoBySystemProfiler(NSString* ifName)
+{
+    // Warning: costs about 2s on my machine
+    static NSArray* spData;
+    static bool inited;
+    if (!inited)
+    {
+        inited = true;
+        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+        if (ffProcessAppendStdOut(&buffer, (char* const[]) {
+            "system_profiler",
+            "SPAirPortDataType",
+            "-xml",
+            "-detailLevel",
+            "basic",
+            NULL
+        }) != NULL)
+            return nil;
+
+        spData = [NSPropertyListSerialization propertyListWithData:[NSData dataWithBytes:buffer.chars length:buffer.length]
+                                              options:NSPropertyListImmutable
+                                              format:nil
+                                              error:nil];
+    }
+
+    if (spData)
+    {
+        for (NSDictionary* data in spData[0][@"_items"])
+        {
+            for (NSDictionary* inf in data[@"spairport_airport_interfaces"])
+            {
+                if ([ifName isEqualToString:inf[@"_name"]])
+                    return inf[@"spairport_current_network_information"];
+            }
+        }
+    }
+
+    return NULL;
+}
+
 const char* ffDetectWifi(FFlist* result)
 {
     NSArray<CWInterface*>* interfaces = CWWiFiClient.sharedWiFiClient.interfaces;
-    if(!interfaces)
+    if (!interfaces)
         return "CWWiFiClient.sharedWiFiClient.interfaces is nil";
 
-    for(CWInterface* inf in interfaces)
+    for (CWInterface* inf in interfaces)
     {
         FFWifiResult* item = (FFWifiResult*)ffListAdd(result);
         ffStrbufInit(&item->inf.description);
@@ -46,22 +87,25 @@ const char* ffDetectWifi(FFlist* result)
             continue;
 
         ffStrbufSetStatic(&item->conn.status, inf.interfaceMode != kCWInterfaceModeNone ? "Active" : "Inactive");
-        if(!inf.serviceActive)
+        if(inf.interfaceMode == kCWInterfaceModeNone)
             continue;
 
-        NSDictionary* apple = NULL;
+        NSDictionary* apple = nil; // For getWifiInfoByApple80211
+        NSDictionary* sp = nil; // For getWifiInfoBySystemProfiler
 
         if (inf.ssid) // https://developer.apple.com/forums/thread/732431
             ffStrbufAppendS(&item->conn.ssid, inf.ssid.UTF8String);
         else if (apple || (apple = getWifiInfoByApple80211(inf)))
-            ffStrbufAppendS(&item->conn.ssid, [[apple valueForKey:@"SSID_STR"] UTF8String]);
+            ffStrbufAppendS(&item->conn.ssid, [apple[@"SSID_STR"] UTF8String]);
+        else if (sp || (sp = getWifiInfoBySystemProfiler(inf.interfaceName)))
+            ffStrbufAppendS(&item->conn.ssid, [sp[@"_name"] UTF8String]);
         else
             ffStrbufSetStatic(&item->conn.ssid, "<unknown ssid>"); // https://developer.apple.com/forums/thread/732431
 
         if (inf.bssid)
             ffStrbufAppendS(&item->conn.bssid, inf.bssid.UTF8String);
         else if (apple || (apple = getWifiInfoByApple80211(inf)))
-            ffStrbufAppendS(&item->conn.bssid, [[apple valueForKey:@"BSSID"] UTF8String]);
+            ffStrbufAppendS(&item->conn.bssid, [apple[@"BSSID"] UTF8String]);
 
         switch(inf.activePHYMode)
         {
@@ -90,7 +134,24 @@ const char* ffDetectWifi(FFlist* result)
                 ffStrbufSetStatic(&item->conn.protocol, "802.11be (Wi-Fi 7)");
                 break;
             default:
-                ffStrbufAppendF(&item->conn.protocol, "Unknown (%ld)", inf.activePHYMode);
+                if (inf.activePHYMode < 8)
+                    ffStrbufAppendF(&item->conn.protocol, "Unknown (%ld)", inf.activePHYMode);
+                else if (sp || (sp = getWifiInfoBySystemProfiler(inf.interfaceName)))
+                {
+                    ffStrbufSetS(&item->conn.protocol, [sp[@"spairport_network_phymode"] UTF8String]);
+                    if (ffStrbufStartsWithS(&item->conn.protocol, "802.11"))
+                    {
+                        const char* subProtocol = item->conn.protocol.chars + strlen("802.11");
+                        if (ffStrEquals(subProtocol, "be"))
+                            ffStrbufSetStatic(&item->conn.protocol, "802.11be (Wi-Fi 7)");
+                        else if (ffStrEquals(subProtocol, "ax"))
+                            ffStrbufSetStatic(&item->conn.protocol, "802.11ax (Wi-Fi 6)");
+                        else if (ffStrEquals(subProtocol, "ac"))
+                            ffStrbufSetStatic(&item->conn.protocol, "802.11ac (Wi-Fi 5)");
+                        else if (ffStrEquals(subProtocol, "n"))
+                            ffStrbufSetStatic(&item->conn.protocol, "802.11n (Wi-Fi 4)");
+                    }
+                }
                 break;
         }
         item->conn.signalQuality = (double) (inf.rssiValue >= -50 ? 100 : inf.rssiValue <= -100 ? 0 : (inf.rssiValue + 100) * 2);
@@ -150,17 +211,17 @@ const char* ffDetectWifi(FFlist* result)
                 // Sonoma...
                 if (apple || (apple = getWifiInfoByApple80211(inf)))
                 {
-                    NSDictionary* authType = [apple valueForKey:@"AUTH_TYPE"];
+                    NSDictionary* authType = apple[@"AUTH_TYPE"];
                     if (authType)
                     {
                         // AUTH_LOWER seems useless. `airport` verifies if its value is between 1 and 3, and prints `unknown` if not
 
-                        NSNumber* authUpper = [authType valueForKey:@"AUTH_UPPER"];
+                        NSNumber* authUpper = authType[@"AUTH_UPPER"];
                         if (!authUpper)
                             ffStrbufSetStatic(&item->conn.security, "Insecure");
                         else
                         {
-                            int authUpperValue = [authUpper intValue];
+                            int authUpperValue = authUpper.intValue;
                             switch (authUpperValue)
                             {
                                 case 1:
@@ -203,6 +264,26 @@ const char* ffDetectWifi(FFlist* result)
                         }
                     }
                 }
+                else if (sp || (sp = getWifiInfoBySystemProfiler(inf.interfaceName)))
+                {
+                    ffStrbufSetS(&item->conn.security, [sp[@"spairport_security_mode"] UTF8String]);
+                    ffStrbufSubstrAfterFirstS(&item->conn.security, "_mode_");
+                    if (ffStrbufEqualS(&item->conn.security, "none"))
+                        ffStrbufSetStatic(&item->conn.security, "Insecure");
+                    else
+                    {
+                        ffStrbufReplaceAllC(&item->conn.security, '_', ' ');
+                        if (ffStrbufStartsWithS(&item->conn.security, "wpa"))
+                        {
+                            item->conn.security.chars[0] = 'W';
+                            item->conn.security.chars[1] = 'P';
+                            item->conn.security.chars[2] = 'A';
+                            char* sub = strchr(item->conn.security.chars, ' ');
+                            if (sub && sub[1])
+                                sub[1] = (char) toupper(sub[1]);
+                        }
+                    }
+                }
                 break;
             default:
                 ffStrbufAppendF(&item->conn.security, "Unknown (%ld)", inf.security);

src/detection/wmtheme/wmtheme_apple.m

@@ -15,7 +15,7 @@ bool ffDetectWmTheme(FFstrbuf* themeOrError)
         return false;
     }
 
-    NSNumber* wmThemeColor = [dict valueForKey:@"AppleAccentColor"];
+    NSNumber* wmThemeColor = dict[@"AppleAccentColor"];
     if(!wmThemeColor)
         ffStrbufAppendS(themeOrError, "Multicolor");
     else
@@ -34,7 +34,7 @@ bool ffDetectWmTheme(FFstrbuf* themeOrError)
         }
     }
 
-    NSString* wmTheme = [dict valueForKey:@"AppleInterfaceStyle"];
+    NSString* wmTheme = dict[@"AppleInterfaceStyle"];
     ffStrbufAppendF(themeOrError, " (%s)", wmTheme ? wmTheme.UTF8String : "Light");
     return true;
 }

src/detection/zpool/zpool_linux.c

@@ -1,6 +1,7 @@
 #include "zpool.h"
 
 #ifdef FF_HAVE_LIBZFS
+#include "util/kmod.h"
 
 #ifdef __sun
 #define FF_DISABLE_DLOPEN
@@ -82,7 +83,11 @@ const char* ffDetectZpool(FFlist* result /* list of FFZpoolResult */)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libzfs, libzfs_init);
 
     libzfs_handle_t* handle = fflibzfs_init();
-    if (!handle) return "libzfs_init() failed";
+    if (!handle)
+    {
+        if (!ffKmodLoaded("zfs")) return "`zfs` kernel module is not loaded";
+        return "libzfs_init() failed";
+    }
 
     __attribute__((__cleanup__(cleanLibzfs))) FFZfsData data = {
         .handle = handle,

src/logo/ascii/deepin.txt

@@ -1,4 +1,4 @@
-$1             ............
+             ............
          .';;;;;.       .,;,.
       .,;;;;;;;.       ';;;;;;;.
     .;::::::::'     .,::;;,''''',.

src/logo/ascii/foxos.txt

@@ -0,0 +1,8 @@
+ ________ ________     ___    ___ ________  ________
+|\  _____\\   __  \   |\  \  /  /|\   __  \|\   ____\
+\ \  \__/\ \  \|\  \  \ \  \/  / | \  \|\  \ \  \___|_
+ \ \   __\\ \  \\\  \  \ \    / / \ \  \\\  \ \_____  \
+  \ \  \_| \ \  \\\  \  /     \/   \ \  \\\  \|____|\  \
+   \ \__\   \ \_______\/  /\   \    \ \_______\____\_\  \
+    \|__|    \|_______/__/ /\ __\    \|_______|\_________\
+                      |__|/ \|__|             \|_________|

src/logo/builtin.c

@@ -1666,6 +1666,14 @@ static const FFlogo F[] = {
         .colorKeys = FF_COLOR_FG_RED,
         .colorTitle = FF_COLOR_FG_WHITE,
     },
+    // FoxOS
+    {
+        .names = {"FoxOS"},
+        .lines = FASTFETCH_DATATEXT_LOGO_FOXOS,
+        .colors = {
+            FF_COLOR_FG_YELLOW,
+        },
+    },
     // FreeBSD
     {
         .names = {"Freebsd"},
@@ -1914,6 +1922,16 @@ static const FFlogo G[] = {
         .colorKeys = FF_COLOR_FG_YELLOW,
         .colorTitle = FF_COLOR_FG_WHITE,
     },
+    // GXDE
+    {
+        .names = {"GXDE"},
+        .lines = FASTFETCH_DATATEXT_LOGO_DEEPIN,
+        .colors = {
+            FF_COLOR_FG_RED,
+        },
+        .colorKeys = FF_COLOR_FG_RED,
+        .colorTitle = FF_COLOR_FG_RED,
+    },
     // LAST
     {},
 };
@@ -4288,9 +4306,9 @@ static const FFlogo T[] = {
             FF_COLOR_FG_GREEN,
         },
     },
-    // TorizonCore
+    // Torizon OS
     {
-        .names = {"TorizonCore"},
+        .names = {"Torizon OS", "TorizonCore"},
         .lines = FASTFETCH_DATATEXT_LOGO_TORIZONCORE,
         .colors = {
             FF_COLOR_FG_LIGHT_WHITE,

src/modules/btrfs/btrfs.c

@@ -0,0 +1,254 @@
+#include "common/printing.h"
+#include "common/jsonconfig.h"
+#include "common/percent.h"
+#include "detection/btrfs/btrfs.h"
+#include "modules/btrfs/btrfs.h"
+#include "util/stringUtils.h"
+
+#define FF_BTRFS_NUM_FORMAT_ARGS 13
+
+static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t index)
+{
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
+    if (options->moduleArgs.key.length == 0)
+    {
+        if (result->name.length > 0)
+            ffStrbufSetF(&buffer, "%s (%s)", FF_BTRFS_MODULE_NAME, result->name.chars);
+        else
+            ffStrbufSetS(&buffer, FF_BTRFS_MODULE_NAME);
+    }
+    else
+    {
+        ffStrbufClear(&buffer);
+        FF_PARSE_FORMAT_STRING_CHECKED(&buffer, &options->moduleArgs.key, 3, ((FFformatarg[]){
+            FF_FORMAT_ARG(index, "index"),
+            FF_FORMAT_ARG(result->name, "name"),
+            FF_FORMAT_ARG(options->moduleArgs.keyIcon, "icon"),
+        }));
+    }
+
+    uint64_t used = 0, allocated = 0, total = result->totalSize;
+    for (int i = 0; i < 3; ++i)
+    {
+        uint64_t times = result->allocation[i].dup ? 2 : 1;
+        used += result->allocation[i].used * times;
+        allocated += result->allocation[i].total * times;
+    }
+
+    FF_STRBUF_AUTO_DESTROY usedPretty = ffStrbufCreate();
+    ffParseSize(used, &usedPretty);
+    FF_STRBUF_AUTO_DESTROY allocatedPretty = ffStrbufCreate();
+    ffParseSize(allocated, &allocatedPretty);
+    FF_STRBUF_AUTO_DESTROY totalPretty = ffStrbufCreate();
+    ffParseSize(total, &totalPretty);
+
+    double usedPercentage = total > 0 ? (double) used / (double) total * 100.0 : 0;
+    double allocatedPercentage = total > 0 ? (double) allocated / (double) total * 100.0 : 0;
+
+    if(options->moduleArgs.outputFormat.length == 0)
+    {
+        ffPrintLogoAndKey(buffer.chars, index, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
+
+        ffStrbufClear(&buffer);
+        ffStrbufSetF(&buffer, "%s / %s (", usedPretty.chars, totalPretty.chars);
+        ffPercentAppendNum(&buffer, usedPercentage, options->percent, false, &options->moduleArgs);
+        ffStrbufAppendS(&buffer, ", ");
+        ffPercentAppendNum(&buffer, allocatedPercentage, options->percent, false, &options->moduleArgs);
+        ffStrbufAppendF(&buffer, " allocated)");
+        ffStrbufPutTo(&buffer, stdout);
+    }
+    else
+    {
+        FF_STRBUF_AUTO_DESTROY usedPercentageNum = ffStrbufCreate();
+        ffPercentAppendNum(&usedPercentageNum, usedPercentage, options->percent, false, &options->moduleArgs);
+        FF_STRBUF_AUTO_DESTROY usedPercentageBar = ffStrbufCreate();
+        ffPercentAppendBar(&usedPercentageBar, usedPercentage, options->percent, &options->moduleArgs);
+
+        FF_STRBUF_AUTO_DESTROY allocatedPercentageNum = ffStrbufCreate();
+        ffPercentAppendNum(&allocatedPercentageNum, allocatedPercentage, options->percent, false, &options->moduleArgs);
+        FF_STRBUF_AUTO_DESTROY allocatedPercentageBar = ffStrbufCreate();
+        ffPercentAppendBar(&allocatedPercentageBar, allocatedPercentage, options->percent, &options->moduleArgs);
+
+        FF_STRBUF_AUTO_DESTROY nodeSizePretty = ffStrbufCreate();
+        ffParseSize(result->nodeSize, &nodeSizePretty);
+        FF_STRBUF_AUTO_DESTROY sectorSizePretty = ffStrbufCreate();
+        ffParseSize(result->sectorSize, &sectorSizePretty);
+
+        FF_PRINT_FORMAT_CHECKED(buffer.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BTRFS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            FF_FORMAT_ARG(result->name, "name"),
+            FF_FORMAT_ARG(result->uuid, "uuid"),
+            FF_FORMAT_ARG(result->devices, "devices"),
+            FF_FORMAT_ARG(result->features, "features"),
+            FF_FORMAT_ARG(usedPretty, "used"),
+            FF_FORMAT_ARG(allocatedPretty, "allocated"),
+            FF_FORMAT_ARG(totalPretty, "total"),
+            FF_FORMAT_ARG(usedPercentageNum, "used-percentage"),
+            FF_FORMAT_ARG(allocatedPercentageNum, "allocated-percentage"),
+            FF_FORMAT_ARG(usedPercentageBar, "used-percentage-bar"),
+            FF_FORMAT_ARG(allocatedPercentageBar, "allocated-percentage-bar"),
+            FF_FORMAT_ARG(nodeSizePretty, "node-size"),
+            FF_FORMAT_ARG(sectorSizePretty, "sector-size"),
+        }));
+    }
+}
+
+void ffPrintBtrfs(FFBtrfsOptions* options)
+{
+    FF_LIST_AUTO_DESTROY results = ffListCreate(sizeof(FFBtrfsResult));
+
+    const char* error = ffDetectBtrfs(&results);
+
+    if (error)
+    {
+        ffPrintError(FF_BTRFS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        return;
+    }
+    if(results.length == 0)
+    {
+        ffPrintError(FF_BTRFS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", "No btrfs drive found");
+        return;
+    }
+
+    for(uint32_t i = 0; i < results.length; i++)
+    {
+        FFBtrfsResult* result = FF_LIST_GET(FFBtrfsResult, results, i);
+        uint8_t index = results.length == 1 ? 0 : (uint8_t) (i + 1);
+        printBtrfs(options, result, index);
+    }
+
+    FF_LIST_FOR_EACH(FFBtrfsResult, result, results)
+    {
+        ffStrbufDestroy(&result->name);
+        ffStrbufDestroy(&result->uuid);
+        ffStrbufDestroy(&result->devices);
+        ffStrbufDestroy(&result->features);
+    }
+}
+
+bool ffParseBtrfsCommandOptions(FFBtrfsOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_BTRFS_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    if (ffPercentParseCommandOptions(key, subKey, value, &options->percent))
+        return true;
+
+    return false;
+}
+
+void ffParseBtrfsJsonObject(FFBtrfsOptions* options, yyjson_val* module)
+{
+    yyjson_val *key_, *val;
+    size_t idx, max;
+    yyjson_obj_foreach(module, idx, max, key_, val)
+    {
+        const char* key = yyjson_get_str(key_);
+        if(ffStrEqualsIgnCase(key, "type"))
+            continue;
+
+        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
+            continue;
+
+        if (ffPercentParseJsonObject(key, val, &options->percent))
+            continue;
+
+        ffPrintError(FF_BTRFS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", key);
+    }
+}
+
+void ffGenerateBtrfsJsonConfig(FFBtrfsOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
+{
+    __attribute__((__cleanup__(ffDestroyBtrfsOptions))) FFBtrfsOptions defaultOptions;
+    ffInitBtrfsOptions(&defaultOptions);
+
+    ffJsonConfigGenerateModuleArgsConfig(doc, module, &defaultOptions.moduleArgs, &options->moduleArgs);
+
+    ffPercentGenerateJsonConfig(doc, module, defaultOptions.percent, options->percent);
+}
+
+void ffGenerateBtrfsJsonResult(FF_MAYBE_UNUSED FFBtrfsOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
+{
+    FF_LIST_AUTO_DESTROY results = ffListCreate(sizeof(FFBtrfsResult));
+
+    const char* error = ffDetectBtrfs(&results);
+    if (error)
+    {
+        yyjson_mut_obj_add_str(doc, module, "error", error);
+        return;
+    }
+
+    yyjson_mut_val* arr = yyjson_mut_obj_add_arr(doc, module, "result");
+
+    FF_LIST_FOR_EACH(FFBtrfsResult, btrfs, results)
+    {
+        yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr);
+        yyjson_mut_obj_add_strbuf(doc, obj, "name", &btrfs->name);
+        yyjson_mut_obj_add_strbuf(doc, obj, "uuid", &btrfs->uuid);
+        yyjson_mut_obj_add_strbuf(doc, obj, "devices", &btrfs->devices);
+        yyjson_mut_obj_add_strbuf(doc, obj, "features", &btrfs->features);
+        yyjson_mut_obj_add_uint(doc, obj, "generation", btrfs->generation);
+        yyjson_mut_obj_add_uint(doc, obj, "nodeSize", btrfs->nodeSize);
+        yyjson_mut_obj_add_uint(doc, obj, "sectorSize", btrfs->sectorSize);
+        yyjson_mut_obj_add_uint(doc, obj, "totalSize", btrfs->totalSize);
+        yyjson_mut_val* allocation = yyjson_mut_obj_add_arr(doc, obj, "allocation");
+        for (int i = 0; i < 3; ++i)
+        {
+            yyjson_mut_val* item = yyjson_mut_arr_add_obj(doc, allocation);
+            yyjson_mut_obj_add_str(doc, item, "type", btrfs->allocation[i].type);
+            yyjson_mut_obj_add_bool(doc, item, "dup", btrfs->allocation[i].dup);
+            yyjson_mut_obj_add_uint(doc, item, "used", btrfs->allocation[i].used);
+            yyjson_mut_obj_add_uint(doc, item, "total", btrfs->allocation[i].total);
+        }
+    }
+
+    FF_LIST_FOR_EACH(FFBtrfsResult, btrfs, results)
+    {
+        ffStrbufDestroy(&btrfs->name);
+        ffStrbufDestroy(&btrfs->uuid);
+        ffStrbufDestroy(&btrfs->devices);
+        ffStrbufDestroy(&btrfs->features);
+    }
+}
+
+void ffPrintBtrfsHelpFormat(void)
+{
+    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BTRFS_MODULE_NAME, "{5} / {7} ({8}, {9} allocated)", FF_BTRFS_NUM_FORMAT_ARGS, ((const char* []) {
+        "Name / Label - name",
+        "UUID - uuid",
+        "Associated devices - devices",
+        "Enabled features - features",
+        "Size used - used",
+        "Size allocated - allocated",
+        "Size total - total",
+        "Used percentage num - used-percentage",
+        "Allocated percentage num - allocated-percentage",
+        "Used percentage bar - used-percentage-bar",
+        "Allocated percentage bar - allocated-percentage-bar",
+        "Node size - node-size",
+        "Sector size - sector-size",
+    }));
+}
+
+void ffInitBtrfsOptions(FFBtrfsOptions* options)
+{
+    ffOptionInitModuleBaseInfo(
+        &options->moduleInfo,
+        FF_BTRFS_MODULE_NAME,
+        "Print BTRFS volumes",
+        ffParseBtrfsCommandOptions,
+        ffParseBtrfsJsonObject,
+        ffPrintBtrfs,
+        ffGenerateBtrfsJsonResult,
+        ffPrintBtrfsHelpFormat,
+        ffGenerateBtrfsJsonConfig
+    );
+    ffOptionInitModuleArg(&options->moduleArgs, "󱑛");
+    options->percent = (FFColorRangeConfig) { 50, 80 };
+}
+
+void ffDestroyBtrfsOptions(FFBtrfsOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}

src/modules/btrfs/btrfs.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "fastfetch.h"
+
+#define FF_BTRFS_MODULE_NAME "Btrfs"
+
+void ffPrintBtrfs(FFBtrfsOptions* options);
+void ffInitBtrfsOptions(FFBtrfsOptions* options);
+void ffDestroyBtrfsOptions(FFBtrfsOptions* options);

src/modules/btrfs/option.h

@@ -0,0 +1,14 @@
+#pragma once
+
+// This file will be included in "fastfetch.h", do NOT put unnecessary things here
+
+#include "common/option.h"
+#include "common/percent.h"
+
+typedef struct FFBtrfsOptions
+{
+    FFModuleBaseInfo moduleInfo;
+    FFModuleArgs moduleArgs;
+
+    FFColorRangeConfig percent;
+} FFBtrfsOptions;

src/modules/cpu/cpu.c

@@ -6,7 +6,7 @@
 #include "modules/cpu/cpu.h"
 #include "util/stringUtils.h"
 
-#define FF_CPU_NUM_FORMAT_ARGS 10
+#define FF_CPU_NUM_FORMAT_ARGS 9
 
 static int sortCores(const FFCPUCore* a, const FFCPUCore* b)
 {
@@ -19,7 +19,6 @@ void ffPrintCPU(FFCPUOptions* options)
         .temperature = FF_CPU_TEMP_UNSET,
         .frequencyMax = 0,
         .frequencyBase = 0,
-        .frequencyBiosLimit = 0,
         .name = ffStrbufCreate(),
         .vendor = ffStrbufCreate(),
     };
@@ -71,9 +70,7 @@ void ffPrintCPU(FFCPUOptions* options)
             else if(cpu.coresOnline > 1)
                 ffStrbufAppendF(&str, " (%u)", cpu.coresOnline);
 
-            uint32_t freq = cpu.frequencyBiosLimit;
-            if(freq == 0)
-                freq = cpu.frequencyMax;
+            uint32_t freq = cpu.frequencyMax;
             if(freq == 0)
                 freq = cpu.frequencyBase;
             if(freq > 0)
@@ -96,8 +93,6 @@ void ffPrintCPU(FFCPUOptions* options)
             ffParseFrequency(cpu.frequencyBase, &freqBase);
             FF_STRBUF_AUTO_DESTROY freqMax = ffStrbufCreate();
             ffParseFrequency(cpu.frequencyMax, &freqMax);
-            FF_STRBUF_AUTO_DESTROY freqBioslimit = ffStrbufCreate();
-            ffParseFrequency(cpu.frequencyBiosLimit, &freqBioslimit);
 
             FF_STRBUF_AUTO_DESTROY tempStr = ffStrbufCreate();
             ffTempsAppendNum(cpu.temperature, &tempStr, options->tempConfig, &options->moduleArgs);
@@ -111,7 +106,6 @@ void ffPrintCPU(FFCPUOptions* options)
                 FF_FORMAT_ARG(freqMax, "freq-max"),
                 FF_FORMAT_ARG(tempStr, "temperature"),
                 FF_FORMAT_ARG(coreTypes, "core-types"),
-                FF_FORMAT_ARG(freqBioslimit, "freq-bios-limit"),
             }));
         }
     }
@@ -190,7 +184,6 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_
         .temperature = FF_CPU_TEMP_UNSET,
         .frequencyMax = 0,
         .frequencyBase = 0,
-        .frequencyBiosLimit = 0,
         .name = ffStrbufCreate(),
         .vendor = ffStrbufCreate(),
     };
@@ -219,7 +212,6 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_
         yyjson_mut_val* frequency = yyjson_mut_obj_add_obj(doc, obj, "frequency");
         yyjson_mut_obj_add_uint(doc, frequency, "base", cpu.frequencyBase);
         yyjson_mut_obj_add_uint(doc, frequency, "max", cpu.frequencyMax);
-        yyjson_mut_obj_add_uint(doc, frequency, "biosLimit", cpu.frequencyBiosLimit);
 
         yyjson_mut_val* coreTypes = yyjson_mut_obj_add_arr(doc, obj, "coreTypes");
         for (uint32_t i = 0; i < sizeof (cpu.coreTypes) / sizeof (cpu.coreTypes[0]) && cpu.coreTypes[i].count > 0; i++)
@@ -248,7 +240,6 @@ void ffPrintCPUHelpFormat(void)
         "Max frequency (formatted) - freq-max",
         "Temperature (formatted) - temperature",
         "Logical core count grouped by frequency - core-types",
-        "Bios limited frequency (formatted) - freq-bios-limit",
     }));
 }
 

src/modules/display/display.c

@@ -100,7 +100,7 @@ void ffPrintDisplay(FFDisplayOptions* options)
         }
 
         FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
-        double inch = sqrt(result->physicalWidth * result->physicalWidth + result->physicalHeight * result->physicalHeight) / 25.4;
+        uint32_t inch = (uint32_t) (sqrt(result->physicalWidth * result->physicalWidth + result->physicalHeight * result->physicalHeight) / 25.4 + 0.5);
 
         if(options->moduleArgs.outputFormat.length == 0)
         {
@@ -121,8 +121,8 @@ void ffPrintDisplay(FFDisplayOptions* options)
                 result->scaledHeight > 0 && result->scaledHeight != result->height)
                 ffStrbufAppendF(&buffer, " (as %ix%i)", result->scaledWidth, result->scaledHeight);
 
-            if (inch > 0)
-                ffStrbufAppendF(&buffer, " in %i″", (uint32_t) (inch + 0.5));
+            if (inch > 1)
+                ffStrbufAppendF(&buffer, " in %i″", inch);
 
             if(result->type != FF_DISPLAY_TYPE_UNKNOWN)
                 ffStrbufAppendS(&buffer, result->type == FF_DISPLAY_TYPE_BUILTIN ? " [Built-in]" : " [External]");

src/modules/gpu/gpu.c

@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 
-#define FF_GPU_NUM_FORMAT_ARGS 12
+#define FF_GPU_NUM_FORMAT_ARGS 13
 
 static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResult* gpu)
 {
@@ -103,6 +103,7 @@ static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResu
             FF_FORMAT_ARG(sUsed, "shared-used"),
             FF_FORMAT_ARG(gpu->platformApi, "platform-api"),
             FF_FORMAT_ARG(frequency, "frequency"),
+            FF_FORMAT_ARG(index, "index"),
         }));
     }
 }
@@ -322,6 +323,12 @@ void ffGenerateGPUJsonResult(FFGPUOptions* options, yyjson_mut_doc* doc, yyjson_
     FF_LIST_FOR_EACH(FFGPUResult, gpu, gpus)
     {
         yyjson_mut_val* obj = yyjson_mut_arr_add_obj(doc, arr);
+
+        if (gpu->index != FF_GPU_INDEX_UNSET)
+            yyjson_mut_obj_add_uint(doc, obj, "index", gpu->index);
+        else
+            yyjson_mut_obj_add_null(doc, obj, "index");
+
         if (gpu->coreCount != FF_GPU_CORE_COUNT_UNSET)
             yyjson_mut_obj_add_int(doc, obj, "coreCount", gpu->coreCount);
         else
@@ -402,6 +409,7 @@ void ffPrintGPUHelpFormat(void)
         "GPU used shared memory - shared-used",
         "The platform API used when detecting the GPU - platform-api",
         "Current frequency in GHz - frequency",
+        "GPU vendor specific index - index",
     }));
 }
 

src/modules/loadavg/loadavg.c

@@ -32,7 +32,6 @@ void ffPrintLoadavg(FFLoadavgOptions* options)
                 .temperature = FF_CPU_TEMP_UNSET,
                 .frequencyMax = 0,
                 .frequencyBase = 0,
-                .frequencyBiosLimit = 0,
                 .name = ffStrbufCreate(),
                 .vendor = ffStrbufCreate(),
             };

src/modules/localip/localip.c

@@ -54,6 +54,28 @@ static void printIp(FFLocalIpResult* ip, bool markDefaultRoute)
             printf(" (%s)", ip->mac.chars);
         else
             ffStrbufWriteTo(&ip->mac, stdout);
+        flag = true;
+    }
+    if (ip->mtu > 0 || ip->speed > 0)
+    {
+        if (flag)
+            fputs(" [", stdout);
+        if (ip->speed > 0)
+        {
+            if (ip->speed >= 1000000)
+                printf("%g Tbps", ip->speed / 1000000.0);
+            else if (ip->speed >= 1000)
+                printf("Speed %g Gbps", ip->speed / 1000.0);
+            else
+                printf("Speed %u Mbps", (unsigned) ip->speed);
+
+            if (ip->mtu > 0)
+                fputs(" / ", stdout);
+        }
+        if (ip->mtu > 0)
+            printf("MTU %u", (unsigned) ip->mtu);
+        putchar(']');
+        flag = true;
     }
     if (markDefaultRoute && flag && ip->defaultRoute)
         fputs(" *", stdout);
@@ -114,7 +136,9 @@ void ffPrintLocalIp(FFLocalIpOptions* options)
                 FF_STRBUF_AUTO_DESTROY speedStr = ffStrbufCreate();
                 if (ip->speed > 0)
                 {
-                    if (ip->speed >= 1000)
+                    if (ip->speed >= 1000000)
+                        ffStrbufSetF(&speedStr, "%g Tbps", ip->speed / 1000000.0);
+                    else if (ip->speed >= 1000)
                         ffStrbufSetF(&speedStr, "%g Gbps", ip->speed / 1000.0);
                     else
                         ffStrbufSetF(&speedStr, "%u Mbps", (unsigned) ip->speed);
@@ -194,6 +218,24 @@ bool ffParseLocalIpCommandOptions(FFLocalIpOptions* options, const char* key, co
         return true;
     }
 
+    if (ffStrEqualsIgnCase(subKey, "show-mtu"))
+    {
+        if (ffOptionParseBoolean(value))
+            options->showType |= FF_LOCALIP_TYPE_MTU_BIT;
+        else
+            options->showType &= ~FF_LOCALIP_TYPE_MTU_BIT;
+        return true;
+    }
+
+    if (ffStrEqualsIgnCase(subKey, "show-speed"))
+    {
+        if (ffOptionParseBoolean(value))
+            options->showType |= FF_LOCALIP_TYPE_SPEED_BIT;
+        else
+            options->showType &= ~FF_LOCALIP_TYPE_SPEED_BIT;
+        return true;
+    }
+
     if(ffStrEqualsIgnCase(subKey, "compact"))
     {
         if (ffOptionParseBoolean(value))
@@ -288,6 +330,24 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module)
             continue;
         }
 
+        if (ffStrEqualsIgnCase(key, "showMtu"))
+        {
+            if (yyjson_get_bool(val))
+                options->showType |= FF_LOCALIP_TYPE_MTU_BIT;
+            else
+                options->showType &= ~FF_LOCALIP_TYPE_MTU_BIT;
+            continue;
+        }
+
+        if (ffStrEqualsIgnCase(key, "showSpeed"))
+        {
+            if (yyjson_get_bool(val))
+                options->showType |= FF_LOCALIP_TYPE_SPEED_BIT;
+            else
+                options->showType &= ~FF_LOCALIP_TYPE_SPEED_BIT;
+            continue;
+        }
+
         if (ffStrEqualsIgnCase(key, "compact"))
         {
             if (yyjson_get_bool(val))
@@ -349,6 +409,12 @@ void ffGenerateLocalIpJsonConfig(FFLocalIpOptions* options, yyjson_mut_doc* doc,
         if (options->showType & FF_LOCALIP_TYPE_PREFIX_LEN_BIT)
             yyjson_mut_obj_add_bool(doc, module, "showPrefixLen", true);
 
+        if (options->showType & FF_LOCALIP_TYPE_MTU_BIT)
+            yyjson_mut_obj_add_bool(doc, module, "showMtu", true);
+
+        if (options->showType & FF_LOCALIP_TYPE_SPEED_BIT)
+            yyjson_mut_obj_add_bool(doc, module, "showSpeed", true);
+
         if (options->showType & FF_LOCALIP_TYPE_COMPACT_BIT)
             yyjson_mut_obj_add_bool(doc, module, "compact", true);
 

src/modules/localip/option.h

@@ -12,6 +12,8 @@ typedef enum FFLocalIpType
     FF_LOCALIP_TYPE_IPV6_BIT        = 1 << 2,
     FF_LOCALIP_TYPE_MAC_BIT         = 1 << 3,
     FF_LOCALIP_TYPE_PREFIX_LEN_BIT  = 1 << 4,
+    FF_LOCALIP_TYPE_MTU_BIT  = 1 << 5,
+    FF_LOCALIP_TYPE_SPEED_BIT  = 1 << 6,
 
     FF_LOCALIP_TYPE_COMPACT_BIT            = 1 << 10,
     FF_LOCALIP_TYPE_DEFAULT_ROUTE_ONLY_BIT = 1 << 11,

src/modules/modules.h

@@ -10,6 +10,7 @@
 #include "modules/board/board.h"
 #include "modules/bootmgr/bootmgr.h"
 #include "modules/break/break.h"
+#include "modules/btrfs/btrfs.h"
 #include "modules/camera/camera.h"
 #include "modules/chassis/chassis.h"
 #include "modules/cpu/cpu.h"
@@ -61,6 +62,7 @@
 #include "modules/terminaltheme/terminaltheme.h"
 #include "modules/theme/theme.h"
 #include "modules/title/title.h"
+#include "modules/tpm/tpm.h"
 #include "modules/uptime/uptime.h"
 #include "modules/users/users.h"
 #include "modules/version/version.h"

src/modules/options.h

@@ -10,6 +10,7 @@
 #include "modules/bootmgr/option.h"
 #include "modules/break/option.h"
 #include "modules/brightness/option.h"
+#include "modules/btrfs/option.h"
 #include "modules/camera/option.h"
 #include "modules/chassis/option.h"
 #include "modules/cpu/option.h"
@@ -61,6 +62,7 @@
 #include "modules/terminaltheme/option.h"
 #include "modules/theme/option.h"
 #include "modules/title/option.h"
+#include "modules/tpm/option.h"
 #include "modules/uptime/option.h"
 #include "modules/users/option.h"
 #include "modules/version/option.h"

src/modules/packages/option.h

@@ -32,6 +32,7 @@ typedef enum FFPackagesFlags
     FF_PACKAGES_FLAG_LPKGBUILD_BIT = 1 << 22,
     FF_PACKAGES_FLAG_GUIX_BIT = 1 << 23,
     FF_PACKAGES_FLAG_LINGLONG_BIT = 1 << 24,
+    FF_PACKAGES_FLAG_PACSTALL_BIT = 1 << 25,
 } FFPackagesFlags;
 
 typedef struct FFPackagesOptions