Merge pull request #1001 from fastfetch-cli/dev

Release: v2.15.0

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/workflows/ci.yml

@@ -205,6 +205,8 @@ jobs:
 
       - name: setup alpine linux
         uses: jirutka/setup-alpine@master
+        with:
+          branch: v3.19
 
       - name: install dependencies
         run: |
@@ -244,6 +246,7 @@ jobs:
       - name: setup alpine linux
         uses: jirutka/setup-alpine@master
         with:
+          branch: v3.19
           arch: aarch64
 
       - name: install dependencies

.gitignore

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

CHANGELOG.md

@@ -1,3 +1,74 @@
+# 2.15.0
+
+Changes:
+* `--bar-border <?bool>` has been changed to `--bar-border-left <string>` and `--bar-border-right <string>`, which are used for customizing the style of bar border.
+    * `--bar-border-left '' --bar-border-right ''` can be used to disable the border
+
+Features:
+* Add ability to skip installing license with INSTALL_LICENSE option (CMake)
+* Make it possible to shorten the theme and icons output (Theme / Icons)
+* Support `-l '?'` to show a question mark
+* Add new module `CPUCache` to display CPU cache sizes (CPUCache)
+* In `--<module>-format`, `{#keys}` and `{#title}` can be used to reference the color of keys and title
+* Improve speed of Guix package detection (Packages, Linux)
+* Assume wm plugins are daemon processes to improve performance (WM, macOS)
+
+Bugfixes:
+* Remove shebangs from completions (#980)
+* Fix while chars not visible in terminal of light theme (Logo)
+* Normalize bright colors to fix color display in Apple Terminal (#991, Colors)
+* Correctly capitalize GNOME (#997, DE, Linux)
+* Fix segfault on system using turkish language (#995, InitSystem, Linux)
+* Fix kubuntu detection (#1000, OS, Linux)
+* Don't display duplicate entries (OS, Linux)
+
+# 2.14.0
+
+Features:
+* Support monochrome bar type (#960)
+* Support editor version detection on Windows (Editor, Windows)
+* Apply default color palettes in `--file` and `--data` (Logo)
+* Print all presets in `--list-presets` for better Windows support (Windows)
+* Support for guix package manager detection (Packages, Linux)
+* Support named variable placeholders in custom module formattion string (#796)
+    * `--title-format '{user-name-colored}{at-symbol-colored}{host-name-colored}'` is now equivalent to `--title-format '{6}{7}{8}'`
+* Support named color placeholders in custom module formattion string
+    * `--<module>-format '{#red}'` is now equivalent to `--<module>-format '{#31}'`
+    * `'{#red}'` or `'{#31}'` is preferred over `\u001b[31m` because is more readable and `--pipe` aware (will be ignored in pipe mode)
+    * Supported in `Custom` module too
+    * See `fastfetch -h format` for detail
+* Add new module `InitSystem`, which detects the name of init system
+    * i.e. process name of pid1. `init`, `systemd`, etc
+* Add option `--color-separator` to set the color of key-value separators
+* Support Guix package manager count (#792, Packages, Linux)
+* Improve python based shell detection (#977, Shell, macOS)
+* Print error reason when vulkan init fails (Vulkan)
+
+Bugfixes:
+* Don't detect `.conf` files in `--list-config-paths`
+* Don't try to detect terminals in MSYS shell with process backtracing (Windows)
+* Fix `outputColor` doesn't work if module keys are disabled
+
+Logos:
+* Add Cereus Linux
+* Re-add special handling of Loc-OS
+
+# 2.13.2
+
+Another hotfix release :(
+
+Bugfixes:
+* Remove DRM driver version detection feature, which caused a performance regression for nouveau drivers (#956, Display, Linux)
+* Fix compatibility for old python versions. Regression of `2.13.0`
+* Don't use `*-unknown` as display name for Wayland protocol (Display, Linux)
+
+Features:
+* Add new module `Editor` which prints information of the default editor, i.e. $VISUAL or $EDITOR (#430, Editor)
+
+Logos:
+* Added CuerdOS
+* Remove special handling of Loc-OS
+
 # 2.13.1
 
 Fix a regression introduced in v2.13.0
@@ -209,7 +280,7 @@ Features:
 * Improve GPU detection on Linux (GPU, Linux)
     * Support GPU memory usage detection for AMD GPUs
     * Support GPU frequency detection for Intel GPUs
-* Improve performance of Gnome version detection (DE, Linux)
+* Improve performance of GNOME version detection (DE, Linux)
 * Improve performance of kitty version detection (Terminal, Linux)
 * Detect refresh rate when using `--ds-force-drm sysfs-only` (Display, Linux)
 * Add option `--ts-version` to disable terminal and shell version detection. Mainly for benchmarking purposes
@@ -916,7 +987,7 @@ Bugfixes:
 * Fix Windows drives detection in WSL (Linux, Disk)
 * Fix CPU temp detection (FreeBSD, CPU)
 * Fix disk detection (Android, Disk)
-* Fix Gnome Terminal version and font detection (FreeBSD, TerminalFont)
+* Fix GNOME Terminal version and font detection (FreeBSD, TerminalFont)
 * Fix crash on newer wayland desktops (Linux, Display, #477)
 * Fix vendor detection for Intel GPU (macOS, GPU)
 * Fix possible crashes on Windows Server (Windows, GPU, #484)
@@ -942,7 +1013,7 @@ Features:
 * Add mac address detection `--localip-show-mac` (LocalIP, #451)
 
 Bugfixes:
-* Fix Gnome version detection on Fedora (DE)
+* Fix GNOME version detection on Fedora (DE)
 * Fix Windows drives detection in WSL (Disk)
 
 Changes:

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.13.1
+    VERSION 2.15.0
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -14,9 +14,9 @@ set(PROJECT_LICENSE "MIT license")
 ###################
 if(ANDROID)
     set(LINUX FALSE)
-elseif("${CMAKE_SYSTEM_NAME}" MATCHES ".*[Ll]inux.*")
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     set(LINUX TRUE CACHE BOOL "..." FORCE) # LINUX means GNU/Linux, not just the kernel
-elseif("${CMAKE_SYSTEM_NAME}" MATCHES ".*[Bb][Ss][Dd].*")
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
     set(BSD TRUE CACHE BOOL "..." FORCE)
 elseif(NOT APPLE AND NOT WIN32)
     message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
@@ -76,6 +76,14 @@ option(ENABLE_PROPRIETARY_GPU_DRIVER_API "Enable proprietary GPU driver API (NVM
 option(BUILD_TESTS "Build tests" OFF) # Also create test executables
 option(SET_TWEAK "Add tweak to project version" ON) # This is set to off by github actions for release builds
 option(IS_MUSL "Build with musl libc" OFF) # Used by Github Actions
+option(INSTALL_LICENSE "Install license into /usr/share/licenses" ON)
+
+set(BINARY_LINK_TYPE_OPTIONS dlopen dynamic static)
+set(BINARY_LINK_TYPE dlopen CACHE STRING "How to link fastfetch")
+set_property(CACHE BINARY_LINK_TYPE PROPERTY STRINGS ${BINARY_LINK_TYPE_OPTIONS})
+if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS)
+    message(FATAL_ERROR "BINARY_LINK_TYPE must be one of ${BINARY_LINK_TYPE_OPTIONS}")
+endif()
 
 if (LINUX)
     set(CUSTOM_PCI_IDS_PATH "" CACHE STRING "Custom path to file pci.ids, defaults to `/usr/share/hwdata/pci.ids`")
@@ -291,6 +299,7 @@ set(LIBFASTFETCH_SRC
     src/detection/disk/disk.c
     src/detection/diskio/diskio.c
     src/detection/displayserver/displayserver.c
+    src/detection/editor/editor.c
     src/detection/font/font.c
     src/detection/gpu/gpu.c
     src/detection/media/media.c
@@ -322,6 +331,7 @@ set(LIBFASTFETCH_SRC
     src/modules/chassis/chassis.c
     src/modules/colors/colors.c
     src/modules/cpu/cpu.c
+    src/modules/cpucache/cpucache.c
     src/modules/cpuusage/cpuusage.c
     src/modules/cursor/cursor.c
     src/modules/custom/custom.c
@@ -330,10 +340,12 @@ set(LIBFASTFETCH_SRC
     src/modules/de/de.c
     src/modules/disk/disk.c
     src/modules/diskio/diskio.c
+    src/modules/editor/editor.c
     src/modules/font/font.c
     src/modules/gpu/gpu.c
     src/modules/host/host.c
     src/modules/icons/icons.c
+    src/modules/initsystem/initsystem.c
     src/modules/gamepad/gamepad.c
     src/modules/kernel/kernel.c
     src/modules/lm/lm.c
@@ -400,6 +412,7 @@ if(LINUX)
         src/detection/brightness/brightness_linux.c
         src/detection/chassis/chassis_linux.c
         src/detection/cpu/cpu_linux.c
+        src/detection/cpucache/cpucache_linux.c
         src/detection/cpuusage/cpuusage_linux.c
         src/detection/cursor/cursor_linux.c
         src/detection/bluetooth/bluetooth_linux.c
@@ -422,6 +435,7 @@ if(LINUX)
         src/detection/gtk_qt/gtk.c
         src/detection/host/host_linux.c
         src/detection/icons/icons_linux.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_linux.c
         src/detection/lm/lm_linux.c
         src/detection/loadavg/loadavg_linux.c
@@ -469,6 +483,7 @@ elseif(ANDROID)
         src/detection/brightness/brightness_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_linux.c
+        src/detection/cpucache/cpucache_linux.c
         src/detection/cursor/cursor_nosupport.c
         src/detection/cpuusage/cpuusage_linux.c
         src/detection/disk/disk_linux.c
@@ -480,6 +495,7 @@ elseif(ANDROID)
         src/detection/gpu/gpu_nosupport.c
         src/detection/host/host_android.c
         src/detection/icons/icons_nosupport.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_android.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_linux.c
@@ -528,6 +544,7 @@ elseif(BSD)
         src/detection/brightness/brightness_bsd.c
         src/detection/chassis/chassis_bsd.c
         src/detection/cpu/cpu_bsd.c
+        src/detection/cpucache/cpucache_nosupport.c
         src/detection/cpuusage/cpuusage_bsd.c
         src/detection/cursor/cursor_linux.c
         src/detection/disk/disk_bsd.c
@@ -550,6 +567,7 @@ elseif(BSD)
         src/detection/host/host_bsd.c
         src/detection/lm/lm_linux.c
         src/detection/icons/icons_linux.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_bsd.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/locale/locale_linux.c
@@ -597,6 +615,7 @@ elseif(APPLE)
         src/detection/brightness/brightness_apple.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_apple.c
+        src/detection/cpucache/cpucache_apple.c
         src/detection/cpuusage/cpuusage_apple.c
         src/detection/cursor/cursor_apple.m
         src/detection/disk/disk_bsd.c
@@ -609,6 +628,7 @@ elseif(APPLE)
         src/detection/gpu/gpu_apple.m
         src/detection/host/host_apple.c
         src/detection/icons/icons_nosupport.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/libc/libc_apple.c
@@ -657,6 +677,7 @@ elseif(WIN32)
         src/detection/brightness/brightness_windows.cpp
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_windows.c
+        src/detection/cpucache/cpucache_windows.c
         src/detection/cpuusage/cpuusage_windows.c
         src/detection/cursor/cursor_windows.c
         src/detection/disk/disk_windows.c
@@ -667,6 +688,7 @@ elseif(WIN32)
         src/detection/gpu/gpu_windows.c
         src/detection/host/host_windows.c
         src/detection/icons/icons_windows.c
+        src/detection/initsystem/initsystem_nosupport.c
         src/detection/libc/libc_windows.cpp
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_nosupport.c
@@ -815,6 +837,11 @@ if(NOT "${CUSTOM_OS_RELEASE_PATH}" STREQUAL "")
     target_compile_definitions(libfastfetch PRIVATE FF_CUSTOM_OS_RELEASE_PATH=${CUSTOM_OS_RELEASE_PATH})
 endif()
 
+if(NOT BINARY_LINK_TYPE STREQUAL "dlopen")
+    message(STATUS "Enabling custom link type: ${BINARY_LINK_TYPE}")
+    target_compile_definitions(libfastfetch PRIVATE FF_DISABLE_DLOPEN=1)
+endif()
+
 function(ff_lib_enable VARNAME PKGCONFIG_NAMES CMAKE_NAME)
     if(NOT ENABLE_${VARNAME})
         return()
@@ -843,6 +870,11 @@ function(ff_lib_enable VARNAME PKGCONFIG_NAMES CMAKE_NAME)
     target_compile_definitions(libfastfetch PRIVATE FF_HAVE_${VARNAME}=1)
     target_include_directories(libfastfetch PRIVATE ${${VARNAME}_INCLUDE_DIRS})
 
+    if(NOT BINARY_LINK_TYPE STREQUAL "dlopen")
+        target_link_directories(libfastfetch PUBLIC ${${VARNAME}_LIBRARY_DIRS})
+        target_link_libraries(libfastfetch PRIVATE ${${VARNAME}_LIBRARIES})
+    endif()
+
     foreach(FLAG ${${VARNAME}_CFLAGS_OTHER})
         if(FLAG MATCHES "-D.*")
             string(SUBSTRING ${FLAG} 2 -1 FLAG)
@@ -1091,6 +1123,11 @@ elseif(APPLE)
     )
 endif()
 
+if(BINARY_LINK_TYPE STREQUAL "static")
+    target_link_options(fastfetch PRIVATE "-static")
+    target_link_options(flashfetch PRIVATE "-static")
+endif()
+
 ###################
 # Testing targets #
 ###################
@@ -1127,13 +1164,13 @@ install(
 )
 
 install(
-    FILES "${CMAKE_SOURCE_DIR}/completions/bash"
+    FILES "${CMAKE_SOURCE_DIR}/completions/${CMAKE_PROJECT_NAME}.bash"
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/bash-completion/completions"
     RENAME "${CMAKE_PROJECT_NAME}"
 )
 
 install(
-    FILES "${CMAKE_SOURCE_DIR}/completions/fish"
+    FILES "${CMAKE_SOURCE_DIR}/completions/${CMAKE_PROJECT_NAME}.fish"
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/fish/vendor_completions.d"
     RENAME "${CMAKE_PROJECT_NAME}.fish"
 )
@@ -1143,10 +1180,12 @@ install(
     DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}"
 )
 
-install(
-    FILES "${CMAKE_SOURCE_DIR}/LICENSE"
-    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${CMAKE_PROJECT_NAME}"
-)
+if(INSTALL_LICENSE)
+    install(
+        FILES "${CMAKE_SOURCE_DIR}/LICENSE"
+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${CMAKE_PROJECT_NAME}"
+    )
+endif()
 
 install(
     FILES "${PROJECT_BINARY_DIR}/fastfetch.1"

README.md

@@ -43,31 +43,28 @@ Replace sudo with doas depending on what you use.
 
 [See also if fastfetch has been packaged for your favorite Linux distro](#Packaging).
 
-If fastfetch is not packaged for your distro or an outdated version is packaged, [linuxbrew](https://brew.sh/) is a good alternate: `brew install fastfetch`
+If fastfetch is not packaged for your distro or an outdated version is packaged, [linuxbrew](https://brew.sh/) is a good alternative: `brew install fastfetch`
 
 ### macOS
 
-...via [HomeBrew](https://brew.sh):
-
-`brew install fastfetch`
-
-...via [MacPorts](https://www.macports.org):
-
-`sudo port install fastfetch`
+* [HomeBrew](https://formulae.brew.sh/formula/fastfetch#default): `brew install fastfetch`
+* [MacPorts](https://ports.macports.org/port/fastfetch/): `sudo port install fastfetch`
 
 ### Windows
 
-`scoop install fastfetch`
+* [scoop](https://scoop.sh/#/apps?q=fastfetch): `scoop install fastfetch`
+* [winget](https://github.com/microsoft/winget-pkgs/tree/master/manifests/f/Fastfetch-cli/Fastfetch): `winget install fastfetch`
+* [MSYS2 MinGW](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-fastfetch): `pacman -S mingw-w64-<subsystem>-<arch>-fastfetch`
 
 You may also download it directly from [GitHub releases page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and extract the archive.
 
 ### FreeBSD
 
-`pkg install fastfetch`
+* `pkg install fastfetch`
 
 ### Android (Termux)
 
-`pkg install fastfetch`
+* `pkg install fastfetch`
 
 ## Build from source
 
@@ -155,6 +152,15 @@ See `fastfetch -h format` for basic usage. For module specific formattion, see `
 
 Try `fastfetch -l /path/to/logo`. See [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for detail.
 
+If you just want to display distro name in [FIGlet text](https://github.com/pwaller/pyfiglet)
+
+```bash
+# install pyfiglet and jq first
+pyfiglet -s -f small_slant $(fastfetch -s os --format json | jq -r '.[0].result.name') && fastfetch -l none
+```
+
+![image](https://github.com/fastfetch-cli/fastfetch/assets/6134068/6466524e-ab8c-484f-848d-eec7ddeb7df2)
+
 ### Q: Fastfetch runs in white and black on shell startup. Why?
 
 This issue usually happens when using fastfetch with `p10k`. There are known incompatibility between fastfetch and p10k instant prompt.

completions/fastfetch.bash

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 __fastfetch_complete_help()
 {
     local __ff_helps=(

completions/fastfetch.fish

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

debian/changelog

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

debian/files

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

doc/fastfetch.1.in

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

doc/json_schema.json

@@ -387,6 +387,10 @@
                                 "output": {
                                     "description": "Set the color of the module output",
                                     "$ref": "#/$defs/colors"
+                                },
+                                "separator": {
+                                    "description": "Set the color of the key-value separator",
+                                    "$ref": "#/$defs/colors"
                                 }
                             }
                         }
@@ -495,10 +499,15 @@
                             "description": "Set the character to use in total part",
                             "default": "-"
                         },
-                        "border": {
-                            "type": "boolean",
-                            "description": "Whether to show a border around the bar",
-                            "default": true
+                        "borderLeft": {
+                            "type": "string",
+                            "description": "Set the string to use at left border",
+                            "default": "[ "
+                        },
+                        "borderRight": {
+                            "type": "string",
+                            "description": "Set the string to use at right border",
+                            "default": " ]"
                         },
                         "width": {
                             "type": "integer",
@@ -515,7 +524,7 @@
                     "properties": {
                         "type": {
                             "type": "number",
-                            "description": "Set the percentage output type. 1 for percentage number, 2 for bar, 3 for both, 6 for bar only, 9 for colored number",
+                            "description": "Set the percentage output type. 1 for percentage number, 2 for multi-color bar, 3 for both, 6 for bar only, 9 for colored number, 10 for monochrome bar",
                             "minimum": 0,
                             "maximum": 255,
                             "default": 9
@@ -686,6 +695,7 @@
                             "camera",
                             "chassis",
                             "cpu",
+                            "cpucache",
                             "cpuusage",
                             "command",
                             "colors",
@@ -695,11 +705,13 @@
                             "disk",
                             "diskio",
                             "de",
+                            "editor",
                             "font",
                             "gamepad",
                             "gpu",
                             "host",
                             "icons",
+                            "initsystem",
                             "kernel",
                             "lm",
                             "loadavg",
@@ -777,7 +789,7 @@
                                             },
                                             {
                                                 "const": "board",
-                                                "description": "Print mather board name and other info"
+                                                "description": "Print motherboard name and other info"
                                             },
                                             {
                                                 "const": "bootmgr",
@@ -787,6 +799,10 @@
                                                 "const": "camera",
                                                 "description": "Print available cameras"
                                             },
+                                            {
+                                                "const": "cpucache",
+                                                "description": "Print CPU cache sizes"
+                                            },
                                             {
                                                 "const": "cursor",
                                                 "description": "Print cursor style name"
@@ -795,6 +811,10 @@
                                                 "const": "datetime",
                                                 "description": "Print current date and time"
                                             },
+                                            {
+                                                "const": "editor",
+                                                "description": "Print information of the default editor ($VISUAL or $EDITOR)"
+                                            },
                                             {
                                                 "const": "font",
                                                 "description": "Print system font name"
@@ -807,6 +827,10 @@
                                                 "const": "icons",
                                                 "description": "Print icon style name"
                                             },
+                                            {
+                                                "const": "initsystem",
+                                                "description": "Print init system (pid 1) name and version"
+                                            },
                                             {
                                                 "const": "kernel",
                                                 "description": "Print system kernel version"

presets/all.jsonc

@@ -1,19 +1,27 @@
 {
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "padding": {
+            "top": 2
+        }
+    },
     "modules": [
         "title",
         "separator",
         "os",
         "host",
         "bios",
+        "bootmgr",
         "board",
         "chassis",
         "kernel",
+        "initsystem",
         "uptime",
         "loadavg",
         "processes",
         "packages",
         "shell",
+        "editor",
         "display",
         "brightness",
         "monitor",
@@ -30,9 +38,17 @@
         "terminalfont",
         "terminalsize",
         "terminaltheme",
-        "cpu",
+        {
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "temp": true
+        },
+        "cpucache",
         "cpuusage",
-        "gpu",
+        {
+            "type": "gpu",
+            "temp": true
+        },
         "memory",
         "physicalmemory",
         "swap",
@@ -42,7 +58,11 @@
         "player",
         "media",
         "publicip",
-        "localip",
+        {
+            "type": "localip",
+            "showIpv6": true,
+            "showMac": true
+        },
         "wifi",
         "datetime",
         "locale",
@@ -54,10 +74,16 @@
         "sound",
         "camera",
         "gamepad",
-        "weather",
+        {
+          "type": "weather",
+          "timeout": 1000
+        },
         "netio",
         "diskio",
-        "physicaldisk",
+        {
+            "type": "physicaldisk",
+            "temp": true
+        },
         "version",
         "break",
         "colors"

presets/archey.jsonc

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

presets/ci.jsonc

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

presets/examples/10.jsonc

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

presets/examples/11.jsonc

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

presets/examples/12.jsonc

@@ -4,7 +4,10 @@
         "type": "none"
     },
     "display": {
-        "separator": "->   "
+        "separator": "->   ",
+        "color": {
+            "separator": "1"
+        }
     },
     "modules": [
         {
@@ -14,7 +17,7 @@
         "break",
         {
             "type": "custom",
-            "format": "┌───────────────────────────── \u001b[1mSystem Information\u001b[0m ─────────────────────────────┐" // `\u001b` is `\033`, or `\e`
+            "format": "┌───────────────────────────── {#1}System Information{#} ─────────────────────────────┐"
         },
         "break",
         {
@@ -92,7 +95,7 @@
         "break",
         {
             "type": "custom",
-            "format": "└──────────────────────────────────────────────────────────────────────────────┘" // `\u001b` is `\033`, or `\e`
+            "format": "└──────────────────────────────────────────────────────────────────────────────┘"
         },
         "break",
         {

presets/examples/13.jsonc

@@ -17,54 +17,55 @@
         },
         {
             // draw borders first to make colors of left and right border consistant
-            "key": "│           │\u001b[11D\u001b[31m user",
+            "key": "│           │\u001b[11D{#31} user",
             "type": "title",
             "format": "{1}"
         },
         {
-            "key": "│           │\u001b[11D\u001b[32m󰇅 hname",
+            "key": "│           │\u001b[11D{#32}󰇅 hname",
             "type": "title",
             "format": "{2}"
         },
         {
-            "key": "│           │\u001b[11D\u001b[33m󰅐 uptime",
+            "key": "│           │\u001b[11D{#33}󰅐 uptime",
             "type": "uptime"
         },
         {
-            "key": "│           │\u001b[11D\u001b[34m󰟾 distro",
+            "key": "│           │\u001b[11D{#34}󰟾 distro",
             "type": "os"
         },
         {
-            "key": "│           │\u001b[11D\u001b[35m kernel",
+            "key": "│           │\u001b[11D{#35} kernel",
             "type": "kernel"
         },
         {
-            "key": "│           │\u001b[11D\u001b[36m󰇄 desktop",
+            "key": "│           │\u001b[11D{#36}󰇄 desktop",
             "type": "de"
         },
         {
-            "key": "│           │\u001b[11D\u001b[31m term",
+            "key": "│           │\u001b[11D{#31} term",
             "type": "terminal"
         },
         {
-            "key": "│           │\u001b[11D\u001b[32m shell",
+            "key": "│           │\u001b[11D{#32} shell",
             "type": "shell"
         },
         {
-            "key": "│           │\u001b[11D\u001b[33m󰍛 cpu",
-            "type": "cpu"
+            "key": "│           │\u001b[11D{#33}󰍛 cpu",
+            "type": "cpu",
+            "showPeCoreCount": true
         },
         {
-            "key": "│           │\u001b[11D\u001b[34m󰉉 disk",
+            "key": "│           │\u001b[11D{#34}󰉉 disk",
             "type": "disk",
             "folders": "/"
         },
         {
-            "key": "│           │\u001b[11D\u001b[35m memory",
+            "key": "│           │\u001b[11D{#35} memory",
             "type": "memory"
         },
         {
-            "key": "│           │\u001b[11D\u001b[36m󰩟 network",
+            "key": "│           │\u001b[11D{#36}󰩟 network",
             "type": "localip",
             "format": "{1} ({4})"
         },
@@ -73,7 +74,7 @@
             "type": "custom"
         },
         {
-            "key": "│           │\u001b[11D\u001b[m colors",
+            "key": "│           │\u001b[11D{#39} colors",
             "type": "colors",
             "symbol": "circle"
         },

presets/examples/14.jsonc

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

presets/examples/15.jsonc

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

presets/examples/16.jsonc

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

presets/examples/17.jsonc

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

presets/examples/18.jsonc

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

presets/examples/2.jsonc

@@ -5,7 +5,7 @@
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
     // "logo": {
     //     "type": "iterm",
-    //     "source": "/Users/carter/Desktop/apple1.png",
+    //     "source": "~/Desktop/apple1.png",
     //     "width": 28,
     //     "height": 12
     // },
@@ -15,7 +15,8 @@
     "modules": [
         {
             "type": "custom", // HardwareStart
-            "format": "┌─────────── \u001b[1mHardware Information\u001b[0m ───────────┐" // `\u001b` is `\033`, or `\e`
+            // {#1} is equivalent to `\u001b[1m`. {#} is equivalent to `\u001b[m`
+            "format": "┌─────────── {#1}Hardware Information{#} ───────────┐"
         },
         {
             "type": "host",
@@ -71,7 +72,7 @@
         },
         {
             "type": "custom", // SoftwareStart
-            "format": "├─────────── \u001b[1mSoftware Information\u001b[0m ───────────┤"
+            "format": "├─────────── {#1}Software Information{#} ───────────┤"
         },
         {
             "type": "title",

presets/examples/7.jsonc

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

presets/examples/8.jsonc

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

presets/examples/9.jsonc

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

presets/paleofetch.jsonc

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

presets/screenfetch.jsonc

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

src/3rdparty/igcl/LICENSE

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

src/3rdparty/igcl/repo.json

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

src/3rdparty/mk_wcwidch/repo.json

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

src/3rdparty/nvml/repo.json

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

src/common/format.c

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

src/common/format.h

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

src/common/init.c

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

src/common/library.c

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

src/common/library.h

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

src/common/modules.c

@@ -21,6 +21,7 @@ static FFModuleBaseInfo* C[] = {
     (void*) &instance.config.modules.command,
     (void*) &instance.config.modules.colors,
     (void*) &instance.config.modules.cpu,
+    (void*) &instance.config.modules.cpuCache,
     (void*) &instance.config.modules.cpuUsage,
     (void*) &instance.config.modules.cursor,
     (void*) &instance.config.modules.custom,
@@ -37,6 +38,7 @@ static FFModuleBaseInfo* D[] = {
 };
 
 static FFModuleBaseInfo* E[] = {
+    (void*) &instance.config.modules.editor,
     NULL,
 };
 
@@ -58,6 +60,7 @@ static FFModuleBaseInfo* H[] = {
 
 static FFModuleBaseInfo* I[] = {
     (void*) &instance.config.modules.icons,
+    (void*) &instance.config.modules.initSystem,
     NULL,
 };
 

src/common/option.c

@@ -1,3 +1,4 @@
+#include "fastfetch.h"
 #include "common/option.h"
 #include "common/color.h"
 #include "util/stringUtils.h"
@@ -145,49 +146,55 @@ bool ffOptionParseBoolean(const char* str)
     );
 }
 
-void ffOptionParseColor(const char* value, FFstrbuf* buffer)
+void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
 {
-    ffStrbufClear(buffer);
     ffStrbufEnsureFree(buffer, 63);
 
     while(*value != '\0')
     {
         #define FF_APPEND_COLOR_CODE_COND(prefix, code) \
-            if(ffStrStartsWithIgnCase(value, #prefix)) { ffStrbufAppendS(buffer, code); value += strlen(#prefix); }
+            if(ffStrStartsWithIgnCase(value, #prefix)) { ffStrbufAppendS(buffer, code); value += strlen(#prefix); continue; }
+        #define FF_APPEND_COLOR_PROP_COND(prefix, prop) \
+            if(ffStrStartsWithIgnCase(value, #prefix)) { if (instance.config.display.prop.length) ffStrbufAppend(buffer, &instance.config.display.prop); else ffStrbufAppendS(buffer, FF_COLOR_FG_DEFAULT); value += strlen(#prefix); continue; }
 
-        FF_APPEND_COLOR_CODE_COND(reset_, FF_COLOR_MODE_RESET)
-        else FF_APPEND_COLOR_CODE_COND(bright_, FF_COLOR_MODE_BOLD)
-        else FF_APPEND_COLOR_CODE_COND(dim_, FF_COLOR_MODE_DIM)
-        else FF_APPEND_COLOR_CODE_COND(italic_, FF_COLOR_MODE_ITALIC)
-        else FF_APPEND_COLOR_CODE_COND(underline_, FF_COLOR_MODE_UNDERLINE)
-        else FF_APPEND_COLOR_CODE_COND(blink_, FF_COLOR_MODE_BLINK)
-        else FF_APPEND_COLOR_CODE_COND(inverse_, FF_COLOR_MODE_INVERSE)
-        else FF_APPEND_COLOR_CODE_COND(hidden_, FF_COLOR_MODE_HIDDEN)
-        else FF_APPEND_COLOR_CODE_COND(strike_, FF_COLOR_MODE_STRIKETHROUGH)
-        else FF_APPEND_COLOR_CODE_COND(black, FF_COLOR_FG_BLACK)
-        else FF_APPEND_COLOR_CODE_COND(red, FF_COLOR_FG_RED)
-        else FF_APPEND_COLOR_CODE_COND(green, FF_COLOR_FG_GREEN)
-        else FF_APPEND_COLOR_CODE_COND(yellow, FF_COLOR_FG_YELLOW)
-        else FF_APPEND_COLOR_CODE_COND(blue, FF_COLOR_FG_BLUE)
-        else FF_APPEND_COLOR_CODE_COND(magenta, FF_COLOR_FG_MAGENTA)
-        else FF_APPEND_COLOR_CODE_COND(cyan, FF_COLOR_FG_CYAN)
-        else FF_APPEND_COLOR_CODE_COND(white, FF_COLOR_FG_WHITE)
-        else FF_APPEND_COLOR_CODE_COND(default, FF_COLOR_FG_DEFAULT)
-        else FF_APPEND_COLOR_CODE_COND(light_black, FF_COLOR_FG_LIGHT_BLACK)
-        else FF_APPEND_COLOR_CODE_COND(light_red, FF_COLOR_FG_LIGHT_RED)
-        else FF_APPEND_COLOR_CODE_COND(light_green, FF_COLOR_FG_LIGHT_GREEN)
-        else FF_APPEND_COLOR_CODE_COND(light_yellow, FF_COLOR_FG_LIGHT_YELLOW)
-        else FF_APPEND_COLOR_CODE_COND(light_blue, FF_COLOR_FG_LIGHT_BLUE)
-        else FF_APPEND_COLOR_CODE_COND(light_magenta, FF_COLOR_FG_LIGHT_MAGENTA)
-        else FF_APPEND_COLOR_CODE_COND(light_cyan, FF_COLOR_FG_LIGHT_CYAN)
-        else FF_APPEND_COLOR_CODE_COND(light_white, FF_COLOR_FG_LIGHT_WHITE)
-        else
+        if (ffCharIsEnglishAlphabet(value[0]))
         {
-            ffStrbufAppendC(buffer, *value);
-            ++value;
+            FF_APPEND_COLOR_CODE_COND(reset_, FF_COLOR_MODE_RESET)
+            else FF_APPEND_COLOR_CODE_COND(bright_, FF_COLOR_MODE_BOLD)
+            else FF_APPEND_COLOR_CODE_COND(dim_, FF_COLOR_MODE_DIM)
+            else FF_APPEND_COLOR_CODE_COND(italic_, FF_COLOR_MODE_ITALIC)
+            else FF_APPEND_COLOR_CODE_COND(underline_, FF_COLOR_MODE_UNDERLINE)
+            else FF_APPEND_COLOR_CODE_COND(blink_, FF_COLOR_MODE_BLINK)
+            else FF_APPEND_COLOR_CODE_COND(inverse_, FF_COLOR_MODE_INVERSE)
+            else FF_APPEND_COLOR_CODE_COND(hidden_, FF_COLOR_MODE_HIDDEN)
+            else FF_APPEND_COLOR_CODE_COND(strike_, FF_COLOR_MODE_STRIKETHROUGH)
+            else FF_APPEND_COLOR_CODE_COND(black, FF_COLOR_FG_BLACK)
+            else FF_APPEND_COLOR_CODE_COND(red, FF_COLOR_FG_RED)
+            else FF_APPEND_COLOR_CODE_COND(green, FF_COLOR_FG_GREEN)
+            else FF_APPEND_COLOR_CODE_COND(yellow, FF_COLOR_FG_YELLOW)
+            else FF_APPEND_COLOR_CODE_COND(blue, FF_COLOR_FG_BLUE)
+            else FF_APPEND_COLOR_CODE_COND(magenta, FF_COLOR_FG_MAGENTA)
+            else FF_APPEND_COLOR_CODE_COND(cyan, FF_COLOR_FG_CYAN)
+            else FF_APPEND_COLOR_CODE_COND(white, FF_COLOR_FG_WHITE)
+            else FF_APPEND_COLOR_CODE_COND(default, FF_COLOR_FG_DEFAULT)
+            else FF_APPEND_COLOR_CODE_COND(light_black, FF_COLOR_FG_LIGHT_BLACK)
+            else FF_APPEND_COLOR_CODE_COND(light_red, FF_COLOR_FG_LIGHT_RED)
+            else FF_APPEND_COLOR_CODE_COND(light_green, FF_COLOR_FG_LIGHT_GREEN)
+            else FF_APPEND_COLOR_CODE_COND(light_yellow, FF_COLOR_FG_LIGHT_YELLOW)
+            else FF_APPEND_COLOR_CODE_COND(light_blue, FF_COLOR_FG_LIGHT_BLUE)
+            else FF_APPEND_COLOR_CODE_COND(light_magenta, FF_COLOR_FG_LIGHT_MAGENTA)
+            else FF_APPEND_COLOR_CODE_COND(light_cyan, FF_COLOR_FG_LIGHT_CYAN)
+            else FF_APPEND_COLOR_CODE_COND(light_white, FF_COLOR_FG_LIGHT_WHITE)
+            else FF_APPEND_COLOR_PROP_COND(keys, colorKeys)
+            else FF_APPEND_COLOR_PROP_COND(title, colorTitle)
+            else FF_APPEND_COLOR_PROP_COND(output, colorOutput)
+            else FF_APPEND_COLOR_PROP_COND(separator, colorSeparator)
         }
+        ffStrbufAppendC(buffer, *value);
+        ++value;
 
         #undef FF_APPEND_COLOR_CODE_COND
+        #undef FF_APPEND_COLOR_PROP_COND
     }
 }
 

src/common/option.h

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

src/common/percent.c

@@ -24,12 +24,11 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig con
     uint32_t blocksPercent = (uint32_t) (percent / 100.0 * options->barWidth + 0.5);
     assert(blocksPercent <= options->barWidth);
 
-    if(options->barBorder)
+    if(options->barBorderLeft.length)
     {
         if(!options->pipe)
-            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m[ ");
-        else
-            ffStrbufAppendS(buffer, "[ ");
+            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m");
+        ffStrbufAppend(buffer, &options->barBorderLeft);
     }
 
     if (percent != percent)
@@ -50,14 +49,34 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig con
         {
             if(!options->pipe)
             {
-                uint32_t section1Begin = (uint32_t) ((green <= yellow ? green : yellow) / 100.0 * options->barWidth + 0.5);
-                uint32_t section2Begin = (uint32_t) ((green > yellow ? green : yellow) / 100.0 * options->barWidth + 0.5);
-                if (i == section2Begin)
-                    ffStrbufAppendF(buffer, "\e[%sm", (green > yellow ? colorGreen : colorRed));
-                else if (i == section1Begin)
-                    ffStrbufAppendF(buffer, "\e[%sm", colorYellow);
-                else if (i == 0)
-                    ffStrbufAppendF(buffer, "\e[%sm", (green <= yellow ? colorGreen : colorRed));
+                if (options->percentType & FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT)
+                {
+                    const char* color = NULL;
+                    if (green <= yellow)
+                    {
+                        if (percent < green) color = colorGreen;
+                        else if (percent < yellow) color = colorYellow;
+                        else color = colorRed;
+                    }
+                    else
+                    {
+                        if (percent < yellow) color = colorRed;
+                        else if (percent < green) color = colorYellow;
+                        else color = colorGreen;
+                    }
+                    ffStrbufAppendF(buffer, "\e[%sm", color);
+                }
+                else
+                {
+                    uint32_t section1Begin = (uint32_t) ((green <= yellow ? green : yellow) / 100.0 * options->barWidth + 0.5);
+                    uint32_t section2Begin = (uint32_t) ((green > yellow ? green : yellow) / 100.0 * options->barWidth + 0.5);
+                    if (i == section2Begin)
+                        ffStrbufAppendF(buffer, "\e[%sm", (green > yellow ? colorGreen : colorRed));
+                    else if (i == section1Begin)
+                        ffStrbufAppendF(buffer, "\e[%sm", colorYellow);
+                    else if (i == 0)
+                        ffStrbufAppendF(buffer, "\e[%sm", (green <= yellow ? colorGreen : colorRed));
+                }
             }
             ffStrbufAppend(buffer, &options->barCharElapsed);
         }
@@ -71,12 +90,11 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig con
         }
     }
 
-    if(options->barBorder)
+    if(options->barBorderRight.length)
     {
         if(!options->pipe)
-            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m ]");\
-        else
-            ffStrbufAppendS(buffer, " ]");
+            ffStrbufAppendS(buffer, "\e[" FF_COLOR_FG_LIGHT_WHITE "m");
+        ffStrbufAppend(buffer, &options->barBorderRight);
     }
 
     if(!options->pipe)

src/common/percent.h

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

src/common/printing.c

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

src/common/processing.h

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

src/common/processing_linux.c

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

src/common/processing_windows.c

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

src/common/settings.c

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

src/data/help.json

@@ -51,6 +51,18 @@
         {
             "long": "print-structure",
             "desc": "Print the default structure"
+        },
+        {
+            "long": "format",
+            "desc": "Set output format",
+            "arg": {
+                "type": "enum",
+                "enum": {
+                    "default": "Default format",
+                    "json": "JSON format"
+                },
+                "default": "default"
+            }
         }
     ],
     "Config": [
@@ -457,6 +469,14 @@
                 "type": "color"
             }
         },
+        {
+            "long": "color-separator",
+            "desc": "Set the color of the key-value separator",
+            "remark": "See `-h color` for the list of available colors",
+            "arg": {
+                "type": "color"
+            }
+        },
         {
             "long": "color",
             "desc": "Set the color of both the keys and title",
@@ -534,10 +554,11 @@
             "desc": "Set the percentage output type",
             "remark": [
                 "1 for percentage number",
-                "2 for bar",
+                "2 for multi-color bar",
                 "3 for both",
                 "6 for bar only",
-                "9 for colored number"
+                "9 for colored number",
+                "10 for monochrome bar"
             ],
             "arg": {
                 "type": "num",
@@ -595,6 +616,22 @@
                 "default": "-"
             }
         },
+        {
+            "long": "bar-border-left",
+            "desc": "Set the string to use at left border of percentage bars",
+            "arg": {
+                "type": "string",
+                "default": "[ "
+            }
+        },
+        {
+            "long": "bar-border-right",
+            "desc": "Set the string to use at right border of percentage bars",
+            "arg": {
+                "type": "string",
+                "default": " ]"
+            }
+        },
         {
             "long": "bar-width",
             "desc": "Set the width of percentage bars, in number of characters",
@@ -603,15 +640,6 @@
                 "default": 10
             }
         },
-        {
-            "long": "bar-border",
-            "desc": "Whether to show a border around percentage bars",
-            "arg": {
-                "type": "bool",
-                "optional": true,
-                "default": true
-            }
-        },
         {
             "long": "no-buffer",
             "desc": "Set if the stdout application buffer should be disabled",
@@ -1161,6 +1189,15 @@
                 "default": false
             }
         },
+        {
+            "long": "cpucache-compact",
+            "desc": "Show all CPU caches in one line",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": false
+            }
+        },
         {
             "long": "cpuusage-separate",
             "desc": "Display CPU usage per CPU logical core, instead of an average result",
@@ -1208,13 +1245,13 @@
         {
             "long": "gpu-detection-method",
             "desc": "Force using a specified method to detect GPUs",
-            "remark": "Methods are used in this order: DRM (Linux only) -> PCI (Linux, FreeBSD and other platform specific methods) -> Vulkan -> OpenGL",
+            "remark": "Will fall back to next methods if the specified method fails",
             "arg": {
                 "type": "enum",
                 "enum": {
-                    "auto": "Use DRM if available, which is most feature-rich. Requires proper DRM driver installed",
-                    "pci": "Search PCI devices, which do not requires any driver installed",
-                    "vulkan": "Use Vulkan API. Slow and requires vulkan driver installed",
+                    "auto": "Query platform specific graphic APIs. Requires proper GPU drivers installed. Not supported on FreeBSD",
+                    "pci": "Search PCI devices, which do not requires GPU driver installed. Not supported on Windows and macOS",
+                    "vulkan": "Use Vulkan API. Slow and requires vulkan driver installed. Used for Android",
                     "opengl": "Use OpenGL API. Slow and only detects one GPU"
                 },
                 "default": "auto"

src/data/help_color.txt

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

src/data/help_format.txt

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

src/detection/brightness/brightness_linux.c

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

src/detection/cpu/cpu_linux.c

@@ -9,7 +9,6 @@
 #include <sys/sysinfo.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <ctype.h>
 
 #ifdef __ANDROID__
 #include "common/settings.h"
@@ -116,13 +115,13 @@ static uint8_t getNumCores(FFstrbuf* basePath, FFstrbuf* buffer)
     bool ok = ffReadFileBuffer(basePath->chars, buffer);
     ffStrbufSubstrBefore(basePath, baseLen);
     if (ok)
-        return (uint8_t) ffStrbufCountC(buffer, ' ') + 1;
+        return (uint8_t) (ffStrbufCountC(buffer, ' ') + 1);
 
     ffStrbufAppendS(basePath, "/related_cpus");
     ok = ffReadFileBuffer(basePath->chars, buffer);
     ffStrbufSubstrBefore(basePath, baseLen);
     if (ok)
-        return (uint8_t) ffStrbufCountC(buffer, ' ') + 1;
+        return (uint8_t) (ffStrbufCountC(buffer, ' ') + 1);
 
     return 0;
 }
@@ -139,7 +138,7 @@ static bool detectFrequency(FFCPUResult* cpu, const FFCPUOptions* options)
     struct dirent* entry;
     while ((entry = readdir(dir)) != NULL)
     {
-        if (ffStrStartsWith(entry->d_name, "policy") && isdigit(entry->d_name[strlen("policy")]))
+        if (ffStrStartsWith(entry->d_name, "policy") && ffCharIsDigit(entry->d_name[strlen("policy")]))
         {
             ffStrbufAppendS(&path, entry->d_name);
             uint32_t fbase = getFrequency(&path, "/base_frequency", NULL, &buffer);

src/detection/cpu/cpu_windows.c

@@ -126,9 +126,9 @@ static const char* detectNCores(FFCPUResult* cpu)
         ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
     )
     {
-        if(ptr->Relationship == RelationProcessorCore)
+        if (ptr->Relationship == RelationProcessorCore)
             ++cpu->coresPhysical;
-        else if(ptr->Relationship == RelationGroup)
+        else if (ptr->Relationship == RelationGroup)
         {
             for (uint32_t index = 0; index < ptr->Group.ActiveGroupCount; ++index)
             {

src/detection/cpucache/cpucache.h

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

src/detection/cpucache/cpucache_apple.c

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

src/detection/cpucache/cpucache_linux.c

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

src/detection/cpucache/cpucache_nosupport.c

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

src/detection/cpucache/cpucache_windows.c

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

src/detection/de/de_linux.c

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

src/detection/displayserver/displayserver.h

@@ -3,8 +3,8 @@
 #include "fastfetch.h"
 
 #define FF_DE_PRETTY_PLASMA "KDE Plasma"
-#define FF_DE_PRETTY_GNOME "Gnome"
-#define FF_DE_PRETTY_GNOME_CLASSIC "Gnome Classic"
+#define FF_DE_PRETTY_GNOME "GNOME"
+#define FF_DE_PRETTY_GNOME_CLASSIC "GNOME Classic"
 #define FF_DE_PRETTY_XFCE4 "Xfce4"
 #define FF_DE_PRETTY_CINNAMON "Cinnamon"
 #define FF_DE_PRETTY_MATE "Mate"

src/detection/displayserver/linux/drm.c

@@ -194,7 +194,7 @@ static const char* drmGetNameByConnId(uint32_t connId, FFstrbuf* name)
 
 static const char* drmConnectLibdrm(FFDisplayServerResult* result)
 {
-    FF_LIBRARY_LOAD(libdrm, &instance.config.library.libdrm, "dlopen(libdrm)" FF_LIBRARY_EXTENSION " failed", "libdrm" FF_LIBRARY_EXTENSION, 2)
+    FF_LIBRARY_LOAD(libdrm, &instance.config.library.libdrm, "dlopen libdrm" FF_LIBRARY_EXTENSION " failed", "libdrm" FF_LIBRARY_EXTENSION, 2)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmGetDevices)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetResources)
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libdrm, drmModeGetConnectorCurrent)

src/detection/displayserver/linux/wayland/global-output.c

@@ -118,7 +118,8 @@ void ffWaylandHandleGlobalOutput(WaylandData* wldata, struct wl_registry* regist
         rotation,
         display.edidName.length
             ? &display.edidName
-            : display.description.length && !ffStrbufEndsWithS(&display.description, "-unknown")
+            // Try ignoring `eDP-1-unknown`, where `unknown` is localized
+            : display.description.length && !(ffStrbufStartsWithS(&display.description, display.name.chars) && display.description.chars[display.name.length] == '-')
                 ? &display.description
                 : &display.name,
         display.type,

src/detection/displayserver/linux/wmde.c

@@ -4,7 +4,6 @@
 #include "util/mallocHelper.h"
 
 #include <stdlib.h>
-#include <ctype.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -44,7 +43,7 @@ static const char* parseEnv(void)
         return "KDE";
 
     if(getenv("GNOME_DESKTOP_SESSION_ID") != NULL)
-        return "Gnome";
+        return "GNOME";
 
     if(getenv("MATE_DESKTOP_SESSION_ID") != NULL)
         return "Mate";
@@ -164,7 +163,7 @@ static void applyPrettyNameIfDE(FFDisplayServerResult* result, const char* name)
     }
 
     else if(
-        ffStrEqualsIgnCase(name, "Gnome") ||
+        ffStrEqualsIgnCase(name, "GNOME") ||
         ffStrEqualsIgnCase(name, "ubuntu:GNOME") ||
         ffStrEqualsIgnCase(name, "ubuntu") ||
         ffStrEqualsIgnCase(name, "gnome-shell")
@@ -320,7 +319,7 @@ static const char* getFromProcesses(FFDisplayServerResult* result)
     while((dirent = readdir(procdir)) != NULL)
     {
         //Match only folders starting with a number (the pid folders)
-        if(dirent->d_type != DT_DIR || !isdigit(dirent->d_name[0]))
+        if(dirent->d_type != DT_DIR || !ffCharIsDigit(dirent->d_name[0]))
             continue;
 
         ffStrbufAppendS(&procPath, dirent->d_name);

src/detection/editor/editor.c

@@ -0,0 +1,135 @@
+#include "editor.h"
+#include "common/processing.h"
+#include "util/stringUtils.h"
+
+#include <stdlib.h>
+
+#ifdef _WIN32
+#include <windows.h>
+static inline char* realpath(const char* restrict file_name, char* restrict resolved_name)
+{
+    return _fullpath(resolved_name, file_name, _MAX_PATH);
+}
+#endif
+
+const char* ffDetectEditor(FFEditorResult* result)
+{
+    ffStrbufSetS(&result->name, getenv("VISUAL"));
+    if (result->name.length)
+        result->type = "Visual";
+    else
+    {
+        ffStrbufSetS(&result->name, getenv("EDITOR"));
+        if (result->name.length)
+            result->type = "Editor";
+        else
+            return "$VISUAL or $EDITOR not set";
+    }
+
+    #ifndef _WIN32
+    if (result->name.chars[0] != '/')
+    {
+        if (ffProcessAppendStdOut(&result->path, (char* const[]){
+            FASTFETCH_TARGET_DIR_USR "/bin/which",
+            result->name.chars,
+            NULL,
+        }) != NULL || result->path.length == 0)
+            return NULL;
+    }
+    #else
+    if (!(result->name.length > 3 && ffCharIsEnglishAlphabet(result->name.chars[0]) && result->name.chars[1] == ':' && result->name.chars[2] == '\\'))
+    {
+        char buf[32];
+        uint32_t len = GetSystemDirectoryA(buf, sizeof(buf));
+        if (len < strlen("C:\\WINDOWS\\system32")) return NULL;
+        strncpy(buf + len, "\\where.exe", sizeof(buf) - len);
+        if (ffProcessAppendStdOut(&result->path, (char* const[]){
+            buf,
+            result->name.chars,
+            NULL,
+        }) != NULL || result->path.length == 0)
+            return NULL;
+    }
+    #endif
+    else
+        ffStrbufSet(&result->path, &result->name);
+
+    char buf[PATH_MAX + 1];
+    if (!realpath(result->path.chars, buf))
+        return NULL;
+
+    ffStrbufSetS(&result->path, buf);
+
+    {
+        uint32_t index = ffStrbufLastIndexC(&result->path,
+            #ifndef _WIN32
+            '/'
+            #else
+            '\\'
+            #endif
+        );
+        if (index == result->path.length)
+            return NULL;
+        ffStrbufSetS(&result->exe, &result->path.chars[index + 1]);
+        if (!result->exe.length)
+            return NULL;
+
+        #ifdef _WIN32
+        if (ffStrbufEndsWithS(&result->exe, ".exe"))
+            ffStrbufSubstrBefore(&result->exe, result->exe.length - 4);
+        #endif
+    }
+
+    const char* param = NULL;
+    if (
+        ffStrbufEqualS(&result->exe, "nano") ||
+        ffStrbufEqualS(&result->exe, "vim") ||
+        ffStrbufEqualS(&result->exe, "nvim") ||
+        ffStrbufEqualS(&result->exe, "micro") ||
+        ffStrbufEqualS(&result->exe, "emacs") ||
+        ffStrbufStartsWithS(&result->exe, "emacs-") || // emacs-29.3
+        ffStrbufEqualS(&result->exe, "hx") ||
+        ffStrbufEqualS(&result->exe, "code") ||
+        ffStrbufEqualS(&result->exe, "sublime_text")
+    ) param = "--version";
+    else if (
+        ffStrbufEqualS(&result->exe, "kak") ||
+        ffStrbufEqualS(&result->exe, "pico")
+    ) param = "-version";
+    else if (
+        ffStrbufEqualS(&result->exe, "ne")
+    ) param = "-h";
+    else return NULL;
+
+    ffProcessAppendStdOut(&result->version, (char* const[]){
+        result->path.chars,
+        (char*) param,
+        NULL,
+    });
+
+    if (result->version.length == 0)
+        return NULL;
+
+    ffStrbufSubstrBeforeFirstC(&result->version, '\n');
+    for (uint32_t iStart = 0; iStart < result->version.length; ++iStart)
+    {
+        char c = result->version.chars[iStart];
+        if (ffCharIsDigit(c))
+        {
+            for (uint32_t iEnd = iStart + 1; iEnd < result->version.length; ++iEnd)
+            {
+                char c = result->version.chars[iEnd];
+                if (isspace(c))
+                {
+                    ffStrbufSubstrBefore(&result->version, iEnd);
+                    break;
+                }
+            }
+            if (iStart > 0)
+                ffStrbufSubstrAfter(&result->version, iStart - 1);
+            break;
+        }
+    }
+
+    return NULL;
+}

src/detection/editor/editor.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "fastfetch.h"
+
+typedef struct FFEditorResult
+{
+    const char* type;
+    FFstrbuf name;
+    FFstrbuf exe;
+    FFstrbuf path;
+    FFstrbuf version;
+} FFEditorResult;
+
+const char* ffDetectEditor(FFEditorResult* result);

src/detection/gamepad/gamepad_linux.c

@@ -2,9 +2,6 @@
 #include "common/io/io.h"
 #include "util/stringUtils.h"
 
-#include <dirent.h>
-#include <ctype.h>
-
 static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path)
 {
     uint32_t baseLen = path->length;
@@ -71,7 +68,7 @@ const char* ffDetectGamepad(FFlist* devices /* List of FFGamepadDevice */)
     {
         if (!ffStrStartsWith(entry->d_name, "js"))
             continue;
-        if (!isdigit(entry->d_name[2]))
+        if (!ffCharIsDigit(entry->d_name[2]))
             continue;
 
         ffStrbufAppendS(&path, entry->d_name);

src/detection/gpu/gpu_bsd.c

@@ -2,7 +2,6 @@
 
 #include "common/io/io.h"
 #include "common/properties.h"
-#include "3rdparty/nvml/nvml.h"
 #include "util/mallocHelper.h"
 
 #include <dev/pci/pcireg.h>

src/detection/gpu/gpu_intel.c

@@ -1,8 +1,8 @@
 #include "gpu_driver_specific.h"
 
-#include "3rdparty/igcl/igcl_api.h"
 #include "common/library.h"
 #include "util/mallocHelper.h"
+#include "igcl.h"
 
 struct FFIgclData {
     FF_LIBRARY_SYMBOL(ctlClose)
@@ -47,7 +47,7 @@ const char* ffDetectIntelGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverRe
         FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libigcl, igclData, ctlFrequencyGetProperties)
 
         if (ffctlInit(&(ctl_init_args_t) {
-            .AppVersion = CTL_MAKE_VERSION(CTL_IMPL_MAJOR_VERSION, CTL_IMPL_MINOR_VERSION),
+            .AppVersion = CTL_IMPL_VERSION,
             .flags = CTL_INIT_FLAG_USE_LEVEL_ZERO,
             .Size = sizeof(ctl_init_args_t),
             .Version = 0,

src/detection/gpu/gpu_linux.c

@@ -33,50 +33,8 @@
     #endif
 #endif
 
-
-#if FF_HAVE_DRM_H
-static const char* drmDetectDriver(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer, const char* drmKey)
-{
-    ffStrbufSetS(buffer, "/dev/dri/");
-    ffStrbufAppendS(buffer, drmKey);
-    FF_AUTO_CLOSE_FD int fd = open(buffer->chars, O_RDONLY);
-    if (fd < 0) return "open(/dev/dri/drm_key) failed";
-
-    ffStrbufEnsureFixedLengthFree(&gpu->driver, 128);
-    drm_version_t version = {
-        .name = gpu->driver.chars,
-        .name_len = gpu->driver.allocated,
-    };
-    if (ioctl(fd, DRM_IOCTL_VERSION, &version) < 0) return "ioctl(DRM_IOCTL_VERSION) failed";
-    gpu->driver.length = (uint32_t) version.name_len;
-    gpu->driver.chars[gpu->driver.length] = '\0';
-
-    if (version.version_major || version.version_minor || version.version_patchlevel)
-        ffStrbufAppendF(&gpu->driver, " %d.%d.%d", version.version_major, version.version_minor, version.version_patchlevel);
-    else
-    {
-        ffStrbufAppendS(pciDir, "/driver/module/version");
-        if (ffReadFileBuffer(pciDir->chars, buffer))
-        {
-            ffStrbufTrimRightSpace(buffer);
-            ffStrbufAppendC(&gpu->driver, ' ');
-            ffStrbufAppend(&gpu->driver, buffer);
-        }
-    }
-    return NULL;
-}
-#endif
-
 static bool pciDetectDriver(FFGPUResult* gpu, FFstrbuf* pciDir, FFstrbuf* buffer, FF_MAYBE_UNUSED const char* drmKey)
 {
-    #if FF_HAVE_DRM_H
-    if (drmKey)
-    {
-        drmDetectDriver(gpu, pciDir, buffer, drmKey);
-        if (gpu->driver.length > 0) return true;
-    }
-    #endif
-
     ffStrbufAppendS(pciDir, "/driver");
     char pathBuf[PATH_MAX];
     ssize_t resultLength = readlink(pciDir->chars, pathBuf, sizeof(pathBuf));

src/detection/gpu/gpu_nvidia.c

@@ -1,7 +1,7 @@
 #include "gpu_driver_specific.h"
 
-#include "3rdparty/nvml/nvml.h"
 #include "common/library.h"
+#include "nvml.h"
 
 struct FFNvmlData {
     FF_LIBRARY_SYMBOL(nvmlDeviceGetCount_v2)
@@ -19,6 +19,8 @@ struct FFNvmlData {
 
 const char* ffDetectNvidiaGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverResult result, const char* soName)
 {
+#ifndef FF_DISABLE_DLOPEN
+
     if (!nvmlData.inited)
     {
         nvmlData.inited = true;
@@ -127,4 +129,11 @@ const char* ffDetectNvidiaGpuInfo(const FFGpuDriverCondition* cond, FFGpuDriverR
     }
 
     return NULL;
+
+#else
+
+    FF_UNUSED(cond, result, soName);
+    return "dlopen is disabled";
+
+#endif
 }

src/detection/gpu/gpu_wsl.cpp

@@ -31,8 +31,13 @@ const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FF
     FF_LIBRARY_LOAD(libdxcore, nullptr, "dlopen libdxcore.so failed. Make sure WSLg is enabled", "/usr/lib/wsl/lib/libdxcore" FF_LIBRARY_EXTENSION, 4)
     // DXCoreCreateAdapterFactory is a reloaded function, so we can't use FF_LIBRARY_LOAD_SYMBOL_MESSAGE here
     typedef HRESULT (*DXCoreCreateAdapterFactory_t)(REFIID riid, void** ppvFactory);
+
+#ifndef FF_DISABLE_DLOPEN
     auto ffDXCoreCreateAdapterFactory = (DXCoreCreateAdapterFactory_t) dlsym(libdxcore, "DXCoreCreateAdapterFactory");
     if(ffDXCoreCreateAdapterFactory == nullptr) return "dlsym DXCoreCreateAdapterFactory failed";
+#else
+    auto ffDXCoreCreateAdapterFactory = (DXCoreCreateAdapterFactory_t) DXCoreCreateAdapterFactory;
+#endif
 
     IDXCoreAdapterFactory *factory = nullptr;
 

src/detection/gpu/igcl.h

@@ -0,0 +1,169 @@
+#pragma once
+
+// DISCLAIMER:
+// THIS FILE IS CREATED FROM SCRATCH, BY READING THE OFFICIAL IGCL API
+// DOCUMENTATION REFERENCED BELOW, IN ORDER TO MAKE FASTFETCH MIT COMPLIANT.
+
+#include <stdint.h>
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv412ctl_result_t
+typedef enum ctl_result_t
+{
+    CTL_RESULT_SUCCESS = 0,
+} ctl_result_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv420ctl_application_id_t
+typedef struct ctl_application_id_t
+{
+    uint32_t Data1;
+    uint16_t Data2;
+    uint16_t Data3;
+    uint8_t Data4[8];
+} ctl_application_id_t;
+
+#define CTL_IMPL_VERSION (( 1 /*major*/ << 16 )|( 1 /*minor*/ & 0x0000ffff))
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv415ctl_init_flag_t
+typedef enum ctl_init_flag_t
+{
+    CTL_INIT_FLAG_USE_LEVEL_ZERO = 1,
+    CTL_INIT_FLAG_MAX
+} ctl_init_flag_t;
+
+typedef uint32_t ctl_version_info_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv415ctl_init_args_t
+typedef struct ctl_init_args_t
+{
+    uint32_t Size;
+    uint8_t Version;
+    ctl_version_info_t AppVersion;
+    ctl_init_flag_t flags;
+    ctl_version_info_t SupportedVersion;
+    ctl_application_id_t ApplicationUID;
+} ctl_init_args_t;
+
+typedef struct ctl_api_handle_t* ctl_api_handle_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv47ctlInitP15ctl_init_args_tP16ctl_api_handle_t
+extern ctl_result_t ctlInit(ctl_init_args_t *pInitDesc, ctl_api_handle_t *phAPIHandle);
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#ctlclose
+extern ctl_result_t ctlClose(ctl_api_handle_t hAPIHandle);
+
+typedef struct ctl_device_adapter_handle_t* ctl_device_adapter_handle_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv419ctlEnumerateDevices16ctl_api_handle_tP8uint32_tP27ctl_device_adapter_handle_t
+extern ctl_result_t ctlEnumerateDevices(ctl_api_handle_t hAPIHandle, uint32_t *pCount, ctl_device_adapter_handle_t* phDevices);
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv417ctl_device_type_t
+typedef enum ctl_device_type_t
+{
+    CTL_DEVICE_TYPE_GRAPHICS = 1,
+    CTL_DEVICE_TYPE_SYSTEM = 2,
+    CTL_DEVICE_TYPE_MAX
+} ctl_device_type_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv422ctl_firmware_version_t
+typedef struct ctl_firmware_version_t
+{
+    uint64_t major_version;
+    uint64_t minor_version;
+    uint64_t build_number;
+} ctl_firmware_version_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv417ctl_adapter_bdf_t
+typedef struct ctl_adapter_bdf_t
+{
+    uint8_t bus;
+    uint8_t device;
+    uint8_t function;
+} ctl_adapter_bdf_t;
+
+#define IGCL_CTL_MAX_DEVICE_NAME_LEN 100
+#define IGCL_CTL_MAX_RESERVED_SIZE 112
+
+typedef enum ctl_adapter_properties_flag_t
+{
+    CTL_ADAPTER_PROPERTIES_FLAG_INTEGRATED = 1,
+} ctl_adapter_properties_flag_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv431ctl_device_adapter_properties_t
+typedef struct ctl_device_adapter_properties_t
+{
+    uint32_t Size;
+    uint8_t Version;
+    void* pDeviceID;
+    uint32_t device_id_size;
+    ctl_device_type_t device_type;
+    uint32_t /*ctl_supported_functions_flags_t*/ supported_subfunction_flags;
+    uint64_t driver_version;
+    ctl_firmware_version_t firmware_version;
+    uint32_t pci_vendor_id;
+    uint32_t pci_device_id;
+    uint32_t rev_id;
+    uint32_t num_eus_per_sub_slice;
+    uint32_t num_sub_slices_per_slice;
+    uint32_t num_slices;
+    char name[IGCL_CTL_MAX_DEVICE_NAME_LEN];
+    ctl_adapter_properties_flag_t graphics_adapter_properties;
+    uint32_t Frequency;
+    uint16_t pci_subsys_id;
+    uint16_t pci_subsys_vendor_id;
+    ctl_adapter_bdf_t adapter_bdf;
+    char reserved[IGCL_CTL_MAX_RESERVED_SIZE];
+} ctl_device_adapter_properties_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv422ctlGetDeviceProperties27ctl_device_adapter_handle_tP31ctl_device_adapter_properties_t
+extern ctl_result_t ctlGetDeviceProperties(ctl_device_adapter_handle_t hDAhandle, ctl_device_adapter_properties_t* pProperties);
+
+typedef struct ctl_temp_handle_t* ctl_temp_handle_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#ctlenumtemperaturesensors
+extern ctl_result_t ctlEnumTemperatureSensors(ctl_device_adapter_handle_t hDAhandle, uint32_t* pCount, ctl_temp_handle_t* phTemperature);
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#ctltemperaturegetstate
+extern ctl_result_t ctlTemperatureGetState(ctl_temp_handle_t hTemperature, double* pTemperature);
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv420ctlEnumMemoryModules27ctl_device_adapter_handle_tP8uint32_tP16ctl_mem_handle_t
+
+typedef struct ctl_mem_handle_t* ctl_mem_handle_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv420ctlEnumMemoryModules27ctl_device_adapter_handle_tP8uint32_tP16ctl_mem_handle_t
+extern ctl_result_t ctlEnumMemoryModules(ctl_device_adapter_handle_t hDAhandle, uint32_t *pCount, ctl_mem_handle_t* phMemory);
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv415ctl_mem_state_t
+typedef struct ctl_mem_state_t
+{
+    uint32_t Size;
+    uint8_t Version;
+    uint64_t free;
+    uint64_t size;
+} ctl_mem_state_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv417ctlMemoryGetState16ctl_mem_handle_tP15ctl_mem_state_t
+extern ctl_result_t ctlMemoryGetState(ctl_mem_handle_t hMemory, ctl_mem_state_t *pState);
+
+typedef struct ctl_freq_handle_t* ctl_freq_handle_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#ctlenumfrequencydomains
+extern ctl_result_t ctlEnumFrequencyDomains(ctl_device_adapter_handle_t hDAhandle, uint32_t* pCount, ctl_freq_handle_t* phFrequency);
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv417ctl_freq_domain_t
+typedef enum ctl_freq_domain_t
+{
+    CTL_FREQ_DOMAIN_GPU = 0,
+    CTL_FREQ_DOMAIN_MEMORY = 1,
+    CTL_FREQ_DOMAIN_MAX
+} ctl_freq_domain_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv421ctl_freq_properties_t
+typedef struct ctl_freq_properties_t
+{
+    uint32_t Size;
+    uint8_t Version;
+    ctl_freq_domain_t type;
+    bool canControl;
+    double min;
+    double max;
+} ctl_freq_properties_t;
+
+// https://intel.github.io/drivers.gpu.control-library/Control/api.html#_CPPv425ctlFrequencyGetProperties17ctl_freq_handle_tP21ctl_freq_properties_t
+extern ctl_result_t ctlFrequencyGetProperties(ctl_freq_handle_t hFrequency, ctl_freq_properties_t* pProperties);

src/detection/gpu/nvml.h

@@ -0,0 +1,120 @@
+#pragma once
+
+// DISCLAIMER:
+// THIS FILE IS CREATED FROM SCRATCH, BY READING THE OFFICIAL NVML API
+// DOCUMENTATION REFERENCED BELOW, IN ORDER TO MAKE FASTFETCH MIT COMPLIANT.
+
+// https://docs.nvidia.com/deploy/nvml-api/group__nvmlDeviceStructs.html
+#define NVML_DEVICE_PCI_BUS_ID_BUFFER_SIZE 32
+#define NVML_DEVICE_PCI_BUS_ID_BUFFER_V2_SIZE 16
+
+typedef enum { NVML_SUCCESS = 0 } nvmlReturn_t;
+typedef struct nvmlDevice_t* nvmlDevice_t;
+
+// https://docs.nvidia.com/deploy/nvml-api/structnvmlPciInfo__t.html
+// PCI information about a GPU device
+typedef struct {
+    // The legacy tuple domain:bus:device.function PCI identifier (& NULL terminator)
+    char busIdLegacy[NVML_DEVICE_PCI_BUS_ID_BUFFER_V2_SIZE];
+    // The PCI domain on which the device's bus resides, 0 to 0xffffffff
+    unsigned int domain;
+    // The bus on which the device resides, 0 to 0xff
+    unsigned int bus;
+    // The device's id on the bus, 0 to 31
+    unsigned int device;
+    // The combined 16-bit device id and 16-bit vendor id
+    unsigned int pciDeviceId;
+    // The 32-bit Sub System Device ID
+    unsigned int pciSubSystemId;
+    // The tuple domain:bus:device.function PCI identifier (& NULL terminator)
+    char busId[NVML_DEVICE_PCI_BUS_ID_BUFFER_SIZE];
+} nvmlPciInfo_t;
+
+// https://docs.nvidia.com/deploy/nvml-api/group__nvmlDeviceEnumvs.html#group__nvmlDeviceEnumvs_1g2650b526841fa38b8f293c2d509a1de0
+// Temperature sensors
+typedef enum {
+    // Temperature sensor for the GPU die
+    NVML_TEMPERATURE_GPU = 0,
+    NVML_TEMPERATURE_COUNT,
+} nvmlTemperatureSensors_t;
+
+// https://docs.nvidia.com/deploy/nvml-api/structnvmlMemory__v2__t.html#structnvmlMemory__v2__t
+// Memory allocation information for a device (v2)
+typedef struct {
+    // Structure format version (must be 2)
+    unsigned int version;
+    // Total physical device memory (in bytes)
+    unsigned long long total;
+    // Device memory (in bytes) reserved for system use (driver or firmware)
+    unsigned long long reserved;
+    // Unallocated device memory (in bytes)
+    unsigned long long free;
+    // Allocated device memory (in bytes)
+    unsigned long long used;
+} nvmlMemory_v2_t;
+enum { nvmlMemory_v2 = 2 };
+
+// https://docs.nvidia.com/deploy/nvml-api/group__nvmlDeviceEnumvs.html#group__nvmlDeviceEnumvs_1g805c0647be9996589fc5e3f6ff680c64
+// Clock types
+typedef enum {
+    // Graphics clock domain
+    NVML_CLOCK_GRAPHICS = 0,
+    // SM clock domain
+    NVML_CLOCK_SM = 1,
+    // Memory clock domain
+    NVML_CLOCK_MEM = 2,
+    // Video encoder/decoder clock domain
+    NVML_CLOCK_VIDEO = 3,
+    // Count of clock types
+    NVML_CLOCK_COUNT,
+} nvmlClockType_t;
+
+// https://docs.nvidia.com/deploy/nvml-api/group__nvmlDeviceEnumvs.html#group__nvmlDeviceEnumvs_1gfa6b01990b212f7b49089b7158eafd2b
+// The Brand of the GPU
+typedef enum {
+    NVML_BRAND_UNKNOWN = 0,
+    NVML_BRAND_QUADRO = 1,
+    NVML_BRAND_TESLA = 2,
+    NVML_BRAND_NVS = 3,
+    NVML_BRAND_GRID = 4,
+    NVML_BRAND_GEFORCE = 5,
+    NVML_BRAND_TITAN = 6,
+    NVML_BRAND_NVIDIA_VAPPS = 7,
+    NVML_BRAND_NVIDIA_VPC = 8,
+    NVML_BRAND_NVIDIA_VCS = 9,
+    NVML_BRAND_NVIDIA_VWS = 10,
+    NVML_BRAND_NVIDIA_CLOUD_GAMING = 11,
+    NVML_BRAND_NVIDIA_VGAMING = NVML_BRAND_NVIDIA_CLOUD_GAMING,
+    NVML_BRAND_QUADRO_RTX = 12,
+    NVML_BRAND_NVIDIA_RTX = 13,
+    NVML_BRAND_NVIDIA = 14,
+    NVML_BRAND_GEFORCE_RTX = 15,
+    NVML_BRAND_TITAN_RTX = 16,
+    NVML_BRAND_COUNT,
+} nvmlBrandType_t;
+
+// https://docs.nvidia.com/deploy/nvml-api/group__nvmlInitializationAndCleanup.html#group__nvmlInitializationAndCleanup
+// Initialize NVML, but don't initialize any GPUs yet
+nvmlReturn_t nvmlInit_v2(void);
+// Shut down NVML by releasing all GPU resources previously allocated with nvmlInit_v2()
+nvmlReturn_t nvmlShutdown(void);
+
+// https://docs.nvidia.com/deploy/nvml-api/group__nvmlDeviceQueries.html
+// Retrieves the number of compute devices in the system. A compute device is a single GPU
+extern nvmlReturn_t nvmlDeviceGetCount_v2(unsigned int* deviceCount);
+// Acquire the handle for a particular device, based on its index
+extern nvmlReturn_t nvmlDeviceGetHandleByIndex_v2(unsigned int index, nvmlDevice_t* device);
+// Acquire the handle for a particular device, based on its PCI bus id
+extern nvmlReturn_t nvmlDeviceGetHandleByPciBusId_v2(const char* pciBusId, nvmlDevice_t* device);
+// Retrieves the PCI attributes of this device
+extern nvmlReturn_t nvmlDeviceGetPciInfo_v3(nvmlDevice_t device, nvmlPciInfo_t* pci);
+// Retrieves the current temperature readings for the device, in degrees C
+extern nvmlReturn_t nvmlDeviceGetTemperature(nvmlDevice_t device, nvmlTemperatureSensors_t sensorType, unsigned int* temp);
+// Retrieves the amount of used, free, reserved and total memory available on the device, in bytes. The reserved amount is supported on version 2 only
+extern nvmlReturn_t nvmlDeviceGetMemoryInfo_v2(nvmlDevice_t device, nvmlMemory_v2_t* memory);
+// Gets the device's core count
+extern nvmlReturn_t nvmlDeviceGetNumGpuCores(nvmlDevice_t device, unsigned int* numCores);
+// Retrieves the maximum clock speeds for the device
+extern nvmlReturn_t nvmlDeviceGetMaxClockInfo(nvmlDevice_t device, nvmlClockType_t type, unsigned int* clock);
+// Retrieves the brand of this device
+extern nvmlReturn_t nvmlDeviceGetBrand(nvmlDevice_t device, nvmlBrandType_t* type);

src/detection/gtk_qt/gtk.c

@@ -153,7 +153,7 @@ static void detectGTKFromConfigDir(FFstrbuf* configDir, const char* version, FFG
 
 static void detectGTK(const char* version, FFGTKResult* result)
 {
-    //Mate, Cinnamon, Gnome, Unity, Budgie use dconf to save theme config
+    //Mate, Cinnamon, GNOME, Unity, Budgie use dconf to save theme config
     //On other DEs, this will do nothing
     detectGTKFromSettings(result);
     if(allPropertiesSet(result))

src/detection/gtk_qt/qt.c

@@ -3,6 +3,7 @@
 #include "common/thread.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
+#include "util/stringUtils.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -43,11 +44,11 @@ static bool detectPlasmaFromFile(const char* filename, FFQtResult* result)
             char categoryName[32];
             sscanf(line, "[%31[^]]", categoryName);
 
-            if(strcasecmp(categoryName, "General") == 0)
+            if(ffStrEqualsIgnCase(categoryName, "General"))
                 category = PLASMA_CATEGORY_GENERAL;
-            else if(strcasecmp(categoryName, "KDE") == 0)
+            else if(ffStrEqualsIgnCase(categoryName, "KDE"))
                 category = PLASMA_CATEGORY_KDE;
-            else if(strcasecmp(categoryName, "Icons") == 0)
+            else if(ffStrEqualsIgnCase(categoryName, "Icons"))
                 category = PLASMA_CATEGORY_ICONS;
             else
                 category = PLASMA_CATEGORY_OTHER;

src/detection/icons/icons.h

@@ -2,4 +2,11 @@
 
 #include "fastfetch.h"
 
-const char* ffDetectIcons(FFstrbuf* result);
+typedef struct FFIconsResult
+{
+    FFstrbuf icons1;
+    FFstrbuf icons2;
+} FFIconsResult;
+
+
+const char* ffDetectIcons(FFIconsResult* result);

src/detection/icons/icons_linux.c

@@ -3,7 +3,7 @@
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
 
-const char* ffDetectIcons(FFstrbuf* result)
+const char* ffDetectIcons(FFIconsResult* result)
 {
     const FFDisplayServerResult* wmde = ffConnectDisplayServer();
 
@@ -18,18 +18,13 @@ const char* ffDetectIcons(FFstrbuf* result)
     if(plasma->length == 0 && gtk2->length == 0 && gtk3->length == 0 && gtk4->length == 0)
         return "No icons could be found";
 
-    FF_STRBUF_AUTO_DESTROY gtkPretty = ffStrbufCreate();
-    ffParseGTK(&gtkPretty, gtk2, gtk3, gtk4);
+    ffParseGTK(&result->icons2, gtk2, gtk3, gtk4);
 
     if(plasma->length > 0)
     {
-        ffStrbufAppend(result, plasma);
-        ffStrbufAppendS(result, " [QT]");
-
-        if(gtkPretty.length > 0)
-            ffStrbufAppendS(result, ", ");
+        ffStrbufAppend(&result->icons1, plasma);
+        ffStrbufAppendS(&result->icons1, " [QT]");
     }
-    ffStrbufAppend(result, &gtkPretty);
 
     return NULL;
 }

src/detection/icons/icons_nosupport.c

@@ -1,6 +1,6 @@
 #include "icons.h"
 
-const char* ffDetectIcons(FF_MAYBE_UNUSED FFstrbuf* result)
+const char* ffDetectIcons(FF_MAYBE_UNUSED FFIconsResult* result)
 {
     return "Not supported on this platform";
 }

src/detection/icons/icons_windows.c

@@ -1,7 +1,7 @@
 #include "icons.h"
 #include "util/windows/registry.h"
 
-const char* ffDetectIcons(FFstrbuf* result)
+const char* ffDetectIcons(FFIconsResult* result)
 {
     FF_HKEY_AUTO_DESTROY hKey = NULL;
     if(!ffRegOpenKeyForRead(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\HideDesktopIcons\\NewStartPanel", &hKey, NULL) &&
@@ -17,18 +17,20 @@ const char* ffDetectIcons(FFstrbuf* result)
     ffRegReadUint(hKey, L"{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", &ControlPanel, NULL);
 
     if (!ThisPC)
-        ffStrbufAppendS(result, "This PC, ");
+        ffStrbufAppendS(&result->icons1, "This PC, ");
     if (!UsersFiles)
-        ffStrbufAppendS(result, "User's Files, ");
-    if (!RemoteNetwork)
-        ffStrbufAppendS(result, "Remote Network, ");
-    if (!RecycleBin)
-        ffStrbufAppendS(result, "Recycle Bin, ");
-    if (!ControlPanel)
-        ffStrbufAppendS(result, "Control Panel");
+        ffStrbufAppendS(&result->icons1, "User's Files");
+    ffStrbufTrimRight(&result->icons1, ' ');
+    ffStrbufTrimRight(&result->icons1, ',');
 
-    ffStrbufTrimRight(result, ' ');
-    ffStrbufTrimRight(result, ',');
+    if (!RemoteNetwork)
+        ffStrbufAppendS(&result->icons2, "Remote Network, ");
+    if (!RecycleBin)
+        ffStrbufAppendS(&result->icons2, "Recycle Bin, ");
+    if (!ControlPanel)
+        ffStrbufAppendS(&result->icons2, "Control Panel");
+    ffStrbufTrimRight(&result->icons2, ' ');
+    ffStrbufTrimRight(&result->icons2, ',');
 
     return NULL;
 }

src/detection/initsystem/initsystem.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "fastfetch.h"
+
+typedef struct FFInitSystemResult
+{
+    FFstrbuf name;
+    FFstrbuf exe;
+    FFstrbuf version;
+    uint32_t pid;
+} FFInitSystemResult;
+
+const char* ffDetectInitSystem(FFInitSystemResult* result);

src/detection/initsystem/initsystem_linux.c

@@ -0,0 +1,57 @@
+#include "initsystem.h"
+#include "common/processing.h"
+
+const char* ffDetectInitSystem(FFInitSystemResult* result)
+{
+    const char* error = ffProcessGetBasicInfoLinux((int) result->pid, &result->name, NULL, NULL);
+    if (error) return error;
+
+    const char* _;
+    // In linux /proc/1/exe is not readable
+    ffProcessGetInfoLinux((int) result->pid, &result->name, &result->exe, &_, NULL);
+    if (result->exe.chars[0] == '/')
+    {
+        // In some old system, /sbin/init is a symlink
+        char buf[PATH_MAX];
+        if (realpath(result->exe.chars, buf))
+            ffStrbufSetS(&result->exe, buf);
+    }
+
+    if (ffStrbufEqualS(&result->name, "systemd"))
+    {
+        if (ffProcessAppendStdOut(&result->version, (char* const[]) {
+            ffStrbufEndsWithS(&result->exe, "/systemd") ? result->exe.chars : "systemctl", // use exe path in case users have another systemd installed
+            "--version",
+            NULL,
+        }) == NULL && result->version.length)
+        {
+            uint32_t iStart = ffStrbufFirstIndexC(&result->version, '(');
+            if (iStart < result->version.length)
+            {
+                uint32_t iEnd = ffStrbufNextIndexC(&result->version, iStart + 1, ')');
+                ffStrbufSubstrBefore(&result->version, iEnd);
+                ffStrbufSubstrAfter(&result->version, iStart);
+            }
+        }
+    }
+    else if (ffStrbufEqualS(&result->name, "launchd"))
+    {
+        if (ffProcessAppendStdOut(&result->version, (char* const[]) {
+            "/bin/launchctl",
+            "version",
+            NULL,
+        }) == NULL && result->version.length)
+        {
+            uint32_t iStart = ffStrbufFirstIndexS(&result->version, "Version ");
+            if (iStart < result->version.length)
+            {
+                iStart += (uint32_t) strlen("Version");
+                uint32_t iEnd = ffStrbufNextIndexC(&result->version, iStart + 1, ':');
+                ffStrbufSubstrBefore(&result->version, iEnd);
+                ffStrbufSubstrAfter(&result->version, iStart);
+            }
+        }
+    }
+
+    return NULL;
+}

src/detection/initsystem/initsystem_nosupport.c

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

src/detection/locale/locale_linux.c

@@ -14,10 +14,9 @@ void ffDetectLocale(FFstrbuf* result)
 
     #ifdef LC_MESSAGES
     ffStrbufAppendS(result, setlocale(LC_MESSAGES, NULL));
-
     if(result->length > 0)
         return;
     #endif
 
-    ffStrbufAppendS(result, setlocale(LC_ALL, NULL));
+    ffStrbufAppendS(result, setlocale(LC_TIME, NULL));
 }

src/detection/os/os_linux.c

@@ -52,7 +52,7 @@ static void getUbuntuFlavour(FFOSResult* result)
     if(!ffStrSet(xdgConfigDirs))
         return;
 
-    if(strstr(xdgConfigDirs, "kde") != NULL || strstr(xdgConfigDirs, "plasma") != NULL)
+    if(ffStrContains(xdgConfigDirs, "kde") || ffStrContains(xdgConfigDirs, "plasma") || ffStrContains(xdgConfigDirs, "kubuntu"))
     {
         ffStrbufSetS(&result->name, "Kubuntu");
         ffStrbufSetS(&result->prettyName, "Kubuntu");
@@ -61,7 +61,7 @@ static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
-    if(strstr(xdgConfigDirs, "xfce") != NULL || strstr(xdgConfigDirs, "xubuntu") != NULL)
+    if(ffStrContains(xdgConfigDirs, "xfce") || ffStrContains(xdgConfigDirs, "xubuntu"))
     {
         ffStrbufSetS(&result->name, "Xubuntu");
         ffStrbufSetS(&result->prettyName, "Xubuntu");
@@ -70,7 +70,7 @@ static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
-    if(strstr(xdgConfigDirs, "lxde") != NULL || strstr(xdgConfigDirs, "lubuntu") != NULL)
+    if(ffStrContains(xdgConfigDirs, "lxde") || ffStrContains(xdgConfigDirs, "lubuntu"))
     {
         ffStrbufSetS(&result->name, "Lubuntu");
         ffStrbufSetS(&result->prettyName, "Lubuntu");
@@ -79,7 +79,7 @@ static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
-    if(strstr(xdgConfigDirs, "budgie") != NULL)
+    if(ffStrContains(xdgConfigDirs, "budgie"))
     {
         ffStrbufSetS(&result->name, "Ubuntu Budgie");
         ffStrbufSetS(&result->prettyName, "Ubuntu Budgie");
@@ -88,7 +88,7 @@ static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
-    if(strstr(xdgConfigDirs, "cinnamon") != NULL)
+    if(ffStrContains(xdgConfigDirs, "cinnamon"))
     {
         ffStrbufSetS(&result->name, "Ubuntu Cinnamon");
         ffStrbufSetS(&result->prettyName, "Ubuntu Cinnamon");
@@ -97,7 +97,7 @@ static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
-    if(strstr(xdgConfigDirs, "mate") != NULL)
+    if(ffStrContains(xdgConfigDirs, "mate"))
     {
         ffStrbufSetS(&result->name, "Ubuntu MATE");
         ffStrbufSetS(&result->prettyName, "Ubuntu MATE");
@@ -106,7 +106,7 @@ static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
-    if(strstr(xdgConfigDirs, "studio") != NULL)
+    if(ffStrContains(xdgConfigDirs, "studio"))
     {
         ffStrbufSetS(&result->name, "Ubuntu Studio");
         ffStrbufSetS(&result->prettyName, "Ubuntu Studio");
@@ -115,7 +115,7 @@ static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
-    if(strstr(xdgConfigDirs, "sway") != NULL)
+    if(ffStrContains(xdgConfigDirs, "sway"))
     {
         ffStrbufSetS(&result->name, "Ubuntu Sway");
         ffStrbufSetS(&result->prettyName, "Ubuntu Sway");
@@ -124,7 +124,7 @@ static void getUbuntuFlavour(FFOSResult* result)
         return;
     }
 
-    if(strstr(xdgConfigDirs, "touch") != NULL)
+    if(ffStrContains(xdgConfigDirs, "touch"))
     {
         ffStrbufSetS(&result->name, "Ubuntu Touch");
         ffStrbufSetS(&result->prettyName, "Ubuntu Touch");

src/detection/os/os_windows.cpp

@@ -4,6 +4,7 @@ extern "C" {
 }
 #include "util/windows/unicode.hpp"
 #include "util/windows/wmi.hpp"
+#include "util/stringUtils.h"
 
 static const char* getOsNameByWmi(FFstrbuf* osName)
 {
@@ -73,8 +74,8 @@ void ffDetectOSImpl(FFOSResult* os)
         if(ffStrbufEndsWithC(&os->prettyName, 'r'))
         {
             if(os->variant.chars[0] == 'R' &&
-            isdigit(os->variant.chars[1]) &&
-            (os->variant.chars[2] == '\0' || os->variant.chars[2] == ' '))
+                ffCharIsDigit(os->variant.chars[1]) &&
+                (os->variant.chars[2] == '\0' || os->variant.chars[2] == ' '))
             {
                 ffStrbufAppendF(&os->version, " R%c", os->variant.chars[1]);
                 ffStrbufSubstrAfter(&os->variant, strlen("Rx ") - 1);

src/detection/packages/packages.h

@@ -14,6 +14,9 @@ typedef struct FFPackagesResult
     uint32_t eopkg;
     uint32_t flatpakSystem;
     uint32_t flatpakUser;
+    uint32_t guixHome;
+    uint32_t guixSystem;
+    uint32_t guixUser;
     uint32_t lpkg;
     uint32_t lpkgbuild;
     uint32_t nixDefault;

src/detection/packages/packages_linux.c

@@ -141,11 +141,11 @@ static bool isValidNixPkg(FFstrbuf* pkg)
         switch (state)
         {
             case START:
-                if (c >= '0' && c <= '9')
+                if (ffCharIsDigit(c))
                     state = DIGIT;
                 break;
             case DIGIT:
-                if (c >= '0' && c <= '9')
+                if (ffCharIsDigit(c))
                     continue;
                 if (c == '.')
                     state = DOT;
@@ -153,7 +153,7 @@ static bool isValidNixPkg(FFstrbuf* pkg)
                     state = START;
                 break;
             case DOT:
-                if (c >= '0' && c <= '9')
+                if (ffCharIsDigit(c))
                     state = MATCH;
                 else
                     state = START;
@@ -408,6 +408,50 @@ static uint32_t getAM(FFstrbuf* baseDir)
     return result;
 }
 
+static int compareHash(const void* a, const void* b)
+{
+    return memcmp(a, b, 32);
+}
+
+static uint32_t getGuixPackagesImpl(char* filename)
+{
+    FF_STRBUF_AUTO_DESTROY content = ffStrbufCreate();
+    if (!ffAppendFileBuffer(filename, &content))
+        return 0;
+
+    // Count number of unique /gnu/store/ paths in PROFILE/manifest based on their hash value.
+    // Contains packages explicitly installed and their propagated inputs.
+    char* pend = content.chars;
+
+    for (const char* pattern = content.chars; (pattern = strstr(pattern, "/gnu/store/")); pattern += 32)
+    {
+        pattern += strlen("/gnu/store/");
+        memmove(pend, pattern, 32);
+        pend += 32;
+    }
+
+    if (pend == content.chars)
+        return 0;
+
+    qsort(content.chars, (size_t) (pend - content.chars) / 32, 32, compareHash);
+
+    uint32_t count = 1;
+    for (const char* p = content.chars + 32; p < pend; p += 32)
+        count += compareHash(p - 32, p) != 0;
+
+    return count;
+}
+
+static uint32_t getGuixPackages(FFstrbuf* baseDir, const char* dirname)
+{
+    uint32_t baseDirLength = baseDir->length;
+    ffStrbufAppendS(baseDir, dirname);
+    ffStrbufAppendS(baseDir, "/manifest");
+    uint32_t num_elements = getGuixPackagesImpl(baseDir->chars);
+    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");
@@ -436,6 +480,10 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
     if (!(options->disabled & FF_PACKAGES_FLAG_OPKG_BIT)) packageCounts->opkg += getNumStrings(baseDir, "/usr/lib/opkg/status", "Package:"); // 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_GUIX_BIT))
+    {
+      packageCounts->guixSystem += getGuixPackages(baseDir, "/run/current-system/profile");
+    }
 }
 
 static void getPackageCountsRegular(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options)
@@ -532,6 +580,12 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
         result->nixUser += getNixPackages(&stateDir, "nix/profile");
     }
 
+    if (!(options->disabled & FF_PACKAGES_FLAG_GUIX_BIT))
+    {
+       result->guixUser += getGuixPackages(&baseDir, ".guix-profile");
+       result->guixHome += getGuixPackages(&baseDir, ".guix-home/profile");
+    }
+
     if (!(options->disabled & FF_PACKAGES_FLAG_FLATPAK_BIT))
         result->flatpakUser = getFlatpak(&baseDir, "/.local/share/flatpak");
 }

src/detection/packages/packages_windows.c

@@ -17,7 +17,7 @@ static uint32_t getNumElements(const char* searchPath /* including `\*` suffix *
         do // Managed to locate and create an handle to that folder.
         {
             if(!(wfd.dwFileAttributes & type)) continue;
-            if(!flag && strcasecmp(ignore, wfd.cFileName) == 0)
+            if(!flag && ffStrEqualsIgnCase(ignore, wfd.cFileName))
             {
                 flag = true;
                 continue;

src/detection/processes/processes_linux.c

@@ -1,8 +1,7 @@
 #include "processes.h"
 
 #include "common/io/io.h"
-
-#include <ctype.h>
+#include "util/stringUtils.h"
 
 const char* ffDetectProcesses(uint32_t* result)
 {
@@ -15,7 +14,7 @@ const char* ffDetectProcesses(uint32_t* result)
     struct dirent* entry;
     while ((entry = readdir(dir)) != NULL)
     {
-        if (entry->d_type == DT_DIR && isdigit(entry->d_name[0]))
+        if (entry->d_type == DT_DIR && ffCharIsDigit(entry->d_name[0]))
             ++num;
     }
 

src/detection/terminalfont/terminalfont_linux.c

@@ -320,7 +320,7 @@ static void detectSt(FFTerminalFontResult* terminalFont, const FFTerminalResult*
         uint32_t sIndex = ffStrbufNextIndexS(&font, index + 1, "size=");
         if (sIndex != font.length)
         {
-            sIndex += strlen("size=");
+            sIndex += (uint32_t) strlen("size=");
             uint32_t sIndexEnd = ffStrbufNextIndexC(&font, sIndex, ':');
             ffStrbufSetNS(&size, sIndexEnd - sIndex, font.chars + sIndex);
         }

src/detection/terminalshell/terminalshell.c

@@ -231,33 +231,33 @@ bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* version)
     if(ffStrEqualsIgnCase(exeName, "sh")) // #849
         return false;
 
-    if(strcasecmp(exeName, "bash") == 0)
+    if(ffStrEqualsIgnCase(exeName, "bash"))
         return getShellVersionBash(exe, version);
-    if(strcasecmp(exeName, "zsh") == 0)
+    if(ffStrEqualsIgnCase(exeName, "zsh"))
         return getExeVersionGeneral(exe, version); //zsh 5.9 (arm-apple-darwin21.3.0)
-    if(strcasecmp(exeName, "fish") == 0)
+    if(ffStrEqualsIgnCase(exeName, "fish"))
         return getShellVersionFish(exe, version);
-    if(strcasecmp(exeName, "pwsh") == 0)
+    if(ffStrEqualsIgnCase(exeName, "pwsh"))
         return getShellVersionPwsh(exe, version);
-    if(strcasecmp(exeName, "csh") == 0 || strcasecmp(exeName, "tcsh") == 0)
+    if(ffStrEqualsIgnCase(exeName, "csh") || ffStrEqualsIgnCase(exeName, "tcsh"))
         return getExeVersionGeneral(exe, version); //tcsh 6.24.07 (Astron) 2022-12-21 (aarch64-apple-darwin) options wide,nls,dl,al,kan,sm,rh,color,filec
-    if(strcasecmp(exeName, "nu") == 0)
+    if(ffStrEqualsIgnCase(exeName, "nu"))
         return getShellVersionNushell(exe, version);
-    if(strcasecmp(exeName, "ksh") == 0)
+    if(ffStrEqualsIgnCase(exeName, "ksh"))
         return getShellVersionKsh(exe, version);
-    if(strcasecmp(exeName, "oksh") == 0)
+    if(ffStrEqualsIgnCase(exeName, "oksh"))
         return getShellVersionOksh(exe, version);
-    if(strcasecmp(exeName, "oil.ovm") == 0)
+    if(ffStrEqualsIgnCase(exeName, "oil.ovm"))
         return getShellVersionOils(exe, version);
-    if(strcasecmp(exeName, "elvish") == 0)
+    if(ffStrEqualsIgnCase(exeName, "elvish"))
         return getExeVersionRaw(exe, version);
-    if(strcasecmp(exeName, "ash") == 0)
+    if(ffStrEqualsIgnCase(exeName, "ash"))
         return getShellVersionAsh(exe, version);
-    if(strcasecmp(exeName, "xonsh") == 0)
+    if(ffStrEqualsIgnCase(exeName, "xonsh"))
         return getShellVersionXonsh(exe, version);
 
     #ifdef _WIN32
-    if(strcasecmp(exeName, "powershell") == 0 || strcasecmp(exeName, "powershell_ise") == 0)
+    if(ffStrEqualsIgnCase(exeName, "powershell") || ffStrEqualsIgnCase(exeName, "powershell_ise"))
         return getShellVersionWinPowerShell(exe, version);
 
     return getFileVersion(exe->chars, version);

src/detection/terminalshell/terminalshell_linux.c

@@ -4,18 +4,11 @@
 #include "common/processing.h"
 #include "common/thread.h"
 #include "util/stringUtils.h"
-#include "util/mallocHelper.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#if defined(__FreeBSD__) || defined(__APPLE__)
-    #include <sys/types.h>
-    #include <sys/user.h>
-    #include <sys/sysctl.h>
-#endif
-
 static void setExeName(FFstrbuf* exe, const char** exeName)
 {
     assert(exe->length > 0);
@@ -24,197 +17,8 @@ static void setExeName(FFstrbuf* exe, const char** exeName)
         *exeName = exe->chars + lastSlashIndex + 1;
 }
 
-static void getProcessInformation(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, const char** exeName, FFstrbuf* exePath)
-{
-    assert(processName->length > 0);
-    ffStrbufClear(exe);
-
-    #ifdef __linux__
-
-    char filePath[64];
-    snprintf(filePath, sizeof(filePath), "/proc/%d/cmdline", (int)pid);
-
-    if(ffAppendFileBuffer(filePath, exe))
-    {
-        ffStrbufTrimRightSpace(exe);
-        ffStrbufRecalculateLength(exe); //Trim the arguments
-        ffStrbufTrimLeft(exe, '-'); //Login shells start with a dash
-    }
-
-    snprintf(filePath, sizeof(filePath), "/proc/%d/exe", (int)pid);
-    ffStrbufEnsureFixedLengthFree(exePath, PATH_MAX);
-    ssize_t length = readlink(filePath, exePath->chars, exePath->allocated - 1);
-    if (length > 0) // doesn't contain trailing NUL
-    {
-        exePath->chars[length] = '\0';
-        exePath->length = (uint32_t) length;
-    }
-
-    #elif defined(__APPLE__)
-
-    size_t len = 0;
-    int mibs[] = { CTL_KERN, KERN_PROCARGS2, pid };
-    if (sysctl(mibs, sizeof(mibs) / sizeof(*mibs), NULL, &len, NULL, 0) == 0)
-    {
-        #ifndef MAC_OS_X_VERSION_10_15
-        //don't know why if don't let len longer, proArgs2 and len will change during the following sysctl() in old MacOS version.
-        len++;
-        #endif
-        FF_AUTO_FREE char* const procArgs2 = malloc(len);
-        if (sysctl(mibs, sizeof(mibs) / sizeof(*mibs), procArgs2, &len, NULL, 0) == 0)
-        {
-            // https://gist.github.com/nonowarn/770696#file-getargv-c-L46
-            uint32_t argc = *(uint32_t*) procArgs2;
-            const char* realExePath = procArgs2 + sizeof(argc);
-
-            const char* arg0 = memchr(realExePath, '\0', len - (size_t) (realExePath - procArgs2));
-            ffStrbufSetNS(exePath, (uint32_t) (arg0 - realExePath), realExePath);
-
-            do arg0++; while (*arg0 == '\0');
-            assert(arg0 < procArgs2 + len);
-            if (*arg0 == '-') arg0++; // Login shells
-
-            ffStrbufSetS(exe, arg0);
-        }
-    }
-
-    #elif defined(__FreeBSD__)
-
-    size_t size = ARG_MAX;
-    FF_AUTO_FREE char* args = malloc(size);
-
-    static_assert(ARG_MAX > PATH_MAX, "");
-
-    if(sysctl(
-        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid}, 4,
-        args, &size,
-        NULL, 0
-    ) == 0)
-        ffStrbufSetNS(exePath, (uint32_t) (size - 1), args);
-
-    size = ARG_MAX;
-    if(sysctl(
-        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_ARGS, pid}, 4,
-        args, &size,
-        NULL, 0
-    ) == 0)
-    {
-        char* arg0 = args;
-        size_t arg0Len = strlen(args);
-        if (size > arg0Len + 1)
-        {
-            char* p = (char*) memrchr(args, '/', arg0Len);
-            if (p)
-            {
-                p++;
-                if (ffStrStartsWith(p, "python")) // /usr/local/bin/python3.9 /home/carter/.local/bin/xonsh
-                {
-                    arg0 += arg0Len + 1;
-                }
-            }
-        }
-        if (arg0[0] == '-') arg0++;
-        ffStrbufSetS(exe, arg0);
-    }
-
-    #endif
-
-    if(exe->length == 0)
-        ffStrbufSet(exe, processName);
-
-    setExeName(exe, exeName);
-}
-
-static const char* getProcessNameAndPpid(pid_t pid, char* name, pid_t* ppid, int32_t* tty)
-{
-    if (pid <= 0)
-        return "Invalid pid";
-
-    #ifdef __linux__
-
-    char statFilePath[64];
-    snprintf(statFilePath, sizeof(statFilePath), "/proc/%d/stat", (int)pid);
-    char buf[PROC_FILE_BUFFSIZ];
-    ssize_t nRead = ffReadFileData(statFilePath, sizeof(buf) - 1, buf);
-    if(nRead < 0)
-        return "ffReadFileData(statFilePath, sizeof(buf)-1, buf) failed";
-    buf[nRead] = '\0';
-
-    *ppid = 0;
-    static_assert(sizeof(*ppid) == sizeof(int), "");
-
-    int tty_;
-    if(
-        sscanf(buf, "%*s (%255[^)]) %*c %d %*d %*d %d", name, ppid, &tty_) < 2 || //stat (comm) state ppid pgrp session tty
-        !ffStrSet(name) ||
-        *ppid == 0
-    )
-        return "sscanf(stat) failed";
-
-    if (tty)
-        *tty = tty_ & 0xFF;
-
-    #elif defined(__APPLE__)
-
-    struct kinfo_proc proc;
-    size_t size = sizeof(proc);
-    if(sysctl(
-        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PID, pid}, 4,
-        &proc, &size,
-        NULL, 0
-    ))
-        return "sysctl(KERN_PROC_PID) failed";
-
-    *ppid = (pid_t)proc.kp_eproc.e_ppid;
-    strcpy(name, proc.kp_proc.p_comm); //trancated to 16 chars
-    if (tty)
-    {
-        *tty = ((proc.kp_eproc.e_tdev >> 24) & 0xFF) == 0x10
-            ? proc.kp_eproc.e_tdev & 0xFFFFFF
-            : -1;
-    }
-
-    #elif defined(__FreeBSD__)
-
-    struct kinfo_proc proc;
-    size_t size = sizeof(proc);
-    if(sysctl(
-        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PID, pid}, 4,
-        &proc, &size,
-        NULL, 0
-    ))
-        return "sysctl(KERN_PROC_PID) failed";
-
-    *ppid = (pid_t)proc.ki_ppid;
-    strcpy(name, proc.ki_comm);
-    if (tty)
-    {
-        if (proc.ki_tdev != NODEV && proc.ki_flag & P_CONTROLT)
-        {
-            const char* ttyName = devname(proc.ki_tdev, S_IFCHR);
-            if (ffStrStartsWith(ttyName, "pts/"))
-                *tty = (int32_t) strtol(ttyName + strlen("pts/"), NULL, 10);
-            else
-                *tty = -1;
-        }
-        else
-            *tty = -1;
-    }
-
-    #else
-
-    return "Unsupported platform";
-
-    #endif
-
-    return NULL;
-}
-
 static pid_t getShellInfo(FFShellResult* result, pid_t pid)
 {
-    char name[256];
-    name[0] = '\0';
-
     pid_t ppid = 0;
     int32_t tty = -1;
 
@@ -227,35 +31,38 @@ static pid_t getShellInfo(FFShellResult* result, pid_t pid)
             userShellName = instance.state.platform.userShell.chars + index + 1;
     }
 
-    while (getProcessNameAndPpid(pid, name, &ppid, &tty) == NULL)
+    while (ffProcessGetBasicInfoLinux(pid, &result->processName, &ppid, &tty) == NULL)
     {
-        if (!ffStrEquals(userShellName, name))
+        if (!ffStrbufEqualS(&result->processName, userShellName))
         {
             //Common programs that are between terminal and own process, but are not the shell
             if(
                 // tty < 0                                  || //A shell should connect to a tty
-                ffStrEquals(name, "sh")                  || //This prevents us from detecting things like pipes and redirects, i hope nobody uses plain `sh` as shell
-                ffStrEquals(name, "sudo")                ||
-                ffStrEquals(name, "su")                  ||
-                ffStrEquals(name, "strace")              ||
-                ffStrEquals(name, "sshd")                ||
-                ffStrEquals(name, "gdb")                 ||
-                ffStrEquals(name, "lldb")                ||
-                ffStrEquals(name, "lldb-mi")             ||
-                ffStrEquals(name, "login")               ||
-                ffStrEquals(name, "ltrace")              ||
-                ffStrEquals(name, "perf")                ||
-                ffStrEquals(name, "guake-wrapped")       ||
-                ffStrEquals(name, "time")                ||
-                ffStrEquals(name, "hyfetch")             || //when hyfetch uses fastfetch as backend
-                ffStrEquals(name, "clifm")               || //https://github.com/leo-arch/clifm/issues/289
-                ffStrEquals(name, "valgrind")            ||
-                ffStrContainsIgnCase(name, "debug")      ||
-                ffStrContainsIgnCase(name, "not-found")  ||
-                ffStrEndsWith(name, ".sh")
+                ffStrbufEqualS(&result->processName, "sh")                  || //This prevents us from detecting things like pipes and redirects, i hope nobody uses plain `sh` as shell
+                ffStrbufEqualS(&result->processName, "sudo")                ||
+                ffStrbufEqualS(&result->processName, "su")                  ||
+                ffStrbufEqualS(&result->processName, "strace")              ||
+                ffStrbufEqualS(&result->processName, "sshd")                ||
+                ffStrbufEqualS(&result->processName, "gdb")                 ||
+                ffStrbufEqualS(&result->processName, "lldb")                ||
+                ffStrbufEqualS(&result->processName, "lldb-mi")             ||
+                ffStrbufEqualS(&result->processName, "login")               ||
+                ffStrbufEqualS(&result->processName, "ltrace")              ||
+                ffStrbufEqualS(&result->processName, "perf")                ||
+                ffStrbufEqualS(&result->processName, "guake-wrapped")       ||
+                ffStrbufEqualS(&result->processName, "time")                ||
+                ffStrbufEqualS(&result->processName, "hyfetch")             || //when hyfetch uses fastfetch as backend
+                ffStrbufEqualS(&result->processName, "clifm")               || //https://github.com/leo-arch/clifm/issues/289
+                ffStrbufEqualS(&result->processName, "valgrind")            ||
+                ffStrbufEqualS(&result->processName, "fastfetch")           || //994
+                ffStrbufEqualS(&result->processName, "flashfetch")          ||
+                ffStrbufContainS(&result->processName, "debug")             ||
+                ffStrbufContainS(&result->processName, "not-found")         ||
+                ffStrbufEndsWithS(&result->processName, ".sh")
             )
             {
                 pid = ppid;
+                ffStrbufClear(&result->processName);
                 continue;
             }
         }
@@ -263,8 +70,7 @@ static pid_t getShellInfo(FFShellResult* result, pid_t pid)
         result->pid = (uint32_t) pid;
         result->ppid = (uint32_t) ppid;
         result->tty = tty;
-        ffStrbufSetS(&result->processName, name);
-        getProcessInformation(pid, &result->processName, &result->exe, &result->exeName, &result->exePath);
+        ffProcessGetInfoLinux(pid, &result->processName, &result->exe, &result->exeName, &result->exePath);
         break;
     }
     return ppid;
@@ -272,49 +78,47 @@ static pid_t getShellInfo(FFShellResult* result, pid_t pid)
 
 static pid_t getTerminalInfo(FFTerminalResult* result, pid_t pid)
 {
-    char name[256];
-    name[0] = '\0';
-
     pid_t ppid = 0;
 
-    while (getProcessNameAndPpid(pid, name, &ppid, NULL) == NULL)
+    while (ffProcessGetBasicInfoLinux(pid, &result->processName, &ppid, NULL) == NULL)
     {
         //Known shells
         if (
-            ffStrEquals(name, "sh")         ||
-            ffStrEquals(name, "ash")        ||
-            ffStrEquals(name, "bash")       ||
-            ffStrEquals(name, "zsh")        ||
-            ffStrEquals(name, "ksh")        ||
-            ffStrEquals(name, "mksh")       ||
-            ffStrEquals(name, "oksh")       ||
-            ffStrEquals(name, "csh")        ||
-            ffStrEquals(name, "tcsh")       ||
-            ffStrEquals(name, "fish")       ||
-            ffStrEquals(name, "dash")       ||
-            ffStrEquals(name, "pwsh")       ||
-            ffStrEquals(name, "nu")         ||
-            ffStrEquals(name, "git-shell")  ||
-            ffStrEquals(name, "elvish")     ||
-            ffStrEquals(name, "oil.ovm")    ||
-            ffStrEquals(name, "xonsh")      || // works in Linux but not in macOS because kernel returns `Python` in this case
-            ffStrEquals(name, "login")      ||
-            ffStrEquals(name, "sshd")       ||
-            ffStrEquals(name, "clifm")      || // https://github.com/leo-arch/clifm/issues/289
-            ffStrEquals(name, "chezmoi")    || // #762
+            ffStrbufEqualS(&result->processName, "sh")         ||
+            ffStrbufEqualS(&result->processName, "ash")        ||
+            ffStrbufEqualS(&result->processName, "bash")       ||
+            ffStrbufEqualS(&result->processName, "zsh")        ||
+            ffStrbufEqualS(&result->processName, "ksh")        ||
+            ffStrbufEqualS(&result->processName, "mksh")       ||
+            ffStrbufEqualS(&result->processName, "oksh")       ||
+            ffStrbufEqualS(&result->processName, "csh")        ||
+            ffStrbufEqualS(&result->processName, "tcsh")       ||
+            ffStrbufEqualS(&result->processName, "fish")       ||
+            ffStrbufEqualS(&result->processName, "dash")       ||
+            ffStrbufEqualS(&result->processName, "pwsh")       ||
+            ffStrbufEqualS(&result->processName, "nu")         ||
+            ffStrbufEqualS(&result->processName, "git-shell")  ||
+            ffStrbufEqualS(&result->processName, "elvish")     ||
+            ffStrbufEqualS(&result->processName, "oil.ovm")    ||
+            ffStrbufEqualS(&result->processName, "xonsh")      || // works in Linux but not in macOS because kernel returns `Python` in this case
+            ffStrbufEqualS(&result->processName, "login")      ||
+            ffStrbufEqualS(&result->processName, "sshd")       ||
+            ffStrbufEqualS(&result->processName, "clifm")      || // https://github.com/leo-arch/clifm/issues/289
+            ffStrbufEqualS(&result->processName, "chezmoi")    || // #762
             #ifdef __linux__
-            ffStrStartsWith(name, "flatpak-") || // #707
+            ffStrbufStartsWithS(&result->processName, "flatpak-") || // #707
             #endif
-            ffStrEndsWith(name, ".sh")
+            ffStrbufEndsWithS(&result->processName, ".sh")
         )
         {
             pid = ppid;
+            ffStrbufClear(&result->processName);
             continue;
         }
 
         #ifdef __APPLE__
         // https://github.com/fastfetch-cli/fastfetch/discussions/501
-        const char* pLeft = strstr(name, " (");
+        const char* pLeft = strstr(result->processName.chars, " (");
         if (pLeft)
         {
             pLeft += 2;
@@ -324,7 +128,7 @@ static pid_t getTerminalInfo(FFTerminalResult* result, pid_t pid)
                 for (; pLeft < pRight; ++pLeft)
                     if (*pLeft < 'a' || *pLeft > 'z')
                         break;
-                if (pLeft == pRight && getProcessNameAndPpid(ppid, name, &ppid, NULL) != NULL)
+                if (pLeft == pRight && ffProcessGetBasicInfoLinux(ppid, &result->processName, &ppid, NULL) != NULL)
                     return 0;
             }
         }
@@ -332,8 +136,7 @@ static pid_t getTerminalInfo(FFTerminalResult* result, pid_t pid)
 
         result->pid = (uint32_t) pid;
         result->ppid = (uint32_t) ppid;
-        ffStrbufSetS(&result->processName, name);
-        getProcessInformation(pid, &result->processName, &result->exe, &result->exeName, &result->exePath);
+        ffProcessGetInfoLinux(pid, &result->processName, &result->exe, &result->exeName, &result->exePath);
         break;
     }
     return ppid;
@@ -347,11 +150,9 @@ static bool getTerminalInfoByPidEnv(FFTerminalResult* result, const char* pidEnv
 
     pid_t pid = (pid_t) strtol(envStr, NULL, 10);
     result->pid = (uint32_t) pid;
-    char name[256];
-    if (getProcessNameAndPpid(pid, name, (pid_t*) &result->ppid, NULL) == NULL)
+    if (ffProcessGetBasicInfoLinux(pid, &result->processName, (pid_t*) &result->ppid, NULL) == NULL)
     {
-        ffStrbufSetS(&result->processName, name);
-        getProcessInformation(pid, &result->processName, &result->exe, &result->exeName, &result->exePath);
+        ffProcessGetInfoLinux(pid, &result->processName, &result->exe, &result->exeName, &result->exePath);
         return true;
     }
 

src/detection/terminalshell/terminalshell_windows.c

@@ -9,8 +9,6 @@
 #include <windows.h>
 #include <wchar.h>
 #include <tlhelp32.h>
-#include <ntstatus.h>
-#include <winternl.h>
 
 static bool getProductVersion(const wchar_t* filePath, FFstrbuf* version)
 {
@@ -39,56 +37,13 @@ static bool getProductVersion(const wchar_t* filePath, FFstrbuf* version)
     return false;
 }
 
-static bool getProcessInfo(uint32_t pid, uint32_t* ppid, FFstrbuf* pname, FFstrbuf* exe, const char** exeName, FFstrbuf* exePath, bool* gui)
-{
-    FF_AUTO_CLOSE_FD HANDLE hProcess = pid == 0
-        ? GetCurrentProcess()
-        : OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, TRUE, pid);
-
-    if (gui)
-        *gui = GetGuiResources(hProcess, GR_GDIOBJECTS) > 0;
-
-    if(ppid)
-    {
-        PROCESS_BASIC_INFORMATION info = {};
-        ULONG size;
-        if(NT_SUCCESS(NtQueryInformationProcess(hProcess, ProcessBasicInformation, &info, sizeof(info), &size)))
-        {
-            assert(size == sizeof(info));
-            *ppid = (uint32_t)info.InheritedFromUniqueProcessId;
-        }
-        else
-            return false;
-    }
-    if(exe)
-    {
-        DWORD bufSize = exe->allocated;
-        if(QueryFullProcessImageNameA(hProcess, 0, exe->chars, &bufSize))
-        {
-            // We use full path here
-            // Querying command line of remote processes in Windows requires either WMI or ReadProcessMemory
-            exe->length = bufSize;
-            if (exePath) ffStrbufSet(exePath, exe);
-        }
-        else
-            return false;
-    }
-    if(pname && exeName)
-    {
-        *exeName = exe->chars + ffStrbufLastIndexC(exe, '\\') + 1;
-        ffStrbufSetS(pname, *exeName);
-    }
-
-    return true;
-}
-
 bool fftsGetShellVersion(FFstrbuf* exe, const char* exeName, FFstrbuf* version);
 
 static uint32_t getShellInfo(FFShellResult* result, uint32_t pid)
 {
     uint32_t ppid = 0;
 
-    while (pid != 0 && getProcessInfo(pid, &ppid, &result->processName, &result->exe, &result->exeName, &result->exePath, NULL))
+    while (pid != 0 && ffProcessGetInfoWindows(pid, &ppid, &result->processName, &result->exe, &result->exeName, &result->exePath, NULL))
     {
         ffStrbufSet(&result->prettyName, &result->processName);
         if(ffStrbufEndsWithIgnCaseS(&result->prettyName, ".exe"))
@@ -183,7 +138,7 @@ static bool getTerminalFromEnv(FFTerminalResult* result)
         //ConEmu
         uint32_t pid = (uint32_t) strtoul(term, NULL, 10);
         result->pid = pid;
-        if(getProcessInfo(pid, NULL, &result->processName, &result->exe, &result->exeName, &result->exePath, NULL))
+        if(ffProcessGetInfoWindows(pid, NULL, &result->processName, &result->exe, &result->exeName, &result->exePath, NULL))
         {
             ffStrbufSet(&result->prettyName, &result->processName);
             if(ffStrbufEndsWithIgnCaseS(&result->prettyName, ".exe"))
@@ -289,10 +244,17 @@ conhost:
 
 static uint32_t getTerminalInfo(FFTerminalResult* result, uint32_t pid)
 {
+    if (getenv("MSYSTEM"))
+    {
+        // Don't try to detect terminals in MSYS shell
+        // It won't work because MSYS doesn't follow process tree of native Windows programs
+        return 0;
+    }
+
     uint32_t ppid = 0;
     bool hasGui;
 
-    while (pid != 0 && getProcessInfo(pid, &ppid, &result->processName, &result->exe, &result->exeName, &result->exePath, &hasGui))
+    while (pid != 0 && ffProcessGetInfoWindows(pid, &ppid, &result->processName, &result->exe, &result->exeName, &result->exePath, &hasGui))
     {
         if(!hasGui || ffStrbufIgnCaseEqualS(&result->processName, "far.exe")) // Far includes GUI objects...
         {
@@ -373,7 +335,7 @@ const FFShellResult* ffDetectShell(void)
     result.tty = -1;
 
     uint32_t ppid;
-    if(!getProcessInfo(0, &ppid, NULL, NULL, NULL, NULL, NULL))
+    if(!ffProcessGetInfoWindows(0, &ppid, NULL, NULL, NULL, NULL, NULL))
         return &result;
 
     ppid = getShellInfo(&result, ppid);