Release 1.7.1

second try
Release 1.7.1
2026-09-12 10:22:12 +02:00 · 2022-09-15 16:11:05 +02:00 · 2022-09-15 16:02:55 +02:00 · 2022-09-15 15:41:24 +02:00 · 2022-09-15 12:10:48 +02:00 · 2022-09-15 11:59:06 +02:00
130 changed files with 3659 additions and 1894 deletions
@@ -41,4 +41,3 @@ Output of `fastfetch --list-features`:
 If you get the following error: `Error: couldn't find config: [...]`, copy the files in [presets](../../presets/) to `/usr/share/fastfetch/presets/` or `~/.local/share/fastfetch/presets/`.
 If this isn't possible (or too much work) for you, post the output of `fastfetch --show-errors --recache --multithreading false --disable-linewrap false`. 
 -->
-
@@ -0,0 +1,18 @@
+---
+name: Logo request
+about: Request a new logo
+title: ''
+labels: logo request
+assignees: ''
+
+---
+
+# OS
+```
+paste content of /etc/os-release here. If this file doesn't exist, describe a way to identify the distro.
+```
+
+# Ascii
+```
+paste ascii art here. If you leave this empty, i will try to find the logo myself.
+```
@@ -1,37 +0,0 @@
-name: manage pull requests
-
-on: pull_request
-
-jobs:
-  check:
-    name: manage pull request
-    runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v2
-
-      - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-
-      - name: configure project
-        run: cmake -DBUILD_TESTS=On .
-
-      - name: build project
-        run: cmake --build . -j$(nproc) --target package
-
-      - name: run fastfetch
-        run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true
-
-      - name: run flashfetch
-        run: ./flashfetch
-
-      - name: run tests
-        run: ctest
-
-      - name: perform CodeQL analysis
-        uses: github/codeql-action/analyze@v1
@@ -1,36 +1,40 @@
 name: manage pushes

 on:
-  push:
-    branches: [ master ]
+  - push
+  - pull_request

 jobs:
-  manage:
-    name: manage push
+  linux:
+    name: Linux
    runs-on: ubuntu-latest
    permissions:
-      contents: write
      security-events: write
+    outputs:
+      ffversion: ${{ steps.ffversion.outputs.ffversion }}
    steps:
      - name: checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: install required packages
        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
+        with:
+          languages: c

      - name: configure project
-        # We reuse the build binary only for the releases.
-        # We set tweak version to off, because it is wrong, as git tag will happen after this step. Releases don't have a tweak, so this is ok.
        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .

      - name: build project
        run: cmake --build . -j$(nproc) --target package

+      - name: perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2
+
      - name: run fastfetch
-        run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true
+        run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true --load-config presets/all

      - name: run flashfetch
        run: ./flashfetch
@@ -38,12 +42,69 @@ jobs:
      - name: run tests
        run: ctest

-      - name: perform CodeQL analysis
-        uses: github/codeql-action/analyze@v1
-
      - name: get fastfetch version
-        id: get_version_fastfetch
-        run: echo "::set-output name=release::$(./fastfetch --version-raw)"
+        id: ffversion
+        run: echo "::set-output name=ffversion::$(./fastfetch --version-raw)"
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: fastfetch-linux
+          path: ./fastfetch-*.*
+
+  macos:
+    name: MacOS
+    runs-on: macos-latest
+    permissions:
+      security-events: write
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+
+      - name: install required packages
+        run: brew install vulkan-loader
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: c
+
+      - name: configure project
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+
+      - name: build project
+        run: cmake --build . -j$(sysctl -n hw.logicalcpu) --target package
+
+      - name: perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2
+
+      - name: run fastfetch
+        run: ./fastfetch --recache --disable-linewrap false --hide-cursor false --show-errors true --load-config presets/all
+
+      - name: run flashfetch
+        run: ./flashfetch
+
+      - name: run tests
+        run: ctest
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: fastfetch-macos
+          path: ./fastfetch-*.*
+
+  release:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    name: Release
+    runs-on: ubuntu-latest
+    needs:
+      - linux
+      - macos
+    permissions:
+      contents: write
+    steps:
+      - name: download artifacts
+        uses: actions/download-artifact@v3

      - name: get latest release version
        id: get_version_release
@@ -52,9 +113,10 @@ jobs:
          repository: ${{ github.repository }}

      - name: create release
-        if: steps.get_version_fastfetch.outputs.release != steps.get_version_release.outputs.release
+        if: needs.linux.outputs.ffversion != steps.get_version_release.outputs.release
        uses: ncipollo/release-action@v1
        with:
-          tag: ${{ steps.get_version_fastfetch.outputs.release }}
+          tag: ${{ needs.linux.outputs.ffversion }}
          commit: ${{ github.sha }}
-          artifacts: ./fastfetch-*.*
+          artifactErrorsFailBuild: true
+          artifacts: fastfetch-linux/*,fastfetch-macos/*
@@ -2,6 +2,7 @@
 **/.vscode/
 **/.cache/
 **/.kdev4/
+**/.DS_Store
 cscope.*
 tags
 fastfetch.kdev4
@@ -1,3 +1,90 @@
+# 1.7.1
+
+This release brings a lot of bug fixes and improvements for MacOS. Big thanks to @CarterLi for the help on this!
+
+Features:
+* The color of the title and the keys can now be configured individually, using `--color-keys` and `--color-title` respectively. Some distros have different defaults now, similar to neofetch
+* Swap module, similar to the Memory module, but for swap. Add `Swap` to your structure to enable it (#225)
+
+Logos:
+* Slackware (#227)
+
+Bugfixes:
+* Used disk space is now calculated much more accurately
+* On Linux, GPU names are no longer truncated, if they are longer than 32 characters (#224)
+* On Linux, NVIDIA GPUs once again have a proper name
+
+* On M1 platforms, showing the GPU name no longer crashes the program (#222)
+* Brew package count does now work on M1 platforms too
+* The Vulkan module now does work on MacOS too
+* The OpenGL and OpenCL modules now work on MacOS too (@CarterLi, #226)
+* The LocalIp module now works on MacOS too (@CarterLi, #232)
+* Detecting custom WMs on MacOS does now work
+
+Other:
+* GitHub actions now builds a dmg file for MacOS, as you can see in the release page
+
+# 1.7.0
+
+This release brings support for MacOS!  
+The basics things are working, but it is far from feature parity with Linux.
+I developed this in a VM, so bugs on real hardware are likely.
+If you have a Mac and no idea what to do with your free time, i am very happy to accept pull requests / work on issues.
+
+A lot of things were changed under the hood to make this possible, which should bring better performance and stability on all platforms. 
+
+Besides that, the following things have changed:
+
+Features:
+* The binary prefix used can now be configured, and is used consistently across all modules. Set `--binary-prefix` to `iec` (default), `si` or `jedec`.
+* AMD GPUs now have a much better name, if the file `/usr/share/libdrm/amdgpu.ids` exists. For example my dedicated GPU, which was displayed as `AMD/ATI Radeon RX 5600 OEM/5600 XT / 5700/5700 XT`, is now `AMD Radeon RX 5600M`.
+
+Logos:
+* MacOS
+* CachyOS small (@sirlucjan, #220)
+* MSYS2 (#219)
+
+Bugfixes:
+* the `--file` option, which can be used to display the contents of a file as the logo, is now working again.
+
+# 1.6.5
+
+Fixes parsing quoted values in config files
+
+# 1.6.4
+
+Releasing this, so fedora can package fastfetch. Thanks to @jonathanspw for doing that!
+
+Features:
+* --set-keyless option (#215)
+* Replace `\n`, `\t`, `\e` and `\\` in user provided strings, just like c would do it (#215)
+* APK (Alpine Package Keeper) support (@mxkrsv, #216)
+
+Logos:
+* Alma Linux (@jonathanspw, #214)
+
+Bugfixes:
+* replace deprecated gethostbyname call with getaddrinfo (#217)
+
+# 1.6.3
+
+Fixes installing presets in their own directory (@ceamac, #212)
+
+# 1.6.2
+
+Releasing this, so void linux can package fastfetch.
+
+Logos:
+* Rosa linux (#206)
+* KISS linux (@draumaz, #207)
+* LangitKetujuh (@hervyqa, #208)
+
+Bugfixes:
+* Using musl as libc does work now (#210)
+* XBPS packages are once again printed (#209)
+* configured target dirs are applied to install directories too
+* empty XDG_* env vars don't cause a crash anymore
+
 # 1.6.1

 Fixes build on android (#205)
@@ -1,38 +1,54 @@
-cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs
+cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url

 project(fastfetch
-    VERSION 1.6.1
+    VERSION 1.7.1
    LANGUAGES C
+    DESCRIPTION "Fast system information tool"
+    HOMEPAGE_URL "https://github.com/LinusDierheimer/fastfetch"
 )

+###################
+# Target Platform #
+###################
+
+if(APPLE OR ANDROID)
+    set(LINUX FALSE CACHE BOOL "..." FORCE) # Linux true means we have full linux userland, not just the kernel
+elseif(UNIX)
+    set(LINUX TRUE CACHE BOOL "..." FORCE)
+else()
+    message(FATAL_ERROR "Unsupported platform")
+endif()
+
 #####################
 # Configure options #
 #####################

-OPTION(ENABLE_LIBPCI "Enable libpci" ON)
-OPTION(ENABLE_VULKAN "Enable vulkan" ON)
-OPTION(ENABLE_WAYLAND "Enable wayland-client" ON)
-OPTION(ENABLE_XCB_RANDR "Enable xcb-randr" ON)
-OPTION(ENABLE_XCB "Enable xcb" ON)
-OPTION(ENABLE_XRANDR "Enable xrandr" ON)
-OPTION(ENABLE_X11 "Enable x11" ON)
-OPTION(ENABLE_GIO "Enable gio-2.0" ON)
-OPTION(ENABLE_DCONF "Enable dconf" ON)
-OPTION(ENABLE_DBUS "Enable dbus-1" ON)
-OPTION(ENABLE_XFCONF "Enable libxfconf-0" ON)
-OPTION(ENABLE_SQLITE3 "Enable sqlite3" ON)
-OPTION(ENABLE_RPM "Enable rpm" ON)
-OPTION(ENABLE_IMAGEMAGICK7 "Enable imagemagick 7" ON)
-OPTION(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON)
-OPTION(ENABLE_ZLIB "Enable zlib" ON)
-OPTION(ENABLE_CHAFA "Enable chafa" ON)
-OPTION(ENABLE_EGL "Enable egl" ON)
-OPTION(ENABLE_GLX "Enable glx" ON)
-OPTION(ENABLE_OSMESA "Enable osmesa" ON)
-OPTION(ENABLE_OPENCL "Enable opencl" ON)
+include(CMakeDependentOption)

-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
+cmake_dependent_option(ENABLE_LIBPCI "Enable libpci" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_VULKAN "Enable vulkan" ON "LINUX OR APPLE" OFF)
+cmake_dependent_option(ENABLE_WAYLAND "Enable wayland-client" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_XCB_RANDR "Enable xcb-randr" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_XCB "Enable xcb" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_X11 "Enable x11" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_DCONF "Enable dconf" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_DBUS "Enable dbus-1" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_XFCONF "Enable libxfconf-0" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_SQLITE3 "Enable sqlite3" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_RPM "Enable rpm" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_IMAGEMAGICK7 "Enable imagemagick 7" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_CHAFA "Enable chafa" ON "ENABLE_IMAGEMAGICK6 OR ENABLE_IMAGEMAGICK7" OFF)
+cmake_dependent_option(ENABLE_ZLIB "Enable zlib" ON "ENABLE_IMAGEMAGICK6 OR ENABLE_IMAGEMAGICK7" OFF)
+cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX" OFF)
+cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX" OFF)
+
+option(BUILD_TESTS "Build tests" OFF) # Also create test executables
+option(SET_TWEAK "Add tweak to project version" ON) # This is set to off by github actions for release builds

 #############################
 # Compile time dependencies #
@@ -43,6 +59,8 @@ find_package(Threads REQUIRED)

 find_package(PkgConfig REQUIRED)

+include(CheckIncludeFile)
+
 ####################
 # Compiler options #
 ####################
@@ -53,6 +71,11 @@ endif()

 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wconversion")
+if(APPLE AND DEFINED ENV{HOMEBREW_PREFIX})
+    # Used for dlopen finding dylibs installed by homebrew, reversed for future usage
+    # `/opt/homebrew/lib` is not on dlopen search path by default
+    set(CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath,$ENV{HOMEBREW_PREFIX}/lib")
+endif()

 include(CheckIPOSupported)
 check_ipo_supported(RESULT IPO_SUPPORTED)
@@ -81,10 +104,12 @@ if(NOT TARGET_DIR_USR)
 endif()

 if(NOT TARGET_DIR_HOME)
-    if(NOT ANDROID)
-        set(TARGET_DIR_HOME "${TARGET_DIR_ROOT}/home")
-    else()
+    if(APPLE)
+        set(TARGET_DIR_HOME "${TARGET_DIR_ROOT}/Users")
+    elseif(ANDROID)
        set(TARGET_DIR_HOME "/data/data/com.termux/files/home")
+    else()
+        set(TARGET_DIR_HOME "${TARGET_DIR_ROOT}/home")
    endif()
 endif()

@@ -133,7 +158,7 @@ configure_file(src/fastfetch_config.h.in fastfetch_config.h)
 # libfastfetch target #
 #######################

-add_library(libfastfetch OBJECT
+set(LIBFASTFETCH_SRC
    src/util/FFstrbuf.c
    src/util/FFlist.c
    src/util/FFvaluestore.c
@@ -154,7 +179,6 @@ add_library(libfastfetch OBJECT
    src/logo/image/image.c
    src/logo/image/im7.c
    src/logo/image/im6.c
-    src/detection/os.c
    src/detection/qt.c
    src/detection/gtk.c
    src/detection/terminalShell.c
@@ -163,11 +187,12 @@ add_library(libfastfetch OBJECT
    src/detection/datetime.c
    src/detection/temps.c
    src/detection/title.c
-    src/detection/displayserver/displayServer.c
-    src/detection/displayserver/wayland.c
-    src/detection/displayserver/xcb.c
-    src/detection/displayserver/xlib.c
-    src/detection/displayserver/wmde.c
+    src/detection/host/host.c
+    src/detection/os/os.c
+    src/detection/cpu/cpu.c
+    src/detection/gpu/gpu.c
+    src/detection/memory/memory.c
+    src/detection/displayserver/displayserver.c
    src/modules/break.c
    src/modules/custom.c
    src/modules/title.c
@@ -209,245 +234,102 @@ add_library(libfastfetch OBJECT
    src/modules/opencl.c
 )

-if(ENABLE_LIBPCI)
-    pkg_check_modules(LIBPCI libpci)
-    if(LIBPCI_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_LIBPCI=1)
-    else()
-        message(WARNING "Package libpci not found. Building without support.")
-    endif()
+if(APPLE)
+    list(APPEND LIBFASTFETCH_SRC
+        src/detection/host/host_apple.c
+        src/detection/os/os_apple.c
+        src/detection/cpu/cpu_apple.c
+        src/detection/gpu/gpu_apple.c
+        src/detection/memory/memory_apple.c
+        src/detection/displayserver/displayserver_apple.c
+    )
+elseif(ANDROID)
+    list(APPEND LIBFASTFETCH_SRC
+        src/detection/host/host_android.c
+        src/detection/os/os_android.c
+        src/detection/cpu/cpu_linux.c
+        src/detection/gpu/gpu_android.c
+        src/detection/memory/memory_linux.c
+        src/detection/displayserver/displayserver_android.c
+    )
+else()
+    list(APPEND LIBFASTFETCH_SRC
+        src/detection/host/host_linux.c
+        src/detection/os/os_linux.c
+        src/detection/cpu/cpu_linux.c
+        src/detection/gpu/gpu_linux.c
+        src/detection/memory/memory_linux.c
+        src/detection/displayserver/linux/displayserver_linux.c
+        src/detection/displayserver/linux/wayland.c
+        src/detection/displayserver/linux/xcb.c
+        src/detection/displayserver/linux/xlib.c
+        src/detection/displayserver/linux/wmde.c
+    )
 endif()

-if(ENABLE_VULKAN)
-    pkg_check_modules(VULKAN vulkan)
-    if(VULKAN_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_VULKAN=1)
-    else()
-        message(WARNING "Package vulkan not found. Building without support.")
-    endif()
+add_library(libfastfetch OBJECT
+    ${LIBFASTFETCH_SRC}
+)
+
+CHECK_INCLUDE_FILE("sys/sysinfo.h" HAVE_SYSINFO_H)
+if(HAVE_SYSINFO_H)
+    # needs to be public, because changes fastfech.h ABI
+    target_compile_definitions(libfastfetch PUBLIC FF_HAVE_SYSINFO_H)
 endif()

-if(ENABLE_WAYLAND)
-    pkg_check_modules (WAYLAND wayland-client)
-    if(WAYLAND_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_WAYLAND=1)
-    else()
-        message(WARNING "Package wayland-client not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_XCB_RANDR)
-    pkg_check_modules(XCB_RANDR xcb-randr)
-    if(XCB_RANDR_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_XCB_RANDR=1)
-    else()
-        message(WARNING "Package xcb-randr not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_XCB)
-    pkg_check_modules (XCB xcb)
-    if(XCB_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_XCB=1)
-    else()
-        message(WARNING "Package xcb not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_XRANDR)
-    pkg_check_modules(XRANDR xrandr)
-    if(XRANDR_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_XRANDR=1)
-    else()
-        message(WARNING "Package xrandr not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_X11)
-    pkg_check_modules(X11 x11)
-    if(X11_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_X11=1)
-    else()
-        message(WARNING "Package x11 not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_GIO)
-    pkg_check_modules(GIO gio-2.0)
-    if(GIO_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_GIO=1)
-    else()
-        message(WARNING "Package gio-2.0 not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_DCONF)
-    pkg_check_modules(DCONF dconf)
-    if(DCONF_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_DCONF=1)
-    else()
-        message(WARNING "Package dconf not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_DBUS)
-    pkg_check_modules(DBUS dbus-1)
-    if(DBUS_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_DBUS=1)
-    else()
-        message(WARNING "Package dbus-1 not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_XFCONF)
-    pkg_check_modules(XFCONF libxfconf-0)
-    if(XFCONF_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_XFCONF=1)
-    else()
-        message(WARNING "Package libxfconf-0 not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_SQLITE3)
-    pkg_check_modules(SQLITE3 sqlite3)
-    if(SQLITE3_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_SQLITE3=1)
-    else()
-        message(WARNING "Package sqlite3 not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_RPM)
-    pkg_check_modules(RPM rpm)
-    if(RPM_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_RPM=1)
-    else()
-        message(WARNING "Package rpm not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_IMAGEMAGICK7)
-    pkg_check_modules(IMAGEMAGICK7 MagickCore-7.Q16HDRI)
-    if(NOT IMAGEMAGICK7_FOUND)
-        pkg_check_modules(IMAGEMAGICK7 /usr/lib/imagemagick7/pkgconfig/MagickCore-7.Q16HDRI.pc)
-    endif()
-    if(NOT IMAGEMAGICK7_FOUND)
-        pkg_check_modules(IMAGEMAGICK7 MagickCore-7.Q16)
-    endif()
-    if(NOT IMAGEMAGICK7_FOUND)
-        pkg_check_modules(IMAGEMAGICK7 /usr/lib/imagemagick7/pkgconfig/MagickCore-7.Q16.pc)
+function(ff_lib_enable VARNAME)
+    if(NOT ENABLE_${VARNAME})
+        return()
    endif()

-    if(IMAGEMAGICK7_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_IMAGEMAGICK7=1)
-    else()
-        message(WARNING "Package MagickCore-7.Q16HDRI or MagickCore-7.Q16 not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_IMAGEMAGICK6)
-    pkg_check_modules(IMAGEMAGICK6 MagickCore-6.Q16HDRI)
-    if(NOT IMAGEMAGICK6_FOUND)
-        pkg_check_modules(IMAGEMAGICK6 /usr/lib/imagemagick6/pkgconfig/MagickCore-6.Q16HDRI.pc)
-    endif()
-    if(NOT IMAGEMAGICK6_FOUND)
-        pkg_check_modules(IMAGEMAGICK6 MagickCore-6.Q16)
-    endif()
-    if(NOT IMAGEMAGICK6_FOUND)
-        pkg_check_modules(IMAGEMAGICK6 /usr/lib/imagemagick6/pkgconfig/MagickCore-6.Q16.pc)
-    endif()
-
-    if(IMAGEMAGICK6_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_IMAGEMAGICK6=1)
-    else()
-        message(WARNING "Package MagickCore-6.Q16HDRI or MagickCore-6.Q16 not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_ZLIB)
-    pkg_check_modules(ZLIB zlib)
-    if(ZLIB_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_ZLIB=1)
-    else()
-        message(WARNING "Package zlib not found. Building without support")
-    endif()
-endif()
-
-if(ENABLE_CHAFA)
-    if(IMAGEMAGICK6_FOUND OR IMAGEMAGICK7_FOUND)
-        pkg_check_modules(CHAFA chafa>=1.10)
-        if(CHAFA_FOUND)
-            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_CHAFA=1)
-        else()
-            message(WARNING "Package chafa>=1.10 not found. Building without support.")
+    foreach(LIBNAME ${ARGN})
+        pkg_check_modules(${VARNAME} ${LIBNAME})
+        if(${VARNAME}_FOUND)
+            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_${VARNAME}=1)
+            target_include_directories(libfastfetch PRIVATE ${${VARNAME}_INCLUDE_DIRS})
+            target_link_directories(libfastfetch PRIVATE ${${VARNAME}_LIBRARY_DIRS})
+            return()
        endif()
-    else()
-        message(WARNING "Chafa not enabled, because neither ImageMagick6 nor ImageMagick7 were found. Building without support.")
-    endif()
-endif()
+    endforeach()

-if(ENABLE_EGL)
-    pkg_check_modules(EGL egl)
-    if(EGL_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_EGL=1)
-    else()
-        message(WARNING "Package egl not found. Building without support.")
-    endif()
-endif()
+    message(WARNING "Package ${ARGV1} not found, building without support.")
+endfunction()

-if(ENABLE_GLX)
-    pkg_check_modules(GLX glx)
-    if(GLX_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_GLX=1)
-    else()
-        message(WARNING "Package glx not found. Building without support.")
-    endif()
-endif()
+ff_lib_enable(LIBPCI libpci)
+ff_lib_enable(VULKAN vulkan)
+ff_lib_enable(WAYLAND wayland-client)
+ff_lib_enable(XCB_RANDR xcb-randr)
+ff_lib_enable(XCB xcb)
+ff_lib_enable(XRANDR xrandr)
+ff_lib_enable(X11 x11)
+ff_lib_enable(GIO gio-2.0)
+ff_lib_enable(DCONF dconf)
+ff_lib_enable(DBUS dbus-1)
+ff_lib_enable(XFCONF libxfconf-0)
+ff_lib_enable(SQLITE3 sqlite3)
+ff_lib_enable(RPM rpm)
+ff_lib_enable(IMAGEMAGICK7 MagickCore-7.Q16HDRI MagickCore-7.Q16 /usr/lib/imagemagick7/pkgconfig/MagickCore-7.Q16HDRI.pc /usr/lib/imagemagick7/pkgconfig/MagickCore-7.Q16.pc)
+ff_lib_enable(IMAGEMAGICK6 MagickCore-6.Q16HDRI MagickCore-6.Q16 /usr/lib/imagemagick6/pkgconfig/MagickCore-6.Q16HDRI.pc /usr/lib/imagemagick6/pkgconfig/MagickCore-6.Q16.pc)
+ff_lib_enable(ZLIB zlib)
+ff_lib_enable(CHAFA chafa>=1.10)
+ff_lib_enable(EGL egl)
+ff_lib_enable(GLX glx)
+ff_lib_enable(OSMESA osmesa)
+ff_lib_enable(OPENCL OpenCL)

-if(ENABLE_OSMESA)
-    pkg_check_modules(OSMESA osmesa)
-    if(OSMESA_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_OSMESA=1)
-    else()
-        message(WARNING "Package osmesa not found. Building without support.")
-    endif()
-endif()
-
-if(ENABLE_OPENCL)
-    pkg_check_modules(OPENCL OpenCL)
-    if(OPENCL_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_OPENCL=1)
-    else()
-        message(WARNING "Package opencl not found. Building without support.")
-    endif()
+if(APPLE)
+    target_link_libraries(libfastfetch
+        PRIVATE "-framework CoreFoundation"
+        PRIVATE "-framework IOKit"
+        PRIVATE "-framework CoreGraphics"
+        PRIVATE "-framework OpenGL"
+        PRIVATE "-framework OpenCL"
+    )
 endif()

 target_include_directories(libfastfetch
    PUBLIC ${PROJECT_BINARY_DIR}
    PUBLIC ${PROJECT_SOURCE_DIR}/src
-
-    PRIVATE ${LIBPCI_INCLUDE_DIRS}
-    PRIVATE ${VULKAN_INCLUDE_DIRS}
-    PRIVATE ${WAYLAND_INCLUDE_DIRS}
-    PRIVATE ${XCB_RANDR_INCLUDE_DIRS}
-    PRIVATE ${XCB_INCLUDE_DIRS}
-    PRIVATE ${XRANDR_INCLUDE_DIRS}
-    PRIVATE ${X11_INCLUDE_DIRS}
-    PRIVATE ${GIO_INCLUDE_DIRS}
-    PRIVATE ${DCONF_INCLUDE_DIRS}
-    PRIVATE ${DBUS_INCLUDE_DIRS}
-    PRIVATE ${XFCONF_INCLUDE_DIRS}
-    PRIVATE ${SQLITE3_INCLUDE_DIRS}
-    PRIVATE ${RPM_INCLUDE_DIRS}
-    PRIVATE ${IMAGEMAGICK7_INCLUDE_DIRS}
-    PRIVATE ${IMAGEMAGICK6_INCLUDE_DIRS}
-    PRIVATE ${ZLIB_INCLUDE_DIRS}
-    PRIVATE ${CHAFA_INCLUDE_DIRS}
-    PRIVATE ${VULKAN_INCLUDE_DIRS}
-    PRIVATE ${EGL_INCLUDE_DIRS}
-    PRIVATE ${GLX_INCLUDE_DIRS}
-    PRIVATE ${OSMESA_INCLUDE_DIRS}
-    PRIVATE ${OPENCL_INCLUDE_DIRS}
 )

 target_link_libraries(libfastfetch
@@ -493,59 +375,70 @@ endif()
 # install target #
 ##################

+#https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.html
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "${TARGET_DIR_USR}" CACHE PATH "..." FORCE)
+endif()
+
 if(NOT CMAKE_INSTALL_SYSCONFDIR)
-    set(CMAKE_INSTALL_SYSCONFDIR "/etc")
+    set(CMAKE_INSTALL_SYSCONFDIR "${TARGET_DIR_ROOT}/etc" CACHE PATH "..." FORCE)
 endif()

 include(GNUInstallDirs)

 install(
    TARGETS fastfetch flashfetch
-    DESTINATION ${CMAKE_INSTALL_BINDIR}
+    DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )

 install(
-    FILES src/data/config_system.txt
-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${CMAKE_PROJECT_NAME}
+    FILES "${CMAKE_SOURCE_DIR}/src/data/config_system.txt"
+    DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/${CMAKE_PROJECT_NAME}"
    RENAME "config.conf"
 )

 install(
-    FILES completions/bash
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/bash-completion/completions
-    RENAME ${CMAKE_PROJECT_NAME}
+    FILES "${CMAKE_SOURCE_DIR}/completions/bash"
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/bash-completion/completions"
+    RENAME "${CMAKE_PROJECT_NAME}"
 )

 install(
-    DIRECTORY presets
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}
+    DIRECTORY "${CMAKE_SOURCE_DIR}/presets"
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${CMAKE_PROJECT_NAME}"
 )

 install(
-    FILES ./LICENSE
-    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/licenses/${CMAKE_PROJECT_NAME}
+    FILES "${CMAKE_SOURCE_DIR}/LICENSE"
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${CMAKE_PROJECT_NAME}"
 )

 ##################
 # package target #
 ##################

-set(CPACK_GENERATOR "DEB;RPM;TGZ;ZIP")
-set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+set(CPACK_GENERATOR "TGZ;ZIP")
+
+if(LINUX)
+    set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB;RPM")
+
+    set(CPACK_DEBIAN_PACKAGE_SECTION, "utils")
+    set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6")
+
+    set(CPACK_RPM_PACKAGE_LICENSE "MIT")
+elseif(APPLE)
+    set(CPACK_GENERATOR "${CPACK_GENERATOR};DragNDrop")
+
+    set(CPACK_DMG_DISABLE_APPLICATIONS_SYMLINK TRUE)
+endif()
+
 set(CPACK_SET_DESTDIR ON)

 set(CPACK_PACKAGE_CONTACT "Linus Dierheimer <Linus@Dierheimer.de>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Neofetch clone written in C")
 set(CPACK_PACKAGE_DESCRIPTION "\
 fastfetch is a neofetch-like tool for fetching system information and displaying them in a pretty way. \
 It is written in c to achieve much better performance.\
 ")
-set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/LinusDierheimer")
-
-set(CPACK_DEBIAN_PACKAGE_SECTION, "utils")
-set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6")
-
-set(CPACK_RPM_PACKAGE_LICENSE "MIT")

 include(CPack)
@@ -1,9 +1,14 @@
-# fastfetch
+# <center> Fastfetch </center>

-fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying them in a pretty way. It is written in c to achieve much better performance, in return only Linux and Android are supported. It also uses mechanisms like multithreading and caching to finish as fast as possible.  
-  
-The output on my personal machine with default configurations looks like this:
-<img src="screenshots/example.png" alt="example output" width="100%"/>  
+Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying them in a pretty way. It is written in pure c, with performance and customizability in mind. Currently Linux, Android and MacOS are supported.
+
+<img src="screenshots/example1.png" width="49%" align="left" />
+<img src="https://upload.wikimedia.org/wikipedia/commons/2/24/Transparent_Square_Tiles_Texture.png" width="49%" height="16px" align="left" />
+<img src="screenshots/example4.png" width="49%" align="left" />
+<img src="https://upload.wikimedia.org/wikipedia/commons/2/24/Transparent_Square_Tiles_Texture.png" width="49%" height="16px" align="left" />
+<img src="screenshots/example2.png" width="48%" align="top" />
+<img src="screenshots/example3.png" width="48%" align="top" />
+<img src="screenshots/example5.png" height="15%" align="top" />

 ## Customization

@@ -11,8 +16,8 @@ With customization and speed being two competing goals, this project actually bu
 The main one being `fastfetch`, which can be very greatly configured via flags. These flags can be made persistent in `~/.config/fastfetch/config.conf`. To view the available options run `fastfetch --help`.  
 The second executable being built is called `flashfetch`, which is configured at compile time to eliminate any possible overhead. Configuration of it can be very easily done in [`src/flashfetch.c`](src/flashfetch.c).  
 At the moment the performance difference is measurable, but too small to be human recognizable. But the leap will get bigger with more and more options coming, and on slow machines this might actually make a difference.  
-  
-There are some presets defined for fastfech in [`presets`](presets), you can can load them with `--load-config`. They may also serve as a good example for format arguments.
+
+There are some premade config files in [`presets`](presets), including the ones used for the screenshots above. You can load them using `--load-config <filename>`. They may also serve as a good example for format arguments.

 ## Dependencies

@@ -45,12 +50,12 @@ All categories not listed here should work without needing a specific implementa

 ##### Available Modules
 ```
-Title, Separator, OS, Host, Kernel, Uptime, Processes, Packages, Shell, Resolution, DE, WM, WMTheme, Theme, Icons, Font, Cursor, Terminal, Terminal Font, CPU, CPUUsage, GPU, Memory, Disk, Battery, Player, Song, Vulkan, OpenGL, OpenCL, LocalIP, PublicIP, DateTime, Date, Time, Locale, Colors, Break, Custom
+Title, Separator, OS, Host, Kernel, Uptime, Processes, Packages, Shell, Resolution, DE, WM, WMTheme, Theme, Icons, Font, Cursor, Terminal, Terminal Font, CPU, CPUUsage, GPU, Memory, Swap, Disk, Battery, Player, Media, Vulkan, OpenGL, OpenCL, LocalIP, PublicIP, DateTime, Date, Time, Locale, Colors, Break, Custom
 ```

 ##### Logos
 ```
-Alpine, Android, Arch, Arco, Artix, Bedrock, CachyOS, CentOS, Debian, Devuan, Deepin, Endeavour, Fedora, Garuda, Gentoo, KDE Neon, Kubuntu, Linux, Manjaro, Mint, NixOS, OpenSUSE, OpenSUSE Tumbleweed, OpenSUSE LEAP, Pop!_OS, RebornOS, RedstarOS, Rocky, Ubuntu, Void, Zorin
+AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, CachyOS, CentOS, Debian, Devuan, Deepin, Endeavour, Fedora, Garuda, Gentoo, KDE Neon, KISS, Kubuntu, LangitKetujuh, Linux, MacOS, Manjaro, Mint, MSYS2, NixOS, OpenSUSE, OpenSUSE Tumbleweed, OpenSUSE LEAP, Pop!_OS, RebornOS, RedstarOS, Rocky, Rosa, Slackware, Ubuntu, Void, Zorin
 ```
 * Most of the logos have a small variant. Access it by appending _small to the logo name.
 * Some logos have an old variant. Access it by appending _old to the logo name.
@@ -60,7 +65,7 @@ Alpine, Android, Arch, Arco, Artix, Bedrock, CachyOS, CentOS, Debian, Devuan, De

 ##### Package managers
 ```
-Pacman, dpkg, rpm, emerge, xbps, nix, Flatpak, Snap
+Pacman, dpkg, rpm, emerge, xbps, nix, Flatpak, Snap, apk, brew
 ```

 ##### WM themes
@@ -9,28 +9,38 @@ __fastfetch_complete_help()
        "os-format"
        "host-format"
        "kernel-format"
+        "uptime-format"
+        "processes-format"
        "packages-format"
        "shell-format"
        "resolution-format"
        "de-format"
        "wm-format"
+        "wm-theme-format"
        "theme-format"
        "icons-format"
        "font-format"
+        "cursor-format"
        "terminal-format"
        "terminal-font-format"
        "cpu-format"
        "cpu-usage-format"
        "gpu-format"
        "memory-format"
+        "swap-format"
        "disk-format"
        "battery-format"
        "locale-format"
        "local-ip-format"
        "public-ip-format"
+        "player-format"
+        "media-format"
        "datetime-format"
        "date-format"
        "time-format"
+        "vulkan-format"
+        "opengl-format"
+        "opencl-format"
    )
    COMPREPLY=($(compgen -W "${__ff_helps[*]}" -- "$CURRENT_WORD"))
 }
@@ -57,6 +67,41 @@ __fastfetch_complete_logo()
    COMPREPLY=($(compgen -W "$(fastfetch --list-logos-autocompletion)" -- "$CURRENT_WORD"))
 }

+__fastfetch_complete_logo_type()
+{
+    local __ff_logo_types=(
+        "auto"
+        "builtin"
+        "file"
+        "raw"
+        "sixel"
+        "kitty"
+        "chafa"
+    )
+    COMPREPLY=($(compgen -W "${__ff_logo_types[*]}" -- "$CURRENT_WORD"))
+}
+
+__fastfetch_complete_binary_prefix()
+{
+    local __ff_binary_prefixes=(
+        "iec"
+        "si"
+        "jedec"
+    )
+    COMPREPLY=($(compgen -W "${__ff_binary_prefixes[*]}" -- "$CURRENT_WORD"))
+}
+
+__fastfetch_complete_gl()
+{
+    local __ff_gl_types=(
+        "auto"
+        "egl"
+        "glx"
+        "osmesa"
+    )
+    COMPREPLY=($(compgen -W "${__ff_gl_types[*]}" -- "$CURRENT_WORD"))
+}
+
 __fastfetch_complete_option()
 {
    local FF_OPTIONS_ALL=(
@@ -64,6 +109,9 @@ __fastfetch_complete_option()
        "${FF_OPTIONS_STRING[@]}"
        "${FF_OPTIONS_PATH[@]}"
        "${FF_OPTIONS_LOGO[@]}"
+        "${FF_OPTIONS_LOGO_TYPE[@]}"
+        "${FF_OPTIONS_BINARY_PREFIX[@]}"
+        "${FF_OPTIONS_GL[@]}"
    )

    if [[ $WORD_COUND -lt 3 ]]; then
@@ -134,6 +182,7 @@ __fastfetch_completion()
        "--escape-bedrock"
        "--pipe"
        "--title-fqdn"
+        "--escape-bedrock"
    )

    local FF_OPTIONS_STRING=(
@@ -149,134 +198,141 @@ __fastfetch_completion()
        "--logo-color-6"
        "--logo-color-7"
        "--logo-color-8"
+        "--logo-width"
+        "--logo-height"
        "--logo-color-9"
        "-c"
        "--color"
+        "--color-keys"
+        "--color-title"
        "--separator"
        "-s"
        "--structure"
        "--set"
-        "--gl"
-        "--os-format"
+        "--set-keyless"
+        "--player-name"
+        "--public-ip-timeout"
        "--os-key"
-        "--host-format"
+        "--os-format"
+        "--os-error"
        "--host-key"
-        "--kernel-format"
+        "--host-format"
+        "--host-error"
        "--kernel-key"
-        "--uptime-format"
+        "--kernel-format"
+        "--kernel-error"
        "--uptime-key"
-        "--processes-format"
+        "--uptime-format"
+        "--uptime-error"
        "--processes-key"
-        "--packages-format"
+        "--processes-format"
+        "--processes-error"
        "--packages-key"
-        "--shell-format"
+        "--packages-format"
+        "--packages-error"
        "--shell-key"
-        "--resolution-format"
+        "--shell-format"
+        "--shell-error"
        "--resolution-key"
-        "--de-format"
+        "--resolution-format"
+        "--resolution-error"
        "--de-key"
-        "--wm-format"
+        "--de-format"
+        "--de-error"
        "--wm-key"
-        "--wm-theme-format"
+        "--wm-format"
+        "--wm-error"
        "--wm-theme-key"
-        "--theme-format"
+        "--wm-theme-format"
+        "--wm-theme-error"
        "--theme-key"
-        "--icons-format"
+        "--theme-format"
+        "--theme-error"
        "--icons-key"
-        "--font-format"
+        "--icons-format"
+        "--icons-error"
        "--font-key"
-        "--cursor-format"
+        "--font-format"
+        "--font-error"
        "--cursor-key"
-        "--terminal-format"
+        "--cursor-format"
+        "--cursor-error"
        "--terminal-key"
-        "--terminal-font-format"
+        "--terminal-format"
+        "--terminal-error"
        "--terminal-font-key"
-        "--cpu-format"
+        "--terminal-font-format"
+        "--terminal-font-error"
        "--cpu-key"
-        "--cpu-usage-format"
-        "--cpu-usage-key"
-        "--gpu-format"
+        "--cpu-format"
+        "--cpu-error"
+        "--cpu-useage-key"
+        "--cpu-useage-format"
+        "--cpu-useage-error"
        "--gpu-key"
-        "--memory-format"
+        "--gpu-format"
+        "--gpu-error"
        "--memory-key"
+        "--memory-format"
+        "--memory-error"
+        "--swap-key"
+        "--swap-format"
+        "--swap-error"
+        "--disk-key"
        "--disk-format"
-        "--disk-key"
-        "--battery-format"
+        "--disk-error"
        "--battery-key"
-        "--locale-format"
+        "--battery-format"
+        "--battery-error"
        "--locale-key"
-        "--disk-folders"
-        "--disk-key"
-        "--local-ip-format"
+        "--locale-format"
+        "--locale-error"
        "--local-ip-key"
-        "--public-ip-format"
+        "--local-ip-format"
+        "--local-ip-error"
        "--public-ip-key"
-        "--player-format"
+        "--public-ip-format"
+        "--public-ip-error"
        "--player-key"
-        "--song-format"
-        "--song-key"
+        "--player-format"
+        "--player-error"
+        "--media-key"
+        "--media-format"
+        "--media-error"
        "--datetime-key"
        "--datetime-format"
-        "--date-format"
+        "--datetime-error"
        "--date-key"
-        "--time-format"
+        "--date-format"
+        "--date-error"
        "--time-key"
+        "--time-format"
+        "--time-error"
        "--vulkan-key"
        "--vulkan-format"
+        "--vulkan-error"
        "--opengl-key"
        "--opengl-format"
+        "--opengl-error"
        "--opencl-key"
        "--opencl-format"
-        "--os-error"
-        "--host-error"
-        "--kernel-error"
-        "--uptime-error"
-        "--processes-error"
-        "--packages-error"
-        "--shell-error"
-        "--resolution-error"
-        "--de-error"
-        "--wm-error"
-        "--wm-theme-error"
-        "--theme-error"
-        "--icons-error"
-        "--font-error"
-        "--cursor-error"
-        "--terminal-error"
-        "--terminal-font-error"
-        "--cpu-error"
-        "--cpu-usage-error"
-        "--gpu-error"
-        "--memory-error"
-        "--disk-error"
-        "--battery-error"
-        "--locale-error"
-        "--disk-error"
-        "--local-ip-error"
-        "--public-ip-error"
-        "--player-error"
-        "--song-error"
-        "--datetime-error"
-        "--date-error"
-        "--time-error"
-        "--vulkan-error"
-        "--opengl-error"
        "--opencl-error"
    )

    local FF_OPTIONS_PATH=(
+        "--load-config"
        "--os-file"
-        "--lib-PCI"
+        "--lib-pci"
        "--lib-vulkan"
        "--lib-wayland"
        "--lib-xcb-randr"
        "--lib-xcb"
-        "--lib-Xrandr"
+        "--lib-xrandr"
        "--lib-X11"
        "--lib-gio"
-        "--lib-DConf"
-        "--lib-DBus"
-        "--lib-XFConf"
+        "--lib-dconf"
+        "--lib-dbus"
+        "--lib-xfconf"
        "--lib-sqlite3"
        "--lib-rpm"
        "--lib-imagemagick"
@@ -287,7 +343,6 @@ __fastfetch_completion()
        "--lib-osmesa"
        "--lib-opencl"
        "--battery-dir"
-        "--load-config"
    )

    local FF_OPTIONS_LOGO=(
@@ -295,6 +350,18 @@ __fastfetch_completion()
        "--logo"
    )

+    local FF_OPTIONS_LOGO_TYPE=(
+        "--logo-type"
+    )
+
+    local FF_OPTIONS_BINARY_PREFIX=(
+        "--binary-prefix"
+    )
+
+    local FF_OPTIONS_GL=(
+        "--gl"
+    )
+
    if __fastfetch_previous_matches "${FF_OPTIONS_SINGLE[@]}"; then
        return
    elif [[ $WORD_COUND -gt 3 && ( ${COMP_WORDS[$COMP_CWORD - 2]} == "--help" || ${COMP_WORDS[$COMP_CWORD - 2]} == "-h" ) ]]; then
@@ -311,9 +378,14 @@ __fastfetch_completion()
        __fastfetch_complete_path
    elif __fastfetch_previous_matches "${FF_OPTIONS_LOGO[@]}"; then
        __fastfetch_complete_logo
+    elif __fastfetch_previous_matches "${FF_OPTIONS_LOGO_TYPE[@]}"; then
+        __fastfetch_complete_logo_type
+    elif __fastfetch_previous_matches "${FF_OPTIONS_BINARY_PREFIX[@]}"; then
+        __fastfetch_complete_binary_prefix
+    elif __fastfetch_previous_matches "${FF_OPTIONS_GL[@]}"; then
+        __fastfetch_complete_gl
    else
        __fastfetch_complete_option
    fi
-}

 complete -F __fastfetch_completion fastfetch
@@ -1 +1 @@
--structure Title:Separator:OS:Host:Kernel:Uptime:Processes:Packages:Shell:Resolution:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Disk:Battery:Player:Song:PublicIP:LocalIP:DateTime:Locale:Vulkan:OpenGL:OpenCL:Break:Colors
+--structure Title:Separator:OS:Host:Kernel:Uptime:Processes:Packages:Shell:Resolution:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:Battery:Player:Song:PublicIP:LocalIP:DateTime:Locale:Vulkan:OpenGL:OpenCL:Break:Colors
@@ -1,4 +1,4 @@
 --disable-linewrap false
 --multithreading false
--show-errors true
+--show-errors
 --recache
@@ -1,2 +1,3 @@
--load-config verbose
 --load-config devinfo
+--load-config all
+--load-config verbose
@@ -0,0 +1 @@
+# Load with --load-config examples/1
@@ -0,0 +1,24 @@
+# Load with --load-config examples/2
+# Note that you must replace the image path to an existing image to display it.
+
+--kitty /home/linus/Bilder/Gentoo.png
+--logo-width 28
+
+--separator "  "
+
+--set-keyless HardwareStart=┌───────── \e[1mHardware Information\e[0m ─────────┐
+--set-keyless SoftwareStart=├───────── \e[1mSoftware Information\e[0m ─────────┤
+--set-keyless InformationEnd=└────────────────────────────────────────┘
+--set-keyless Colors=    \e[38m \e[37m \e[36m \e[35m \e[34m \e[33m \e[32m \e[31m
+--structure HardwareStart:Host:CPU:GPU:SoftwareStart:OS:Kernel:WM:Shell:Terminal:TerminalFont:Packages:InformationEnd:Colors
+
+--host-key "  "
+--cpu-key "  "
+--gpu-key "  ﬙"
+--os-key "  "
+--kernel-key "  "
+--wm-key "  "
+--shell-key "  "
+--terminal-key "  "
+--terminal-font-key "  "
+--packages-key "  "
@@ -0,0 +1,7 @@
+# Load with --load-config example/3
+
+--logo debian_small
+--structure Vulkan:OpenGL:OpenCL:Memory:Disk:LocalIP
+--binary-prefix si
+--localip-show-loop false
+--disk-folders /:/home:/boot:/efi
@@ -0,0 +1,7 @@
+# Load with --load-config examples/4
+
+--color blue
+--logo arch_small
+--logo-padding-right 1
+--separator "  "
+--structure Date:Time:Break:Player:Media
@@ -0,0 +1,12 @@
+# Load with --load-config examples/5
+
+--logo none
+--color reset_magenta
+--structure Theme:Icons:Font:Cursor
+--theme-key T
+--theme-format {7}
+--icons-key I
+--icons-format {5}
+--font-key F
+--font-format {21}
+--cursor-key C
@@ -1,31 +1,29 @@
--load-config all
-
--os-format "System: {}; Name: {}; Pretty name: {}; ID: {}; ID like: {}; Variant: {}; Variant ID: {}; Version: {}; Version ID: {}; Version codename: {}; Build ID: {}; Architecture: {}"
--host-format "Family: "product_family: {}; product_name: {}; product_version: {}; product_sku: {}; bios_date: {}; bios_release: {}; bios_vendor: {}; bios_version: {}; board_name: {}; board_vendor: {}; board_version: {}; chassis_type: {}; chassis_vendor: {}; chassis_version: {}; sys_vendor: {}"
--kernel-format "Sysname: {}; Release: {}; Version: {}"
--uptime-format "Days: {}; Hours: {}; Minutes: {}; Seconds: {}"
--processes-format "Count: {}"
--packages-format "All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; xbps: {}; flatpak: {}; snap: {}"
--shell-format "Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}"
--resolution-format "Width: {}; Height: {}; Refresh rate: {}"
--de-format "Process name: {}; Pretty name: {}; Version: {}"
--wm-format "Process name: {}; Pretty name: {}; Protocol: {}"
--wm-theme-format "Name: {}"
--theme-format "Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}"
--icons-format "Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}"
--font-format "Plasma raw: {}; Plasma name: {}; Plasma size: {}; Plasma styles: {}; Plasma pretty: {}; GTK2 raw: {}; GTK2 name: {}; GTK2 size: {}; GTK2 styles: {}; GTK2 pretty: {}; GTK3 raw: {}; GTK3 name: {}; GTK3 size: {}; GTK3 styles: {}; GTK3 pretty: {}; GTK4 raw: {}; GTK4 name: {}; GTK4 size: {}; GTK4 styles: {}; GTK4 pretty: {}; GTK: {}"
--cursor-format "Theme: {}; Size: {}"
--terminal-format "Process: {}; Path: {}; Exe: {}"
--terminal-font-format "Raw: {}; Name: {}; Size: {}; Styles: {}; Pretty: {}"
--cpu-format "Name: {}; Pretty: {}; Vendor: {}; Logical online: {}; Logical configured: {}; Physical: {}; Cores: {}; temperature: {}; bios: {}; scaling max: {}; scaling min: {}; info max: {}; info min: {}; cpuinfo: {}; frequency: {}"
--cpu-usage-format "Percentage: {}"
--gpu-format "Vendor: {}; Vendor pretty: {}; Name: {}; Name pretty: {}; Driver: {}; Temperature: {}"
--memory-format "Used: {}; Total: {}; Percentage: {}"
--disk-format "Used: {}; Total: {}; Files: {}; Percentage: {}"
--battery-format "Manufactor: {}; Model: {}; Technology: {}; Capacaty: {}; Status: {}"
--player-format "Name: {}"
--song-format "Song: {}; Artist: {}; Album: {}"
--datetime-format "year: {}; yearShort: {}; month: {}; monthPretty: {}; monthName: {}; monthNameShort: {}; weekNumber: {}; weekday: {}; weekdayShort: {}; dayInYear: {}; dayInMonth: {}; dayInWeek: {}; hour: {}; hourPretty: {}; hour12: {}; hour12Pretty: {}; minute: {}; minutePretty: {}; second: {}; secondPretty: {}"
--vulkan-format "driver: {}; Api Version: {}; Conformance Version: {}"
--opengl-format "version: {}; renderer: {}; vendor: {}"
--opencl-format "version: {}; device: {}; vendor: {}"
+--os-format System: {}; Name: {}; Pretty name: {}; ID: {}; ID like: {}; Variant: {}; Variant ID: {}; Version: {}; Version ID: {}; Version codename: {}; Build ID: {}; Architecture: {}
+--host-format Family: product_family: {}; product_name: {}; product_version: {}; product_sku: {}; bios_date: {}; bios_release: {}; bios_vendor: {}; bios_version: {}; board_name: {}; board_vendor: {}; board_version: {}; chassis_type: {}; chassis_vendor: {}; chassis_version: {}; sys_vendor: {}
+--kernel-format Sysname: {}; Release: {}; Version: {}
+--uptime-format Days: {}; Hours: {}; Minutes: {}; Seconds: {}
+--processes-format Count: {}
+--packages-format All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; xbps: {}; apk: {}; flatpak: {}; snap: {}; brew: {}
+--shell-format Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}
+--resolution-format Width: {}; Height: {}; Refresh rate: {}
+--de-format Process name: {}; Pretty name: {}; Version: {}
+--wm-format Process name: {}; Pretty name: {}; Protocol: {}
+--wm-theme-format Name: {}
+--theme-format Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
+--icons-format Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}
+--font-format Plasma raw: {}; Plasma name: {}; Plasma size: {}; Plasma styles: {}; Plasma pretty: {}; GTK2 raw: {}; GTK2 name: {}; GTK2 size: {}; GTK2 styles: {}; GTK2 pretty: {}; GTK3 raw: {}; GTK3 name: {}; GTK3 size: {}; GTK3 styles: {}; GTK3 pretty: {}; GTK4 raw: {}; GTK4 name: {}; GTK4 size: {}; GTK4 styles: {}; GTK4 pretty: {}; GTK: {}
+--cursor-format Theme: {}; Size: {}
+--terminal-format Process: {}; Path: {}; Exe: {}
+--terminal-font-format Raw: {}; Name: {}; Size: {}; Styles: {}; Pretty: {}
+--cpu-format Name: {}, Vendor: {}, CoresPhysical: {}, CoresLogical: {}, CoresOnline: {}, FrequencyMin: {}, FrequencyMax: {}, Temperature: {}
+--cpu-usage-format Percentage: {}
+--gpu-format Vendor: {}; Name: {}; Driver: {}; Temperature: {}
+--memory-format Used: {}; Total: {}; Percentage: {}
+--disk-format Used: {}; Total: {}; Files: {}; Percentage: {}
+--battery-format Manufactor: {}; Model: {}; Technology: {}; Capacity: {}; Status: {}
+--player-format Pretty: {}; Name: {}; Bus: {}; Url: {}
+--media-format Pretty: {}; Name: {};  Artist: {}; Album: {}
+--datetime-format year: {}; yearShort: {}; month: {}; monthPretty: {}; monthName: {}; monthNameShort: {}; weekNumber: {}; weekday: {}; weekdayShort: {}; dayInYear: {}; dayInMonth: {}; dayInWeek: {}; hour: {}; hourPretty: {}; hour12: {}; hour12Pretty: {}; minute: {}; minutePretty: {}; second: {}; secondPretty: {}
+--vulkan-format driver: {}; Api Version: {}; Conformance Version: {}
+--opengl-format version: {}; renderer: {}; vendor: {}
+--opencl-format version: {}; device: {}; vendor: {}
@@ -1,4 +1,4 @@
-#!/bin/env sh
+#!/usr/bin/env sh

 # make the script exit if any of the commands fail,
 # making fastfetch not run if the build failed.
@@ -5,6 +5,9 @@

 #include <stdlib.h>

+#define FF_CACHE_VERSION_NAME "cacheversion"
+#define FF_CACHE_VERSION_EXTENSION "ffv"
+
 #define FF_CACHE_VALUE_EXTENSION "ffcv"
 #define FF_CACHE_SPLIT_EXTENSION "ffcs"

@@ -44,9 +47,11 @@ void ffCacheValidate(FFinstance* instance)
 {
    FFstrbuf content;
    ffStrbufInit(&content);
-    readCacheFile(instance, "cacheversion", "ffv", &content);
+    readCacheFile(instance, FF_CACHE_VERSION_NAME, FF_CACHE_VERSION_EXTENSION, &content);

-    bool isSameVersion = ffStrbufCompS(&content, FASTFETCH_PROJECT_VERSION) == 0;
+    const char exactVersion[] = FASTFETCH_PROJECT_VERSION FASTFETCH_PROJECT_VERSION_TWEAK;
+
+    bool isSameVersion = ffStrbufCompS(&content, exactVersion) == 0;
    ffStrbufDestroy(&content);
    if(isSameVersion)
        return;
@@ -54,9 +59,9 @@ void ffCacheValidate(FFinstance* instance)
    instance->config.recache = true;

    FFstrbuf version;
-    ffStrbufInitA(&version, sizeof(FASTFETCH_PROJECT_VERSION));
-    ffStrbufAppendS(&version, FASTFETCH_PROJECT_VERSION);
-    writeCacheFile(instance, "cacheversion", "ffv", &version);
+    ffStrbufInitA(&version, sizeof(exactVersion));
+    ffStrbufAppendS(&version, exactVersion);
+    writeCacheFile(instance, FF_CACHE_VERSION_NAME, FF_CACHE_VERSION_EXTENSION, &version);
    ffStrbufDestroy(&version);
 }

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/format.h"
+#include "common/parsing.h"

 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
 {
@@ -63,11 +64,10 @@ static inline void appendEmptyPlaceholder(FFstrbuf* buffer, const char* placehol
 static inline bool formatArgSet(const FFformatarg* arg)
 {
    return arg->value != NULL && (
-        (arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value == *(double*)arg->value) || //NaN
+        (arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value > 0.0) || //Also is false for NaN
        (arg->type == FF_FORMAT_ARG_TYPE_INT && *(int*)arg->value > 0) ||
        (arg->type == FF_FORMAT_ARG_TYPE_STRBUF && ((FFstrbuf*)arg->value)->length > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_STRING && *(const char*)arg->value != '\0') ||
+        (arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet(arg->value)) ||
        (arg->type == FF_FORMAT_ARG_TYPE_UINT8 && *(uint8_t*)arg->value > 0) ||
        (arg->type == FF_FORMAT_ARG_TYPE_UINT16 && *(uint16_t*)arg->value > 0) ||
        (arg->type == FF_FORMAT_ARG_TYPE_UINT && *(uint32_t*)arg->value > 0)
@@ -1,8 +1,9 @@
 #include "fastfetch.h"
 #include "common/caching.h"
+#include "common/parsing.h"
 #include "detection/qt.h"
 #include "detection/gtk.h"
-#include "detection/displayserver.h"
+#include "detection/displayserver/displayserver.h"

 #include <stdlib.h>
 #include <unistd.h>
@@ -20,7 +21,7 @@ static void initConfigDirs(FFstate* state)
    ffListInit(&state->configDirs, sizeof(FFstrbuf));

    const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
-    if(xdgConfigHome != NULL)
+    if(ffStrSet(xdgConfigHome))
    {
        FFstrbuf* buffer = (FFstrbuf*) ffListAdd(&state->configDirs);
        ffStrbufInitA(buffer, 64);
@@ -54,6 +55,12 @@ static void initConfigDirs(FFstate* state)
        uint32_t colonIndex = ffStrbufNextIndexC(&xdgConfigDirs, startIndex, ':');
        xdgConfigDirs.chars[colonIndex] = '\0';

+        if(!ffStrSet(xdgConfigDirs.chars + startIndex))
+        {
+            startIndex = colonIndex + 1;
+            continue;
+        }
+
        FFstrbuf* buffer = (FFstrbuf*) ffListAdd(&state->configDirs);
        ffStrbufInitA(buffer, 64);
        ffStrbufAppendS(buffer, xdgConfigDirs.chars + startIndex);
@@ -103,7 +110,10 @@ static void initState(FFstate* state)
    state->keysHeight = 0;
    state->passwd = getpwuid(getuid());
    uname(&state->utsname);
-    sysinfo(&state->sysinfo);
+
+    #if FF_HAVE_SYSINFO_H
+        sysinfo(&state->sysinfo);
+    #endif

    initConfigDirs(state);
    initCacheDir(state);
@@ -128,7 +138,9 @@ static void defaultConfig(FFinstance* instance)
    instance->config.logo.paddingRight = 4;
    instance->config.logo.printRemaining = true;

-    ffStrbufInit(&instance->config.mainColor);
+    ffStrbufInit(&instance->config.colorKeys);
+    ffStrbufInit(&instance->config.colorTitle);
+
    ffStrbufInit(&instance->config.separator);
    ffStrbufAppendS(&instance->config.separator, ": ");

@@ -139,6 +151,7 @@ static void defaultConfig(FFinstance* instance)
    instance->config.disableLinewrap = true;
    instance->config.hideCursor = true;
    instance->config.escapeBedrock = true;
+    instance->config.binaryPrefixType = FF_BINARY_PREFIX_TYPE_IEC;
    instance->config.glType = FF_GL_TYPE_AUTO;
    instance->config.pipe = false;
    instance->config.multithreading = true;
@@ -164,6 +177,7 @@ static void defaultConfig(FFinstance* instance)
    initModuleArg(&instance->config.cpuUsage);
    initModuleArg(&instance->config.gpu);
    initModuleArg(&instance->config.memory);
+    initModuleArg(&instance->config.swap);
    initModuleArg(&instance->config.disk);
    initModuleArg(&instance->config.battery);
    initModuleArg(&instance->config.locale);
@@ -224,37 +238,41 @@ void ffInitInstance(FFinstance* instance)
    defaultConfig(instance);
 }

-static inline void* detectPlasmaThreadMain(void* instance)
-{
-    ffDetectQt((FFinstance*)instance);
-    return NULL;
-}
+#if !defined(__ANDROID__)

-static inline void* detectGTK2ThreadMain(void* instance)
-{
-    ffDetectGTK2((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* detectGTK3ThreadMain(void* instance)
-{
-    ffDetectGTK3((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* detectGTK4ThreadMain(void* instance)
-{
-    ffDetectGTK4((FFinstance*)instance);
-    return NULL;
-}
-
-static inline void* connectDisplayServerThreadMain(void* instance)
+static void* connectDisplayServerThreadMain(void* instance)
 {
    ffConnectDisplayServer((FFinstance*)instance);
    return NULL;
 }

-static inline void* startThreadsThreadMain(void* instance)
+#if !defined(__APPLE__)
+
+static void* detectPlasmaThreadMain(void* instance)
+{
+    ffDetectQt((FFinstance*)instance);
+    return NULL;
+}
+
+static void* detectGTK2ThreadMain(void* instance)
+{
+    ffDetectGTK2((FFinstance*)instance);
+    return NULL;
+}
+
+static void* detectGTK3ThreadMain(void* instance)
+{
+    ffDetectGTK3((FFinstance*)instance);
+    return NULL;
+}
+
+static void* detectGTK4ThreadMain(void* instance)
+{
+    ffDetectGTK4((FFinstance*)instance);
+    return NULL;
+}
+
+static void* startThreadsThreadMain(void* instance)
 {
    pthread_t dsThread;
    pthread_create(&dsThread, NULL, connectDisplayServerThreadMain, instance);
@@ -281,18 +299,27 @@ static inline void* startThreadsThreadMain(void* instance)

 void startDetectionThreads(FFinstance* instance)
 {
-    //Android needs none of the things that are detected here
-    //And using gsettings sometimes hangs the program in android for some unknown reason,
-    //and since we don't need it we just never call it.
-    #ifdef __ANDROID__
-        return;
-    #endif
-
    pthread_t startThreadsThread;
    pthread_create(&startThreadsThread, NULL, startThreadsThreadMain, instance);
    pthread_detach(startThreadsThread);
 }

+#else // !__APPLE__
+void startDetectionThreads(FFinstance* instance)
+{
+    pthread_t startThreadsThread;
+    pthread_create(&startThreadsThread, NULL, connectDisplayServerThreadMain, instance);
+    pthread_detach(startThreadsThread);
+}
+#endif // __APPLE__
+
+#else // !__ANDROID__
+void startDetectionThreads(FFinstance* instance)
+{
+    FF_UNUSED(instance);
+}
+#endif // __ANDROID__
+
 static volatile bool ffDisableLinewrap = true;
 static volatile bool ffHideCursor = true;

@@ -23,7 +23,6 @@ static void createSubfolders(const char* fileName)
    ffStrbufDestroy(&path);
 }

-
 bool ffWriteFDBuffer(int fd, const FFstrbuf* content)
 {
    return write(fd, content->chars, content->length) != -1;
@@ -6,7 +6,7 @@
 static void* libraryLoad(const char* path, int maxVersion)
 {
    void* result = dlopen(path, RTLD_LAZY);
-    if(result != NULL)
+    if(result != NULL || maxVersion < 0)
        return result;

    FFstrbuf pathbuf;
@@ -5,15 +5,21 @@

 #include <dlfcn.h>

+#ifdef __APPLE__
+    #define FF_LIBRARY_EXTENSION ".dylib"
+#else
+    #define FF_LIBRARY_EXTENSION ".so"
+#endif
+
 #define FF_LIBRARY_SYMBOL(symbolName) \
    __typeof__(&symbolName) ff ## symbolName;

 #define FF_LIBRARY_LOAD(libraryObjectName, userLibraryName, returnValue, ...) \
-    void* libraryObjectName =  ffLibraryLoad(&userLibraryName, __VA_ARGS__, NULL);\
+    void* libraryObjectName = ffLibraryLoad(&userLibraryName, __VA_ARGS__, NULL);\
    if(libraryObjectName == NULL) \
        return returnValue;

-#define FF_LIBRARY_LOAD_SYMBOL_ADRESS(library, symbolMapping, symbolName, returnValue) \
+#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \
    symbolMapping = dlsym(library, #symbolName); \
    if(symbolMapping == NULL) \
    { \
@@ -22,7 +28,19 @@
    }

 #define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
-    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADRESS(library, ff ## symbolName, symbolName, returnValue);
+    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
+
+#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
+    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "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_PTR(library, varName, symbolName, returnValue) \
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, varName->ff ## symbolName, symbolName, returnValue);

 void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);

@@ -2,6 +2,7 @@
 #include "common/networking.h"

 #include <unistd.h>
+#include <sys/time.h>
 #include <sys/socket.h>
 #include <netdb.h>

@@ -10,7 +11,6 @@ void ffNetworkingGetHttp(const char* host, const char* path, uint32_t timeout, F
    struct addrinfo hints = {0};
    hints.ai_family = AF_INET;
    hints.ai_socktype = SOCK_STREAM;
-    hints.ai_protocol = 0;

    struct addrinfo* addr;

@@ -28,7 +28,7 @@ void ffNetworkingGetHttp(const char* host, const char* path, uint32_t timeout, F
    {
        struct timeval timev;
        timev.tv_sec = 0;
-        timev.tv_usec = timeout * 1000; //milliseconds to microseconds
+        timev.tv_usec = (__typeof__(timev.tv_usec)) (timeout * 1000); //milliseconds to microseconds
        setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &timev, sizeof(timev));
    }

@@ -1,18 +1,17 @@
 #include "fastfetch.h"
 #include "common/parsing.h"
+#include <ctype.h>
+#include <inttypes.h>

 bool ffStrSet(const char* str)
 {
    if(str == NULL)
        return false;

-    while(*str != '\0')
-    {
-        if(*str != ' ' && *str != '\t' && *str != '\n' && *str != '\r')
-            return true;
-    }
+    while(isspace(*str))
+        str++;

-    return false;
+    return *str != '\0';
 }

 void ffParseSemver(FFstrbuf* buffer, const FFstrbuf* major, const FFstrbuf* minor, const FFstrbuf* patch)
@@ -66,6 +65,37 @@ void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty)
        ffStrbufAppendF(pretty, ".%u", version->patch);
 }

+static void parseSize(FFstrbuf* result, uint64_t bytes, uint32_t base, uint8_t prefixesLength, const char** prefixes)
+{
+    long double size = (long double) bytes;
+    uint8_t counter = 0;
+
+    while(size > base && counter < prefixesLength - 1)
+    {
+        size /= base;
+        counter++;
+    }
+
+    if(counter == 0)
+        ffStrbufAppendF(result, "%"PRIu64" %s", bytes, prefixes[0]);
+    else if(counter < 3 || (counter == 3 && size < 100.0))
+        ffStrbufAppendF(result, "%.2Lf %s", size, prefixes[counter]);
+    else
+        ffStrbufAppendF(result, "%.0Lf %s", size, prefixes[counter]);
+}
+
+void ffParseSize(uint64_t bytes, FFBinaryPrefixType binaryPrefix, FFstrbuf* result)
+{
+    if(binaryPrefix == FF_BINARY_PREFIX_TYPE_IEC)
+        parseSize(result, bytes, 1024, 5, (const char*[]) {"B", "KiB", "MiB", "GiB", "TiB"});
+    else if(binaryPrefix == FF_BINARY_PREFIX_TYPE_SI)
+        parseSize(result, bytes, 1000, 5, (const char*[]) {"B", "kB", "MB", "GB", "TB"});
+    else if(binaryPrefix == FF_BINARY_PREFIX_TYPE_JEDEC)
+        parseSize(result, bytes, 1024, 5, (const char*[]) {"B", "KB", "MB", "GB", "TB"});
+    else
+        parseSize(result, bytes, 1024, 1, (const char*[]) {"B"});
+}
+
 void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, const FFstrbuf* gtk4)
 {
    if(gtk2->length > 0 && gtk3->length > 0 && gtk4->length > 0)
@@ -21,4 +21,6 @@ void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, co
 void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty);
 int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2);

+void ffParseSize(uint64_t bytes, FFBinaryPrefixType binaryPrefix, FFstrbuf* result);
+
 #endif
@@ -5,10 +5,14 @@ void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t mod
 {
    ffLogoPrintLine(instance);

+    //This is used by --set-keyless, in this case we wan't neither the module name nor the separator
+    if(moduleName == NULL)
+        return;
+
    if(!instance->config.pipe)
    {
        fputs(FASTFETCH_TEXT_MODIFIER_RESET FASTFETCH_TEXT_MODIFIER_BOLT, stdout);
-        ffPrintColor(&instance->config.mainColor);
+        ffPrintColor(&instance->config.colorKeys);
    }

    //NULL check is required for modules with custom keys, e.g. disk with the folder path
@@ -26,7 +30,7 @@ void ffPrintLogoAndKey(FFinstance* instance, const char* moduleName, uint8_t mod
        ffParseFormatString(&key, customKeyFormat, 1, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex}
        });
-        ffStrbufWriteTo(&key, stdout);
+        ffPrintUserString(key.chars);
        ffStrbufDestroy(&key);
    }

@@ -49,7 +53,8 @@ void ffPrintFormatString(FFinstance* instance, const char* moduleName, uint8_t m
    if(buffer.length > 0)
    {
        ffPrintLogoAndKey(instance, moduleName, moduleIndex, customKeyFormat);
-        ffStrbufPutTo(&buffer, stdout);
+        ffPrintUserString(buffer.chars);
+        putchar('\n');
    }

    ffStrbufDestroy(&buffer);
@@ -125,3 +130,34 @@ void ffPrintCharTimes(char c, uint32_t times)
    for(uint32_t i = 0; i < times; i++)
        putchar(c);
 }
+
+void ffPrintUserString(const char* value)
+{
+    while(*value != '\0')
+    {
+        if(*value != '\\')
+        {
+            putchar(*value);
+            ++value;
+            continue;
+        }
+
+        ++value;
+
+        if(*value == 'n')
+            putchar('\n');
+        else if(*value == 't')
+            putchar('\t');
+        else if(*value == 'e')
+            putchar('\e');
+        else if(*value == '\\')
+            putchar('\\');
+        else
+        {
+            putchar('\\');
+            putchar(*value);
+        }
+
+        ++value;
+    }
+}
@@ -13,5 +13,6 @@ void ffPrintErrorString(FFinstance* instance, const char* moduleName, uint8_t mo
 void ffPrintError(FFinstance* instance, const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...);
 void ffPrintColor(const FFstrbuf* colorValue);
 void ffPrintCharTimes(char c, uint32_t times);
+void ffPrintUserString(const char* str);

 #endif
@@ -352,10 +352,44 @@ int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, cons

 #ifdef __ANDROID__
 #include <sys/system_properties.h>
-bool ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result) {
-    uint32_t originalLength = result->length;
+void ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result) {
    ffStrbufEnsureFree(result, PROP_VALUE_MAX);
    result->length += (uint32_t) __system_property_get(propName, result->chars + result->length);
-    return result->length > originalLength;
+    result->chars[result->length] = '\0';
 }
-#endif
+#endif //__ANDROID__
+
+#ifdef __APPLE__
+#include <sys/sysctl.h>
+void ffSettingsGetAppleProperty(const char* propName, FFstrbuf* result)
+{
+    size_t neededLength;
+    if(sysctlbyname(propName, NULL, &neededLength, NULL, 0) != 0 || neededLength == 0)
+        return;
+
+    ffStrbufEnsureFree(result, (uint32_t) neededLength);
+
+    if(sysctlbyname(propName, result->chars + result->length, &neededLength, NULL, 0) == 0)
+        result->length += (uint32_t) neededLength;
+
+    result->chars[result->length] = '\0';
+}
+
+int ffSettingsGetAppleInt(const char* propName, int defaultValue)
+{
+    int result;
+    size_t neededLength = sizeof(result);
+    if(sysctlbyname(propName, &result, &neededLength, NULL, 0) != 0)
+        return defaultValue;
+    return result;
+}
+
+int64_t ffSettingsGetAppleInt64(const char* propName, int64_t defaultValue)
+{
+    int64_t result;
+    size_t neededLength = sizeof(result);
+    if(sysctlbyname(propName, &result, &neededLength, NULL, 0) != 0)
+        return defaultValue;
+    return result;
+}
+#endif //__APPLE__
@@ -33,7 +33,13 @@ FFvariant ffSettingsGetXFConf(FFinstance* instance, const char* channelName, con
 int ffSettingsGetSQLite3Int(const FFinstance* instance, const char* dbPath, const char* query);

 #ifdef __ANDROID__
-bool ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result);
+void ffSettingsGetAndroidProperty(const char* propName, FFstrbuf* result);
+#endif
+
+#ifdef __APPLE__
+void ffSettingsGetAppleProperty(const char* propName, FFstrbuf* result);
+int ffSettingsGetAppleInt(const char* propName, int defaultValue);
+int64_t ffSettingsGetAppleInt64(const char* propName, int64_t defaultValue);
 #endif

 #endif
@@ -1,12 +1,12 @@
 # Fastfetch system configuration
-# This file sets the defaults for all users of the system.
+# This file sets the default config for all users of the system.

-# For more information about configuration files work,
-# see the file ~/.config/fastfetch/config.conf, generated during first
+# For more information about how configuration files work,
+# see ~/.config/fastfetch/config.conf, generated during first run.
 # All options that can be put there (or passed as argument) can be put here too.

-# This file was shipped with $"FASTFETCH_PROJECT_VERSION$".
-# Use fastfetch --print-config-system > /etc/fastfetch/config.conf to overwrite this file with the current defaults
+# Use fastfetch --print-config-system > /etc/fastfetch/config.conf
+# to overwrite this file with the current default file.

 # User config option
 # Sets if fastfetch should load user provided configuration.
@@ -113,12 +113,25 @@
 # Default is true.
 #--logo-print-remaining true

-# Color option:
+# Color keys option:
 # Sets the color of the keys.
 # Must be linux console color codes or the name of a color.
-# Default is the primary color of the logo.
+# Default is the key color of the logo.
 # Use "fastfetch --help color" to learn more and see examples.
-#--color magenta
+#--color-keys magenta
+
+# Color title option:
+# Sets the color of the title.
+# Must be linux console color codes or the name of a color.
+# Default is the title color of the logo.
+# Use "fastfetch --help color" to learn more and see examples.
+#--color-title magenta
+
+# Binary prefix option:
+# Sets the binary prefix to use.
+# Must be a IEC, SI or JEDEC.
+# Default is IEC.
+#--binary-prefix IEC

 # Title FQDN option:
 # Sets if the title should use the fully qualified domain name.
@@ -193,6 +206,7 @@
 #--cpu-usage-key CPU Usage
 #--gpu-key GPU {1}
 #--memory-key Memory
+#--swap-key Swap
 #--disk-key Disk ({1})
 #--battery-key Battery {1}
 #--locale-key Locale
@@ -231,6 +245,7 @@
 #--cpu-usage-format
 #--gpu-format
 #--memory-format
+#--swap-format
 #--disk-format
 #--battery-format
 #--locale-format
@@ -269,6 +284,7 @@
 #--cpu-usage-error
 #--gpu-error
 #--memory-error
+#--swap-error
 #--disk-error
 #--battery-error
 #--locale-error
@@ -303,4 +319,4 @@
 #--lib-egl /usr/lib/libEGL.so
 #--lib-glx /usr/lib/libGLX.so
 #--lib-osmesa /usr/lib/libOSMesa.so
-#--lib-opencl /usr/lib/libOpenCL.so
+#--lib-opencl /usr/lib/libOpenCL.so
@@ -40,12 +40,16 @@ Logo options:

 Display options:
    -s,--structure <structure>:  sets the structure of the fetch. Must be a colon separated list of keys. Use "fastfetch --list-modules" to see the ones available.
-    -c,--color <color>:          sets the color of the keys. Must be a linux console color code or the name of a color (+)
+    --color-keys <color>:        sers the color of the keys
+    --color-title <color>:       sets the color of the title
+    -c,--color <color>:          sets the color of both the keys and the title
    --separator <str>:           sets the separator between key and value. Default is a colon with a space
    --set <key=value>:           hard set the value of a key
+    --set-keyless <key=value>:   hard set the value of a key, but don't print the key or the separator
    --show-errors <?value>:      print occuring errors
    --disable-linewrap <?value>: weather to disable linewrap during the run
    --hide-cursor <?value>:      weather to hide the cursor during the run
+    --binary-prefix <value>:     sets the binary prefix to used. Must be IEC, SI or JEDEC. Default is IEC

 General module options:
    --<module>-format <format>: Sets the format string to use for each specific module.
@@ -15,6 +15,7 @@ Icons
 Kernel
 Locale
 LocalIP
+Media
 Memory
 OS
 OpenCL
@@ -26,7 +27,7 @@ PublicIP
 Resolution
 Separator
 Shell
-Song
+Swap
 Terminal
 TerminalFont
 Theme
@@ -0,0 +1,22 @@
+#include "cpu.h"
+#include "detection/internal.h"
+
+void ffDetectCPUImpl(FFCPUResult* cpu);
+
+const FFCPUResult* ffDetectCPU()
+{
+    FF_DETECTION_INTERNAL_GUARD(FFCPUResult,
+        ffDetectCPUImpl(&result);
+
+        const char* removeStrings[] = {
+            "(R)", "(r)", "(TM)", "(tm)",
+            " CPU", " FPU", " APU", " Processor",
+            " Dual-Core", " Quad-Core", " Six-Core", " Eight-Core", " Ten-Core",
+            " 2-Core", " 4-Core", " 6-Core", " 8-Core", " 10-Core", " 12-Core", " 14-Core", " 16-Core",
+            " with Radeon Graphics"
+        };
+        ffStrbufRemoveStringsA(&result.name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
+        ffStrbufSubstrBeforeFirstC(&result.name, '@'); //Cut the speed output in the name as we append our own
+        ffStrbufTrimRight(&result.name, ' '); //If we removed the @ in previous step there was most likely a space before it
+    );
+}
@@ -0,0 +1,27 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_cpu_cpu
+#define FF_INCLUDED_detection_cpu_cpu
+
+#include "fastfetch.h"
+
+#define FF_CPU_TEMP_UNSET (0/0.0)
+
+typedef struct FFCPUResult
+{
+    FFstrbuf name;
+    FFstrbuf vendor;
+
+    uint16_t coresPhysical;
+    uint16_t coresLogical;
+    uint16_t coresOnline;
+
+    double frequencyMin;
+    double frequencyMax;
+
+    double temperature;
+} FFCPUResult;
+
+const FFCPUResult* ffDetectCPU();
+
+#endif
@@ -0,0 +1,42 @@
+#include "cpu.h"
+#include "common/settings.h"
+
+static double getFrequency(const char* propName)
+{
+    double herz = (double) ffSettingsGetAppleInt64(propName, 0);
+    if(herz <= 0.0)
+        return herz;
+
+    herz /= 1000.0; //to KHz
+    herz /= 1000.0; //to MHz
+    return herz / 1000.0; //to GHz
+}
+
+void ffDetectCPUImpl(FFCPUResult* cpu)
+{
+    ffStrbufInit(&cpu->name);
+    ffSettingsGetAppleProperty("machdep.cpu.brand_string", &cpu->name);
+
+    ffStrbufInit(&cpu->vendor);
+    ffSettingsGetAppleProperty("machdep.cpu.vendor", &cpu->vendor);
+
+    cpu->coresPhysical = (uint16_t) ffSettingsGetAppleInt("hw.physicalcpu_max", 1);
+    if(cpu->coresPhysical == 1)
+        cpu->coresPhysical = (uint16_t) ffSettingsGetAppleInt("hw.physicalcpu", 1);
+
+    cpu->coresLogical = (uint16_t) ffSettingsGetAppleInt("hw.logicalcpu_max", 1);
+    if(cpu->coresLogical == 1)
+        cpu->coresLogical = (uint16_t) ffSettingsGetAppleInt("hw.ncpu", 1);
+
+    cpu->coresOnline = (uint16_t) ffSettingsGetAppleInt("hw.logicalcpu", 1);
+    if(cpu->coresOnline == 1)
+        cpu->coresOnline = (uint16_t) ffSettingsGetAppleInt("hw.activecpu", 1);
+
+    cpu->frequencyMin = getFrequency("hw.cpufrequency_min");
+    cpu->frequencyMax = getFrequency("hw.cpufrequency_max");
+    if(cpu->frequencyMax == 0.0)
+        cpu->frequencyMax = getFrequency("hw.cpufrequency");
+
+    //TODO find a way to detect this
+    cpu->temperature = FF_CPU_TEMP_UNSET;
+}
@@ -0,0 +1,102 @@
+#include "cpu.h"
+#include "common/io.h"
+#include "common/properties.h"
+#include "detection/temps.h"
+
+#include <stdlib.h>
+#include <unistd.h>
+
+static void parseCpuInfo(FFCPUResult* cpu, FFstrbuf* physicalCoresBuffer)
+{
+    FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
+    if(cpuinfo == NULL)
+        return;
+
+    char* line = NULL;
+    size_t len = 0;
+
+    while(getline(&line, &len, cpuinfo) != -1)
+    {
+        //Stop after the first CPU
+        if(cpu->name.length > 0 && (*line == '\0' || *line == '\n'))
+            break;
+
+        (void)(
+            ffParsePropLine(line, "model name :", &cpu->name) ||
+            ffParsePropLine(line, "vendor_id :", &cpu->vendor) ||
+            ffParsePropLine(line, "cpu cores :", physicalCoresBuffer) ||
+            (cpu->name.length == 0 && ffParsePropLine(line, "Hardware :", &cpu->name)) //For Android devices
+        );
+    }
+
+    if(line != NULL)
+        free(line);
+
+    fclose(cpuinfo);
+}
+
+static double getGHz(const char* file)
+{
+    FFstrbuf content;
+    ffStrbufInit(&content);
+    ffReadFileBuffer(file, &content);
+    double herz = ffStrbufToDouble(&content);
+    ffStrbufDestroy(&content);
+
+    //ffStrbufToDouble failed
+    if(herz != herz)
+        return 0;
+
+    herz /= 1000.0; //to MHz
+    return herz / 1000.0; //to GHz
+}
+
+static double getFrequency(const char* info, const char* scaling)
+{
+    double frequency = getGHz(info);
+    if(frequency > 0.0)
+        return frequency;
+
+    return getGHz(scaling);
+}
+
+static double detectCPUTemp()
+{
+    const FFTempsResult *temps = ffDetectTemps();
+
+    for(uint32_t i = 0; i < temps->values.length; i++)
+    {
+        FFTempValue* value = ffListGet(&temps->values, i);
+
+        if(
+            ffStrbufFirstIndexS(&value->name, "cpu") < value->name.length ||
+            ffStrbufCompS(&value->name, "k10temp") == 0 ||
+            ffStrbufCompS(&value->name, "coretemp") == 0
+        ) return value->value;
+    }
+
+    return FF_CPU_TEMP_UNSET;
+}
+
+void ffDetectCPUImpl(FFCPUResult* cpu)
+{
+    ffStrbufInit(&cpu->name);
+    ffStrbufInit(&cpu->vendor);
+
+    FFstrbuf physicalCoresBuffer;
+    ffStrbufInit(&physicalCoresBuffer);
+
+    parseCpuInfo(cpu, &physicalCoresBuffer);
+
+    cpu->coresPhysical = ffStrbufToUInt16(&physicalCoresBuffer, 1);
+    cpu->coresLogical = (uint16_t) get_nprocs_conf();
+    cpu->coresOnline = (uint16_t) get_nprocs();
+
+    #define BP "/sys/devices/system/cpu/cpufreq/policy0/"
+    cpu->frequencyMin = getFrequency(BP"cpuinfo_min_freq", BP"scaling_min_freq");
+    cpu->frequencyMax = getFrequency(BP"cpuinfo_max_freq", BP"scaling_max_freq");
+
+    cpu->temperature = detectCPUTemp();
+
+    ffStrbufDestroy(&physicalCoresBuffer);
+}
@@ -1,133 +0,0 @@
-#include "displayServer.h"
-
-#include <pthread.h>
-#include <dirent.h>
-
-uint32_t ffdsParseRefreshRate(int32_t refreshRate)
-{
-    if(refreshRate <= 0)
-        return 0;
-
-    int remainder = refreshRate % 5;
-    if(remainder >= 3)
-        refreshRate += (5 - remainder);
-    else
-        refreshRate -= remainder;
-
-    //All other typicall refresh rates are dividable by 5
-    if(refreshRate == 145)
-        refreshRate = 144;
-
-    return (uint32_t) refreshRate;
-}
-
-bool ffdsAppendResolution(FFDisplayServerResult* result, uint32_t width, uint32_t height, uint32_t refreshRate)
-{
-    if(width == 0 || height == 0)
-        return false;
-
-    FFResolutionResult* resolution = ffListAdd(&result->resolutions);
-    resolution->width = width;
-    resolution->height = height;
-    resolution->refreshRate = refreshRate;
-
-    return true;
-}
-
-static void parseDRM(FFDisplayServerResult* result)
-{
-    const char* drmDirPath = "/sys/class/drm/";
-
-    DIR* dirp = opendir(drmDirPath);
-    if(dirp == NULL)
-        return;
-
-    FFstrbuf drmDir;
-    ffStrbufInitA(&drmDir, 64);
-    ffStrbufAppendS(&drmDir, drmDirPath);
-
-    uint32_t drmDirLength = drmDir.length;
-
-    struct dirent* entry;
-    while((entry = readdir(dirp)) != NULL)
-    {
-        ffStrbufAppendS(&drmDir, entry->d_name);
-        ffStrbufAppendS(&drmDir, "/modes");
-
-        FILE* modeFile = fopen(drmDir.chars, "r");
-        if(modeFile == NULL)
-        {
-            ffStrbufSubstrBefore(&drmDir, drmDirLength);
-            continue;
-        }
-
-        FFResolutionResult* resolution = ffListAdd(&result->resolutions);
-        resolution->width = 0;
-        resolution->height = 0;
-        resolution->refreshRate = 0;
-
-        int scanned = fscanf(modeFile, "%ix%i", &resolution->width, &resolution->height);
-        if(scanned < 2 || resolution->width == 0 || resolution->height == 0)
-            --result->resolutions.length;
-
-        fclose(modeFile);
-        ffStrbufSubstrBefore(&drmDir, drmDirLength);
-    }
-
-    closedir(dirp);
-    ffStrbufDestroy(&drmDir);
-}
-
-const FFDisplayServerResult* ffConnectDisplayServer(const FFinstance* instance)
-{
-    static FFDisplayServerResult result;
-
-    static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-    static bool init = false;
-    pthread_mutex_lock(&mutex);
-    if(init)
-    {
-        pthread_mutex_unlock(&mutex);
-        return &result;
-    }
-    init = true;
-
-    ffStrbufInit(&result.wmProcessName);
-    ffStrbufInit(&result.wmPrettyName);
-    ffStrbufInit(&result.wmProtocolName);
-    ffStrbufInit(&result.deProcessName);
-    ffStrbufInit(&result.dePrettyName);
-    ffStrbufInit(&result.deVersion);
-    ffListInitA(&result.resolutions, sizeof(FFResolutionResult), 4);
-
-    //We try wayland as our prefered display server, as it supports the most features.
-    //This method can't detect the name of our WM / DE
-    ffdsConnectWayland(instance, &result);
-
-    //Try the x11 libs, from most feature rich to least.
-    //We use the resolution list to detect if a connection is needed.
-    //They respect wmProtocolName, and only detect resolution if it is set.
-
-    if(result.resolutions.length == 0)
-        ffdsConnectXcbRandr(instance, &result);
-
-    if(result.resolutions.length == 0)
-        ffdsConnectXrandr(instance, &result);
-
-    if(result.resolutions.length == 0)
-        ffdsConnectXcb(instance, &result);
-
-    if(result.resolutions.length == 0)
-        ffdsConnectXlib(instance, &result);
-
-    //This resolution detection method is display server independent.
-    //Use it if all connections failed
-    if(result.resolutions.length == 0)
-        parseDRM(&result);
-
-    //This fills in missing information about WM / DE by using env vars and iterating processes
-    ffdsDetectWMDE(instance, &result);
-
-    pthread_mutex_unlock(&mutex);
-    return &result;
-}
@@ -0,0 +1,42 @@
+#include "displayserver.h"
+#include "detection/internal.h"
+
+uint32_t ffdsParseRefreshRate(int32_t refreshRate)
+{
+    if(refreshRate <= 0)
+        return 0;
+
+    int remainder = refreshRate % 5;
+    if(remainder >= 3)
+        refreshRate += (5 - remainder);
+    else
+        refreshRate -= remainder;
+
+    //All other typicall refresh rates are dividable by 5
+    if(refreshRate == 145)
+        refreshRate = 144;
+
+    return (uint32_t) refreshRate;
+}
+
+bool ffdsAppendResolution(FFDisplayServerResult* result, uint32_t width, uint32_t height, uint32_t refreshRate)
+{
+    if(width == 0 || height == 0)
+        return false;
+
+    FFResolutionResult* resolution = ffListAdd(&result->resolutions);
+    resolution->width = width;
+    resolution->height = height;
+    resolution->refreshRate = refreshRate;
+
+    return true;
+}
+
+void ffConnectDisplayServerImpl(FFDisplayServerResult* ds, const FFinstance* instance);
+
+const FFDisplayServerResult* ffConnectDisplayServer(const FFinstance* instance)
+{
+    FF_DETECTION_INTERNAL_GUARD(FFDisplayServerResult,
+        ffConnectDisplayServerImpl(&result, instance);
+    );
+}
@@ -25,5 +25,8 @@ typedef struct FFDisplayServerResult

 const FFDisplayServerResult* ffConnectDisplayServer(const FFinstance* instance);

-#endif
+//Used internal
+uint32_t ffdsParseRefreshRate(int32_t refreshRate);
+bool ffdsAppendResolution(FFDisplayServerResult* result, uint32_t width, uint32_t height, uint32_t refreshRate);

+#endif
@@ -0,0 +1,14 @@
+#include "displayserver.h"
+
+void ffConnectDisplayServerImpl(FFDisplayServerResult* ds, const FFinstance* instance)
+{
+    FF_UNUSED(instance);
+
+    ffStrbufInitA(&ds->wmProcessName, 0);
+    ffStrbufInitA(&ds->wmPrettyName, 0);
+    ffStrbufInitA(&ds->wmProtocolName, 0);
+    ffStrbufInitA(&ds->deProcessName, 0);
+    ffStrbufInitA(&ds->dePrettyName, 0);
+    ffStrbufInitA(&ds->deVersion, 0);
+    ffListInitA(&ds->resolutions, sizeof(FFResolutionResult), 0);
+}
@@ -0,0 +1,120 @@
+#include "displayserver.h"
+#include "common/library.h"
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <sys/sysctl.h>
+#include <ApplicationServices/ApplicationServices.h>
+
+//Resolution code heavily inspired by displayplacer <3
+
+typedef union
+{
+    uint8_t rawData[0xDC];
+    struct
+    {
+        uint32_t mode;
+        uint32_t flags;		// 0x4
+        uint32_t width;		// 0x8
+        uint32_t height;	// 0xC
+        uint32_t depth;		// 0x10
+        uint32_t dc2[42];
+        uint16_t dc3;
+        uint16_t freq;		// 0xBC
+        uint32_t dc4[4];
+        float density;		// 0xD0
+    } derived;
+} modes_D4;
+
+void CGSGetCurrentDisplayMode(CGDirectDisplayID display, int* modeNum);
+void CGSGetDisplayModeDescriptionOfLength(CGDirectDisplayID display, int idx, modes_D4* mode, int length);
+
+static void detectResolution(FFDisplayServerResult* ds)
+{
+    CGDisplayCount screenCount;
+    CGGetOnlineDisplayList(INT_MAX, NULL, &screenCount);
+    if(screenCount == 0)
+        return;
+
+    CGDirectDisplayID* screens = malloc(screenCount * sizeof(CGDirectDisplayID));
+    CGGetOnlineDisplayList(INT_MAX, screens, &screenCount);
+
+    for(uint32_t i = 0; i < screenCount; i++)
+    {
+        int modeID;
+        CGSGetCurrentDisplayMode(screens[i], &modeID);
+        modes_D4 mode;
+        CGSGetDisplayModeDescriptionOfLength(screens[i], modeID, &mode, 0xD4);
+
+        uint32_t refreshRate = ffdsParseRefreshRate(mode.derived.freq);
+        ffdsAppendResolution(ds, mode.derived.width, mode.derived.height, refreshRate);
+    }
+
+    free(screens);
+}
+
+static void detectWM(FFDisplayServerResult* ds)
+{
+    int request[] = {CTL_KERN, KERN_PROC, KERN_PROC_ALL};
+    u_int requestLength = sizeof(request) / sizeof(*request);
+
+    size_t length = 0;
+    if(sysctl(request, requestLength, NULL, &length, NULL, 0) != 0)
+        return;
+
+    struct kinfo_proc* processes = malloc(length);
+    if(processes == NULL)
+        return;
+
+    if(sysctl(request, requestLength, processes, &length, NULL, 0) != 0)
+    {
+        free(processes);
+        return;
+    }
+
+    for(size_t i = 0; i < length / sizeof(struct kinfo_proc); i++)
+    {
+        const char* comm = processes[i].kp_proc.p_comm;
+
+        if(
+            strcasecmp(comm, "spectacle") != 0 &&
+            strcasecmp(comm, "amethyst") != 0 &&
+            strcasecmp(comm, "kwm") != 0 &&
+            strcasecmp(comm, "chunkwm") != 0 &&
+            strcasecmp(comm, "yabai") != 0 &&
+            strcasecmp(comm, "rectangle") != 0
+        ) continue;
+
+        ffStrbufAppendS(&ds->wmProcessName, comm);
+        ffStrbufAppendS(&ds->wmPrettyName, comm);
+        ds->wmPrettyName.chars[0] = (char) toupper(ds->wmPrettyName.chars[0]);
+        break;
+    }
+
+    free(processes);
+}
+
+void ffConnectDisplayServerImpl(FFDisplayServerResult* ds, const FFinstance* instance)
+{
+    FF_UNUSED(instance);
+
+    ffStrbufInit(&ds->wmProcessName);
+    ffStrbufInit(&ds->wmPrettyName);
+    ffStrbufInitA(&ds->wmProtocolName, 0);
+    detectWM(ds);
+    if(ds->wmProcessName.length == 0)
+    {
+        ffStrbufAppendS(&ds->wmProcessName, "quartz");
+        ffStrbufAppendS(&ds->wmPrettyName, "Quartz Compositor");
+    }
+
+    ffStrbufInit(&ds->deProcessName);
+    ffStrbufInit(&ds->dePrettyName);
+    ffStrbufInitA(&ds->deVersion, 0);
+    ffStrbufAppendS(&ds->deProcessName, "aqua");
+    ffStrbufAppendS(&ds->dePrettyName, "Aqua");
+
+    ffListInitA(&ds->resolutions, sizeof(FFResolutionResult), 4);
+    detectResolution(ds);
+}
@@ -0,0 +1,86 @@
+#include "displayserver_linux.h"
+
+#include <dirent.h>
+
+static void parseDRM(FFDisplayServerResult* result)
+{
+    const char* drmDirPath = "/sys/class/drm/";
+
+    DIR* dirp = opendir(drmDirPath);
+    if(dirp == NULL)
+        return;
+
+    FFstrbuf drmDir;
+    ffStrbufInitA(&drmDir, 64);
+    ffStrbufAppendS(&drmDir, drmDirPath);
+
+    uint32_t drmDirLength = drmDir.length;
+
+    struct dirent* entry;
+    while((entry = readdir(dirp)) != NULL)
+    {
+        ffStrbufAppendS(&drmDir, entry->d_name);
+        ffStrbufAppendS(&drmDir, "/modes");
+
+        FILE* modeFile = fopen(drmDir.chars, "r");
+        if(modeFile == NULL)
+        {
+            ffStrbufSubstrBefore(&drmDir, drmDirLength);
+            continue;
+        }
+
+        FFResolutionResult* resolution = ffListAdd(&result->resolutions);
+        resolution->width = 0;
+        resolution->height = 0;
+        resolution->refreshRate = 0;
+
+        int scanned = fscanf(modeFile, "%ix%i", &resolution->width, &resolution->height);
+        if(scanned < 2 || resolution->width == 0 || resolution->height == 0)
+            --result->resolutions.length;
+
+        fclose(modeFile);
+        ffStrbufSubstrBefore(&drmDir, drmDirLength);
+    }
+
+    closedir(dirp);
+    ffStrbufDestroy(&drmDir);
+}
+
+void ffConnectDisplayServerImpl(FFDisplayServerResult* ds, const FFinstance* instance)
+{
+    ffStrbufInit(&ds->wmProcessName);
+    ffStrbufInit(&ds->wmPrettyName);
+    ffStrbufInit(&ds->wmProtocolName);
+    ffStrbufInit(&ds->deProcessName);
+    ffStrbufInit(&ds->dePrettyName);
+    ffStrbufInit(&ds->deVersion);
+    ffListInitA(&ds->resolutions, sizeof(FFResolutionResult), 4);
+
+    //We try wayland as our prefered display server, as it supports the most features.
+    //This method can't detect the name of our WM / DE
+    ffdsConnectWayland(instance, ds);
+
+    //Try the x11 libs, from most feature rich to least.
+    //We use the resolution list to detect if a connection is needed.
+    //They respect wmProtocolName, and only detect resolution if it is set.
+
+    if(ds->resolutions.length == 0)
+        ffdsConnectXcbRandr(instance, ds);
+
+    if(ds->resolutions.length == 0)
+        ffdsConnectXrandr(instance, ds);
+
+    if(ds->resolutions.length == 0)
+        ffdsConnectXcb(instance, ds);
+
+    if(ds->resolutions.length == 0)
+        ffdsConnectXlib(instance, ds);
+
+    //This resolution detection method is display server independent.
+    //Use it if all connections failed
+    if(ds->resolutions.length == 0)
+        parseDRM(ds);
+
+    //This fills in missing information about WM / DE by using env vars and iterating processes
+    ffdsDetectWMDE(instance, ds);
+}
@@ -3,16 +3,12 @@
 #ifndef FASTFETCH_INCLUDED_DISPLAYSERVER
 #define FASTFETCH_INCLUDED_DISPLAYSERVER

-#include "fastfetch.h"
-#include "detection/displayserver.h"
+#include "detection/displayserver/displayserver.h"

 #define FF_DISPLAYSERVER_PROTOCOL_WAYLAND "Wayland"
 #define FF_DISPLAYSERVER_PROTOCOL_X11 "X11"
 #define FF_DISPLAYSERVER_PROTOCOL_TTY "TTY"

-uint32_t ffdsParseRefreshRate(int32_t refreshRate);
-bool ffdsAppendResolution(FFDisplayServerResult* result, uint32_t width, uint32_t height, uint32_t refreshRate);
-
 void ffdsConnectWayland(const FFinstance* instance, FFDisplayServerResult* result);

 void ffdsConnectXcbRandr(const FFinstance* instance, FFDisplayServerResult* result);
@@ -1,6 +1,6 @@
 #define _GNU_SOURCE //required for struct ucred

-#include "displayServer.h"
+#include "displayserver_linux.h"

 #include <stdlib.h>
 #include <string.h>
@@ -108,9 +108,9 @@ bool detectWayland(const FFinstance* instance, FFDisplayServerResult* result)

    WaylandData data;

-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(wayland, data.ffwl_proxy_marshal_constructor_versioned, wl_proxy_marshal_constructor_versioned, false)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(wayland, data.ffwl_proxy_add_listener, wl_proxy_add_listener, false)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(wayland, data.ffwl_output_interface, wl_output_interface, false)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(wayland, data, wl_proxy_marshal_constructor_versioned, false)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(wayland, data, wl_proxy_add_listener, false)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(wayland, data, wl_output_interface, false)

    struct wl_display* display = ffwl_display_connect(NULL);
    if(display == NULL)
@@ -1,4 +1,4 @@
-#include "displayServer.h"
+#include "displayserver_linux.h"
 #include "common/io.h"
 #include "common/properties.h"
 #include "common/parsing.h"
@@ -1,4 +1,4 @@
-#include "displayServer.h"
+#include "displayserver_linux.h"

 #ifdef FF_HAVE_XCB
 #include "common/library.h"
@@ -18,12 +18,12 @@ typedef struct XcbPropertyData

 static bool xcbInitPropertyData(void* libraryHandle, XcbPropertyData* propertyData)
 {
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(libraryHandle, propertyData->ffxcb_intern_atom, xcb_intern_atom, false)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(libraryHandle, propertyData->ffxcb_intern_atom_reply, xcb_intern_atom_reply, false)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(libraryHandle, propertyData->ffxcb_get_property, xcb_get_property, false)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(libraryHandle, propertyData->ffxcb_get_property_reply, xcb_get_property_reply, false)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(libraryHandle, propertyData->ffxcb_get_property_value, xcb_get_property_value, false)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(libraryHandle, propertyData->ffxcb_get_property_value_length, xcb_get_property_value_length, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(libraryHandle, propertyData, xcb_intern_atom, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(libraryHandle, propertyData, xcb_intern_atom_reply, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(libraryHandle, propertyData, xcb_get_property, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(libraryHandle, propertyData, xcb_get_property_reply, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(libraryHandle, propertyData, xcb_get_property_value, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(libraryHandle, propertyData, xcb_get_property_value_length, false)

    return true;
 }
@@ -335,23 +335,23 @@ void ffdsConnectXcbRandr(const FFinstance* instance, FFDisplayServerResult* resu

    XcbRandrData data;

-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_screen_resources, xcb_randr_get_screen_resources,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_screen_resources_reply, xcb_randr_get_screen_resources_reply,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_screen_resources_modes_iterator, xcb_randr_get_screen_resources_modes_iterator,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_screen_info, xcb_randr_get_screen_info,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_screen_info_reply, xcb_randr_get_screen_info_reply,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_mode_info_next, xcb_randr_mode_info_next,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_monitors, xcb_randr_get_monitors,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_monitors_reply, xcb_randr_get_monitors_reply,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_monitors_monitors_iterator, xcb_randr_get_monitors_monitors_iterator,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_monitor_info_next, xcb_randr_monitor_info_next,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_monitor_info_outputs_length, xcb_randr_monitor_info_outputs_length,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_monitor_info_outputs, xcb_randr_monitor_info_outputs,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_output_next, xcb_randr_output_next,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_output_info, xcb_randr_get_output_info,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_output_info_reply, xcb_randr_get_output_info_reply,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_crtc_info, xcb_randr_get_crtc_info,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xcbRandr, data.ffxcb_randr_get_crtc_info_reply, xcb_randr_get_crtc_info_reply,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_screen_resources,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_screen_resources_reply,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_screen_resources_modes_iterator,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_screen_info,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_screen_info_reply,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_mode_info_next,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_monitors,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_monitors_reply,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_monitors_monitors_iterator,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_monitor_info_next,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_monitor_info_outputs_length,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_monitor_info_outputs,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_output_next,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_output_info,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_output_info_reply,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_crtc_info,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xcbRandr, data, xcb_randr_get_crtc_info_reply,)

    XcbPropertyData propertyData;
    bool propertyDataInitialized = xcbInitPropertyData(xcbRandr, &propertyData);
@@ -1,4 +1,4 @@
-#include "displayServer.h"
+#include "displayserver_linux.h"

 #ifdef FF_HAVE_X11
 #include "common/library.h"
@@ -13,8 +13,8 @@ typedef struct X11PropertyData

 static bool x11InitPropertyData(void* libraryHandle, X11PropertyData* propertyData)
 {
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(libraryHandle, propertyData->ffXInternAtom, XInternAtom, false)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(libraryHandle, propertyData->ffXGetWindowProperty, XGetWindowProperty, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(libraryHandle, propertyData, XInternAtom, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(libraryHandle, propertyData, XGetWindowProperty, false)

    return true;
 }
@@ -266,17 +266,17 @@ void ffdsConnectXrandr(const FFinstance* instance, FFDisplayServerResult* result

    XrandrData data;

-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRGetScreenInfo, XRRGetScreenInfo,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRConfigCurrentRate, XRRConfigCurrentRate,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRGetMonitors, XRRGetMonitors,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRGetScreenResources, XRRGetScreenResources,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRGetOutputInfo, XRRGetOutputInfo,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRGetCrtcInfo, XRRGetCrtcInfo,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRFreeCrtcInfo, XRRFreeCrtcInfo,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRFreeOutputInfo, XRRFreeOutputInfo,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRFreeScreenResources, XRRFreeScreenResources,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRFreeMonitors, XRRFreeMonitors,);
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(xrandr, data.ffXRRFreeScreenConfigInfo, XRRFreeScreenConfigInfo,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRGetScreenInfo,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRConfigCurrentRate,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRGetMonitors,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRGetScreenResources,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRGetOutputInfo,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRGetCrtcInfo,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRFreeCrtcInfo,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRFreeOutputInfo,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRFreeScreenResources,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRFreeMonitors,);
+    FF_LIBRARY_LOAD_SYMBOL_VAR(xrandr, data, XRRFreeScreenConfigInfo,);

    X11PropertyData propertyData;
    bool propertyDataInitialized = x11InitPropertyData(xrandr, &propertyData);
@@ -0,0 +1,19 @@
+#include "gpu.h"
+#include "detection/internal.h"
+#include "detection/vulkan.h"
+
+void ffDetectGPUImpl(FFlist* gpus, const FFinstance* instance);
+
+const FFlist* ffDetectGPU(const FFinstance* instance)
+{
+    FF_DETECTION_INTERNAL_GUARD(FFlist,
+        ffListInit(&result, sizeof(FFGPUResult));
+        ffDetectGPUImpl(&result, instance);
+
+        if(result.length == 0)
+        {
+            const FFVulkanResult* vulkan = ffDetectVulkan(instance);
+            result = vulkan->gpus;
+        }
+    );
+}
@@ -0,0 +1,20 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_gpu_gpu
+#define FF_INCLUDED_detection_gpu_gpu
+
+#include "fastfetch.h"
+
+#define FF_GPU_TEMP_UNSET (0/0.0)
+
+typedef struct FFGPUResult
+{
+    FFstrbuf vendor;
+    FFstrbuf name;
+    FFstrbuf driver;
+    double temperature;
+} FFGPUResult;
+
+const FFlist* ffDetectGPU(const FFinstance* instance);
+
+#endif
@@ -0,0 +1,6 @@
+#include "gpu.h"
+
+void ffDetectGPUImpl(FFlist* gpus, const FFinstance* instance)
+{
+    FF_UNUSED(gpus, instance);
+}
@@ -0,0 +1,68 @@
+#include "gpu.h"
+#include "common/library.h"
+#include "detection/cpu/cpu.h"
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <IOKit/graphics/IOGraphicsLib.h>
+
+void ffDetectGPUImpl(FFlist* gpus, const FFinstance* instance)
+{
+    FF_UNUSED(instance);
+
+    const FFCPUResult* cpu = ffDetectCPU();
+    if(ffStrbufStartsWithIgnCaseS(&cpu->name, "Apple M"))
+    {
+        FFGPUResult* gpu = ffListAdd(gpus);
+
+        ffStrbufInit(&gpu->vendor);
+        ffStrbufAppendS(&gpu->vendor, "Apple");
+
+        ffStrbufInit(&gpu->name);
+        ffStrbufAppendS(&gpu->name, cpu->name.chars + 6); //Cut "Apple "
+
+        ffStrbufInitA(&gpu->driver, 0);
+        gpu->temperature = FF_GPU_TEMP_UNSET;
+    }
+
+    CFMutableDictionaryRef matchDict = IOServiceMatching("IOPCIDevice");
+    io_iterator_t iterator;
+    if(IOServiceGetMatchingServices(0, matchDict, &iterator) != kIOReturnSuccess)
+        return;
+
+    io_registry_entry_t registryEntry;
+    while((registryEntry = IOIteratorNext(iterator)) != 0)
+    {
+        CFMutableDictionaryRef properties;
+        if(IORegistryEntryCreateCFProperties(registryEntry, &properties, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess)
+        {
+            IOObjectRelease(registryEntry);
+            continue;
+        }
+
+        CFStringRef key = CFStringCreateWithCStringNoCopy(NULL, "model", kCFStringEncodingASCII, kCFAllocatorNull);
+        CFStringRef model = CFDictionaryGetValue(properties, key);
+        if(model == NULL || CFGetTypeID(model) != CFDataGetTypeID())
+        {
+            CFRelease(properties);
+            IOObjectRelease(registryEntry);
+            continue;
+        }
+
+        FFGPUResult* gpu = ffListAdd(gpus);
+
+        uint32_t modelLength = (uint32_t) CFStringGetLength(model);
+        ffStrbufInitA(&gpu->name, modelLength + 1);
+        CFStringGetCString(model, gpu->name.chars, modelLength + 1, kCFStringEncodingASCII);
+        gpu->name.length = modelLength;
+        gpu->name.chars[gpu->name.length] = '\0';
+
+        ffStrbufInitA(&gpu->vendor, 0);
+        ffStrbufInitA(&gpu->driver, 0);
+        gpu->temperature = FF_GPU_TEMP_UNSET;
+
+        CFRelease(properties);
+        IOObjectRelease(registryEntry);
+    }
+
+    IOObjectRelease(iterator);
+}
@@ -0,0 +1,212 @@
+#include "gpu.h"
+#include "detection/vulkan.h"
+
+#define FF_GPU_VENDOR_NAME_AMD "AMD"
+#define FF_GPU_VENDOR_NAME_INTEL "Intel"
+#define FF_GPU_VENDOR_NAME_NVIDIA "NVIDIA"
+
+#ifdef FF_HAVE_LIBPCI
+#include "common/library.h"
+#include "common/properties.h"
+#include "common/parsing.h"
+#include "detection/temps.h"
+#include <string.h>
+#include <unistd.h>
+#include <pci/pci.h>
+
+typedef struct PCIData
+{
+    struct pci_access* access;
+    FF_LIBRARY_SYMBOL(pci_read_byte);
+    FF_LIBRARY_SYMBOL(pci_read_word);
+    FF_LIBRARY_SYMBOL(pci_lookup_name);
+    FF_LIBRARY_SYMBOL(pci_get_param);
+} PCIData;
+
+static bool pciIDsContains(u16 searched, const u16* ids)
+{
+    while(*ids != 0)
+    {
+        if(*ids == searched)
+            return true;
+        ids++;
+    }
+    return false;
+}
+
+static void pciDetectVendorName(FFGPUResult* gpu, PCIData* pci, struct pci_dev* device)
+{
+    if(pciIDsContains(device->vendor_id, (const u16[]) {0x1002, 0x1022, 0}))
+        ffStrbufAppendS(&gpu->vendor, FF_GPU_VENDOR_NAME_AMD);
+    else if(pciIDsContains(device->vendor_id, (const u16[]) {0x03e7, 0x8086, 0x8087, 0}))
+        ffStrbufAppendS(&gpu->vendor, FF_GPU_VENDOR_NAME_INTEL);
+    else if(pciIDsContains(device->vendor_id, (const u16[]) {0x0955, 0x10de, 0x12d2, 0}))
+        ffStrbufAppendS(&gpu->vendor, FF_GPU_VENDOR_NAME_NVIDIA);
+
+    if(gpu->vendor.length > 0)
+        return;
+
+    ffStrbufEnsureFree(&gpu->vendor, 255);
+    pci->ffpci_lookup_name(pci->access, gpu->vendor.chars, (int) gpu->vendor.allocated, PCI_LOOKUP_VENDOR, device->vendor_id);
+    ffStrbufRecalculateLength(&gpu->vendor);
+
+    if(ffStrbufFirstIndexS(&gpu->vendor, "AMD") < gpu->vendor.length || ffStrbufFirstIndexS(&gpu->vendor, "ATI") < gpu->vendor.length)
+        ffStrbufSetS(&gpu->vendor, FF_GPU_VENDOR_NAME_AMD);
+    else if(ffStrbufFirstIndexS(&gpu->vendor, "Intel") < gpu->vendor.length)
+        ffStrbufSetS(&gpu->vendor, FF_GPU_VENDOR_NAME_INTEL);
+    else if(ffStrbufFirstIndexS(&gpu->vendor, "NVIDIA") < gpu->vendor.length)
+        ffStrbufSetS(&gpu->vendor, FF_GPU_VENDOR_NAME_NVIDIA);
+}
+
+static void drmDetectDeviceName(FFGPUResult* gpu, PCIData* pci, struct pci_dev* device)
+{
+    FFstrbuf query;
+    ffStrbufInit(&query);
+    ffStrbufAppendF(&query, "%X, %X,", device->device_id, pci->ffpci_read_byte(device, PCI_REVISION_ID));
+
+    ffParsePropFile(FASTFETCH_TARGET_DIR_USR"/share/libdrm/amdgpu.ids", query.chars, &gpu->name);
+
+    ffStrbufDestroy(&query);
+
+    const char* removeStrings[] = {
+        "AMD ", "ATI ",
+        " (TM)", "(TM)",
+        " Graphics Adapter", " Graphics", " Series", " Edition"
+    };
+    ffStrbufRemoveStringsA(&gpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
+}
+
+static void pciDetectDeviceName(FFGPUResult* gpu, PCIData* pci, struct pci_dev* device)
+{
+    if(ffStrbufCompS(&gpu->vendor, FF_GPU_VENDOR_NAME_AMD) == 0)
+    {
+        drmDetectDeviceName(gpu, pci, device);
+        if(gpu->name.length > 0)
+            return;
+    }
+
+    ffStrbufEnsureFree(&gpu->name, 255);
+    pci->ffpci_lookup_name(pci->access, gpu->name.chars, (int) gpu->name.allocated, PCI_LOOKUP_DEVICE, device->vendor_id, device->device_id);
+    ffStrbufRecalculateLength(&gpu->name);
+
+    uint32_t openingBracket = ffStrbufFirstIndexC(&gpu->name, '[');
+    uint32_t closingBracket = ffStrbufNextIndexC(&gpu->name, openingBracket, ']');
+    if(closingBracket < gpu->name.length)
+    {
+        ffStrbufSubstrBefore(&gpu->name, closingBracket);
+        ffStrbufSubstrAfter(&gpu->name, openingBracket);
+    }
+}
+
+static void pciDetectDriverName(FFGPUResult* gpu, PCIData* pci, struct pci_dev* device)
+{
+    const char* base = pci->ffpci_get_param(pci->access, "sysfs.path");
+    if(!ffStrSet(base))
+        return;
+
+    FFstrbuf path;
+    ffStrbufInitA(&path, 64);
+    ffStrbufAppendF(&path, "%s/devices/%04x:%02x:%02x.%d/driver", base, device->domain, device->bus, device->dev, device->func);
+
+    ffStrbufEnsureFree(&gpu->driver, 1023);
+    ssize_t resultLength = readlink(path.chars, gpu->driver.chars, gpu->driver.allocated - 1); //-1 for null terminator
+    if(resultLength > 0)
+    {
+        gpu->driver.length = (uint32_t) resultLength;
+        gpu->driver.chars[resultLength] = '\0';
+        ffStrbufSubstrAfterLastC(&gpu->driver, '/');
+    }
+
+    ffStrbufDestroy(&path);
+}
+
+static void pciDetectTemperatur(FFGPUResult* gpu, struct pci_dev* device)
+{
+    const FFTempsResult* tempsResult = ffDetectTemps();
+
+    for(uint32_t i = 0; i < tempsResult->values.length; i++)
+    {
+        FFTempValue* tempValue = ffListGet(&tempsResult->values, i);
+
+        uint32_t tempClass;
+        if(sscanf(tempValue->deviceClass.chars, "%x", &tempClass) != 1)
+            continue;
+
+        //The kernel exposes the device class multiplied by 256 for some reason
+        if(tempClass == device->device_class * 256)
+        {
+            gpu->temperature = tempValue->value;
+            return;
+        }
+    }
+}
+
+static void pciHandleDevice(FFlist* results, PCIData* pci, struct pci_dev* device)
+{
+    device->device_class = pci->ffpci_read_word(device, PCI_CLASS_DEVICE);
+
+    char class[1024];
+    pci->ffpci_lookup_name(pci->access, class, sizeof(class) - 1, PCI_LOOKUP_CLASS, device->device_class);
+
+    if(
+        strcasecmp("VGA compatible controller", class) != 0 &&
+        strcasecmp("3D controller", class)             != 0 &&
+        strcasecmp("Display controller", class)        != 0
+    ) return;
+
+    device->vendor_id = pci->ffpci_read_word(device, PCI_VENDOR_ID);
+    device->device_id = pci->ffpci_read_word(device, PCI_DEVICE_ID);
+
+    FFGPUResult* gpu = ffListAdd(results);
+
+    ffStrbufInit(&gpu->vendor);
+    pciDetectVendorName(gpu, pci, device);
+
+    ffStrbufInit(&gpu->name);
+    pciDetectDeviceName(gpu, pci, device);
+
+    ffStrbufInit(&gpu->driver);
+    pciDetectDriverName(gpu, pci, device);
+
+    gpu->temperature = FF_GPU_TEMP_UNSET;
+    pciDetectTemperatur(gpu, device);
+}
+
+static void pciDetectGPUs(const FFinstance* instance, FFlist* gpus)
+{
+    PCIData pci;
+
+    FF_LIBRARY_LOAD(libpci, instance->config.libPCI, , "libpci.so", 4)
+    FF_LIBRARY_LOAD_SYMBOL(libpci, pci_alloc, )
+    FF_LIBRARY_LOAD_SYMBOL(libpci, pci_init, )
+    FF_LIBRARY_LOAD_SYMBOL(libpci, pci_scan_bus, )
+    FF_LIBRARY_LOAD_SYMBOL(libpci, pci_cleanup, )
+
+    FF_LIBRARY_LOAD_SYMBOL_VAR(libpci, pci, pci_read_byte, )
+    FF_LIBRARY_LOAD_SYMBOL_VAR(libpci, pci, pci_read_word, )
+    FF_LIBRARY_LOAD_SYMBOL_VAR(libpci, pci, pci_lookup_name, )
+    FF_LIBRARY_LOAD_SYMBOL_VAR(libpci, pci, pci_get_param, )
+
+    pci.access = ffpci_alloc();
+    ffpci_init(pci.access);
+    ffpci_scan_bus(pci.access);
+
+    struct pci_dev* device = pci.access->devices;
+    while(device != NULL)
+    {
+        pciHandleDevice(gpus, &pci, device);
+        device = device->next;
+    }
+
+    ffpci_cleanup(pci.access);
+    dlclose(libpci);
+}
+
+#endif
+
+void ffDetectGPUImpl(FFlist* gpus, const FFinstance* instance)
+{
+    #ifdef FF_HAVE_LIBPCI
+        pciDetectGPUs(instance, gpus);
+    #endif
+}
@@ -2,7 +2,7 @@
 #include "detection/gtk.h"
 #include "common/properties.h"
 #include "common/settings.h"
-#include "detection/displayserver.h"
+#include "detection/displayserver/displayserver.h"

 #include <pthread.h>

@@ -107,11 +107,6 @@ static void detectGTKFromConfigFile(const char* filename, FFGTKResult* result)

 static void detectGTKFromConfigDir(FFstrbuf* configDir, const char* version, FFGTKResult* result)
 {
-    //In case of an empty env variable
-    ffStrbufTrim(configDir, ' ');
-    if(configDir->length == 0)
-        return;
-
    uint32_t configDirLength = configDir->length;

    // <configdir>/gtk-<version>.0/settings.ini
@@ -0,0 +1,11 @@
+#include "host.h"
+#include "detection/internal.h"
+
+void ffDetectHostImpl(FFHostResult* host);
+
+const FFHostResult* ffDetectHost()
+{
+    FF_DETECTION_INTERNAL_GUARD(FFHostResult,
+        ffDetectHostImpl(&result)
+    );
+}
@@ -0,0 +1,31 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_host_host
+#define FF_INCLUDED_detection_host_host
+
+#include "fastfetch.h"
+
+#define FF_HOST_PRODUCT_NAME_WSL "Windows Subsystem for Linux"
+
+typedef struct FFHostResult
+{
+    FFstrbuf productFamily;
+    FFstrbuf productName;
+    FFstrbuf productVersion;
+    FFstrbuf productSku;
+    FFstrbuf biosDate;
+    FFstrbuf biosRelease;
+    FFstrbuf biosVendor;
+    FFstrbuf biosVersion;
+    FFstrbuf boardName;
+    FFstrbuf boardVendor;
+    FFstrbuf boardVersion;
+    FFstrbuf chassisType;
+    FFstrbuf chassisVendor;
+    FFstrbuf chassisVersion;
+    FFstrbuf sysVendor;
+} FFHostResult;
+
+const FFHostResult* ffDetectHost();
+
+#endif
@@ -0,0 +1,45 @@
+#include "host.h"
+#include "common/settings.h"
+#include <ctype.h>
+
+void ffDetectHostImpl(FFHostResult* host)
+{
+    //Family
+
+    ffStrbufInit(&host->productFamily);
+    ffSettingsGetAndroidProperty("ro.product.device", &host->productFamily);
+
+    //Name
+
+    ffStrbufInit(&host->productName);
+
+    ffSettingsGetAndroidProperty("ro.product.brand", &host->productName);
+    if(host->productName.length > 0){
+        host->productName.chars[0] = (char) toupper(host->productName.chars[0]);
+        ffStrbufAppendC(&host->productName, ' ');
+    }
+
+    ffSettingsGetAndroidProperty("ro.product.model", &host->productName);
+
+    ffStrbufTrimRight(&host->productName, ' ');
+
+    //Sys vendor
+
+    ffStrbufInit(&host->sysVendor);
+    ffSettingsGetAndroidProperty("ro.product.manufacturer", &host->sysVendor);
+
+    //Not implemented
+
+    ffStrbufInitA(&host->productVersion, 0);
+    ffStrbufInitA(&host->productSku, 0);
+    ffStrbufInitA(&host->biosDate, 0);
+    ffStrbufInitA(&host->biosRelease, 0);
+    ffStrbufInitA(&host->biosVendor, 0);
+    ffStrbufInitA(&host->biosVersion, 0);
+    ffStrbufInitA(&host->boardName, 0);
+    ffStrbufInitA(&host->boardVendor, 0);
+    ffStrbufInitA(&host->boardVersion, 0);
+    ffStrbufInitA(&host->chassisType, 0);
+    ffStrbufInitA(&host->chassisVendor, 0);
+    ffStrbufInitA(&host->chassisVersion, 0);
+}
@@ -0,0 +1,24 @@
+#include "host.h"
+#include "common/settings.h"
+
+void ffDetectHostImpl(FFHostResult* host)
+{
+    ffStrbufInit(&host->productName);
+
+    ffStrbufInitA(&host->productFamily, 0);
+    ffStrbufInitA(&host->sysVendor, 0);
+    ffStrbufInitA(&host->productVersion, 0);
+    ffStrbufInitA(&host->productSku, 0);
+    ffStrbufInitA(&host->biosDate, 0);
+    ffStrbufInitA(&host->biosRelease, 0);
+    ffStrbufInitA(&host->biosVendor, 0);
+    ffStrbufInitA(&host->biosVersion, 0);
+    ffStrbufInitA(&host->boardName, 0);
+    ffStrbufInitA(&host->boardVendor, 0);
+    ffStrbufInitA(&host->boardVersion, 0);
+    ffStrbufInitA(&host->chassisType, 0);
+    ffStrbufInitA(&host->chassisVendor, 0);
+    ffStrbufInitA(&host->chassisVersion, 0);
+
+    ffSettingsGetAppleProperty("hw.model", &host->productName);
+}
@@ -0,0 +1,118 @@
+#include "host.h"
+#include "common/io.h"
+
+#include <stdlib.h>
+
+static bool hostValueSet(FFstrbuf* value)
+{
+    return
+        value->length > 0 &&
+        ffStrbufStartsWithIgnCaseS(value, "To be filled") != true &&
+        ffStrbufStartsWithIgnCaseS(value, "To be set") != true &&
+        ffStrbufStartsWithIgnCaseS(value, "OEM") != true &&
+        ffStrbufStartsWithIgnCaseS(value, "O.E.M.") != true &&
+        ffStrbufIgnCaseCompS(value, "None") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Product") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Product Name") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Product Version") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Name") != 0 &&
+        ffStrbufIgnCaseCompS(value, "System Version") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Default string") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Undefined") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Not Specified") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Not Applicable") != 0 &&
+        ffStrbufIgnCaseCompS(value, "INVALID") != 0 &&
+        ffStrbufIgnCaseCompS(value, "Type1ProductConfigId") != 0 &&
+        ffStrbufIgnCaseCompS(value, "All Series") != 0
+    ;
+}
+
+static void getHostValue(const char* devicesPath, const char* classPath, FFstrbuf* buffer)
+{
+    ffReadFileBuffer(devicesPath, buffer);
+    if(hostValueSet(buffer))
+        return;
+
+    ffReadFileBuffer(classPath, buffer);
+    if(hostValueSet(buffer))
+        return;
+
+    ffStrbufClear(buffer);
+}
+
+static void getHostProductName(FFstrbuf* name)
+{
+    getHostValue("/sys/devices/virtual/dmi/id/product_name", "/sys/class/dmi/id/product_name", name);
+    if(name->length > 0)
+        return;
+
+    ffReadFileBuffer("/sys/firmware/devicetree/base/model", name);
+    if(hostValueSet(name))
+        return;
+
+    //does a clear before the read
+    ffReadFileBuffer("/tmp/sysinfo/model", name);
+    if(hostValueSet(name))
+        return;
+
+    ffStrbufClear(name);
+}
+
+void ffDetectHostImpl(FFHostResult* host)
+{
+    ffStrbufInit(&host->productFamily);
+    getHostValue("/sys/devices/virtual/dmi/id/product_family", "/sys/class/dmi/id/product_family", &host->productFamily);
+
+    ffStrbufInit(&host->productName);
+    getHostProductName(&host->productName);
+
+    ffStrbufInit(&host->productVersion);
+    getHostValue("/sys/devices/virtual/dmi/id/product_version", "/sys/class/dmi/id/product_version", &host->productVersion);
+
+    ffStrbufInit(&host->productSku);
+    getHostValue("/sys/devices/virtual/dmi/id/product_sku", "/sys/class/dmi/id/product_sku", &host->productSku);
+
+    ffStrbufInit(&host->biosDate);
+    getHostValue("/sys/devices/virtual/dmi/id/bios_date", "/sys/class/dmi/id/bios_date", &host->biosDate);
+
+    ffStrbufInit(&host->biosRelease);
+    getHostValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &host->biosRelease);
+
+    ffStrbufInit(&host->biosVendor);
+    getHostValue("/sys/devices/virtual/dmi/id/bios_vendor", "/sys/class/dmi/id/bios_vendor", &host->biosVendor);
+
+    ffStrbufInit(&host->biosVersion);
+    getHostValue("/sys/devices/virtual/dmi/id/bios_version", "/sys/class/dmi/id/bios_version", &host->biosVersion);
+
+    ffStrbufInit(&host->boardName);
+    getHostValue("/sys/devices/virtual/dmi/id/board_name", "/sys/class/dmi/id/board_name", &host->boardName);
+
+    ffStrbufInit(&host->boardVendor);
+    getHostValue("/sys/devices/virtual/dmi/id/board_vendor", "/sys/class/dmi/id/board_vendor", &host->boardVendor);
+
+    ffStrbufInit(&host->boardVersion);
+    getHostValue("/sys/devices/virtual/dmi/id/board_version", "/sys/class/dmi/id/board_version", &host->boardVersion);
+
+    ffStrbufInit(&host->chassisType);
+    getHostValue("/sys/devices/virtual/dmi/id/chassis_type", "/sys/class/dmi/id/chassis_type", &host->chassisType);
+
+    ffStrbufInit(&host->chassisVendor);
+    getHostValue("/sys/devices/virtual/dmi/id/chassis_vendor", "/sys/class/dmi/id/chassis_vendor", &host->chassisVendor);
+
+    ffStrbufInit(&host->chassisVersion);
+    getHostValue("/sys/devices/virtual/dmi/id/chassis_version", "/sys/class/dmi/id/chassis_version", &host->chassisVersion);
+
+    ffStrbufInit(&host->sysVendor);
+    getHostValue("/sys/devices/virtual/dmi/id/sys_vendor", "/sys/class/dmi/id/sys_vendor", &host->sysVendor);
+
+    //KVM/Qemu virtual machine
+    if(ffStrbufStartsWithS(&host->productName, "Standard PC"))
+        ffStrbufPrependS(&host->productName, "KVM/QEMU ");
+
+    //On WSL, the real host can't be detected. Instead use WSL as host.
+    if(host->productFamily.length == 0 && host->productName.length == 0 && (
+        getenv("WSLENV") != NULL ||
+        getenv("WSL_DISTRO") != NULL ||
+        getenv("WSL_INTEROP") != NULL
+    )) ffStrbufAppendS(&host->productName, FF_HOST_PRODUCT_NAME_WSL);
+}
@@ -0,0 +1,23 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_internal
+#define FF_INCLUDED_detection_internal
+
+#include "pthread.h"
+
+#define FF_DETECTION_INTERNAL_GUARD(ResultType, ...) \
+    static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; \
+    static ResultType result; \
+    static bool init = false; \
+    pthread_mutex_lock(&mutex); \
+    if(init) \
+    { \
+        pthread_mutex_unlock(&mutex); \
+        return &result; \
+    } \
+    init = true; \
+    __VA_ARGS__; \
+    pthread_mutex_unlock(&mutex); \
+    return &result; \
+
+#endif
@@ -203,7 +203,7 @@ static bool getBusProperties(const char* busName, FFMediaResult* result, DBusDat
        else if(strcmp(key, "xesam:url") == 0)
            getValue(&dictIterator, &result->url, data);

-        if(result->song.length > 0 && result->artist.length > 0 && result->album.length > 0)
+        if(result->song.length > 0 && result->artist.length > 0 && result->album.length > 0 && result->url.length > 0)
            break;

        FF_DBUS_ITER_CONTINUE(arrayIterator)
@@ -219,12 +219,15 @@ static bool getBusProperties(const char* busName, FFMediaResult* result, DBusDat
        return false;
    }

+    //Set short bus name
+    ffStrbufAppendS(&result->busNameShort, busName + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
+
    //We found a song, get the player name
-
    getPropertyString(busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "Identity", &result->player, data);
-
    if(result->player.length == 0)
        getPropertyString(busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "DesktopEntry", &result->player, data);
+    if(result->player.length == 0)
+        ffStrbufAppend(&result->player, &result->busNameShort);

    return true;
 }
@@ -233,13 +236,10 @@ static void getCustomBus(FFinstance* instance, FFMediaResult* result, DBusData*
 {
    if(ffStrbufStartsWithS(&instance->config.playerName, FF_DBUS_MPRIS_PREFIX))
    {
-        ffStrbufAppendS(&result->busNameShort, instance->config.playerName.chars + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
        getBusProperties(instance->config.playerName.chars, result, data);
        return;
    }

-    ffStrbufAppend(&result->busNameShort, &instance->config.playerName);
-
    FFstrbuf busName;
    ffStrbufInit(&busName);
    ffStrbufAppendS(&busName, FF_DBUS_MPRIS_PREFIX);
@@ -250,6 +250,12 @@ static void getCustomBus(FFinstance* instance, FFMediaResult* result, DBusData*

 static void getBestBus(FFMediaResult* result, DBusData* data)
 {
+    if(
+        getBusProperties(FF_DBUS_MPRIS_PREFIX"spotify", result, data) ||
+        getBusProperties(FF_DBUS_MPRIS_PREFIX"vlc", result, data) ||
+        getBusProperties(FF_DBUS_MPRIS_PREFIX"plasma-browser-integration", result, data)
+    ) return;
+
    DBusMessage* message = data->ffdbus_message_new_method_call("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListNames");
    if(message == NULL)
        return;
@@ -277,10 +283,7 @@ static void getBestBus(FFMediaResult* result, DBusData* data)
            FF_DBUS_ITER_CONTINUE(arrayIterator)

        if(getBusProperties(busName, result, data))
-        {
-            ffStrbufAppendS(&result->busNameShort, busName + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
            break;
-        }

        FF_DBUS_ITER_CONTINUE(arrayIterator)
    }
@@ -294,21 +297,21 @@ static void getMedia(FFinstance* instance, FFMediaResult* result)

    FF_LIBRARY_LOAD(dbus, instance->config.libDBus, , "libdbus-1.so", 4);
    FF_LIBRARY_LOAD_SYMBOL(dbus, dbus_bus_get,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_new_method_call, dbus_message_new_method_call,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_iter_init, dbus_message_iter_init,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_iter_init_append, dbus_message_iter_init_append,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_iter_append_basic, dbus_message_iter_append_basic,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_iter_get_arg_type, dbus_message_iter_get_arg_type,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_iter_get_basic, dbus_message_iter_get_basic,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_iter_recurse, dbus_message_iter_recurse,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_iter_has_next, dbus_message_iter_has_next,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_iter_next, dbus_message_iter_next,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_message_unref, dbus_message_unref,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_connection_send_with_reply, dbus_connection_send_with_reply,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_connection_flush, dbus_connection_flush,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_pending_call_block, dbus_pending_call_block,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_pending_call_steal_reply, dbus_pending_call_steal_reply,)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(dbus, data.ffdbus_pending_call_unref, dbus_pending_call_unref,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_new_method_call,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_iter_init,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_iter_init_append,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_iter_append_basic,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_iter_get_arg_type,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_iter_get_basic,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_iter_recurse,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_iter_has_next,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_iter_next,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_message_unref,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_connection_send_with_reply,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_connection_flush,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_pending_call_block,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_pending_call_steal_reply,)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(dbus, data, dbus_pending_call_unref,)

    data.connection = ffdbus_bus_get(DBUS_BUS_SESSION, NULL);
    if(data.connection == NULL)
@@ -352,19 +355,15 @@ const FFMediaResult* ffDetectMedia(FFinstance* instance)
        getMedia(instance, &result);
    #endif

-    //Set busNameShort if a custom player was given, but loading dbus failed
-    if(instance->config.playerName.length > 0 && result.busNameShort.length == 0)
+    //Set player if a custom player was given, but loading with dbus failed
+    if(instance->config.playerName.length > 0 && result.song.length == 0)
    {
        if(ffStrbufStartsWithS(&instance->config.playerName, FF_DBUS_MPRIS_PREFIX))
-            ffStrbufAppendS(&result.busNameShort, instance->config.playerName.chars + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
+            ffStrbufAppendS(&result.player, instance->config.playerName.chars + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
        else
-            ffStrbufAppend(&result.busNameShort, &instance->config.playerName);
+            ffStrbufAppend(&result.player, &instance->config.playerName);
    }

-    //Set player to busNameShort, if detection failed
-    if(result.player.length == 0)
-        ffStrbufAppend(&result.player, &result.busNameShort);
-
    pthread_mutex_unlock(&mutex);
    return &result;
 }
@@ -0,0 +1,21 @@
+#include "memory.h"
+#include "detection/internal.h"
+
+void ffDetectMemoryImpl(FFMemoryResult* memory);
+
+static void calculatePercentage(FFMemoryStorage* storage)
+{
+    if(storage->bytesTotal == 0)
+        storage->percentage = 0;
+    else
+        storage->percentage = (uint8_t) ((storage->bytesUsed / (long double) storage->bytesTotal) * 100.0);
+}
+
+const FFMemoryResult* ffDetectMemory()
+{
+    FF_DETECTION_INTERNAL_GUARD(FFMemoryResult,
+        ffDetectMemoryImpl(&result);
+        calculatePercentage(&result.ram);
+        calculatePercentage(&result.swap);
+    );
+}
@@ -0,0 +1,23 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_memory_memory
+#define FF_INCLUDED_detection_memory_memory
+
+#include "fastfetch.h"
+
+typedef struct FFMemoryStorage
+{
+    uint64_t bytesUsed;
+    uint64_t bytesTotal;
+    uint8_t percentage;
+} FFMemoryStorage;
+
+typedef struct FFMemoryResult
+{
+    FFMemoryStorage ram;
+    FFMemoryStorage swap;
+} FFMemoryResult;
+
+const FFMemoryResult* ffDetectMemory();
+
+#endif
@@ -0,0 +1,24 @@
+#include "memory.h"
+#include "common/settings.h"
+
+
+#include <string.h>
+#include <mach/mach.h>
+
+void ffDetectMemoryImpl(FFMemoryResult* memory)
+{
+    memset(memory, 0, sizeof(FFMemoryResult));
+
+    memory->ram.bytesTotal = (uint64_t) ffSettingsGetAppleInt64("hw.memsize", 0);
+
+    uint32_t pagesize = (uint32_t) ffSettingsGetAppleInt("hw.pagesize", 0);
+    if(pagesize == 0)
+        return;
+
+    mach_msg_type_number_t count = HOST_VM_INFO_COUNT;
+    vm_statistics_data_t vmstat;
+    if(host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t) (&vmstat), &count) != KERN_SUCCESS)
+        return;
+
+    memory->ram.bytesUsed = ((uint64_t) vmstat.active_count + vmstat.wire_count) * pagesize;
+}
@@ -0,0 +1,48 @@
+#include "memory.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+void ffDetectMemoryImpl(FFMemoryResult* memory)
+{
+    memset(memory, 0, sizeof(FFMemoryResult));
+
+    FILE* meminfo = fopen("/proc/meminfo", "r");
+    if(meminfo == NULL)
+        return;
+
+    char* line = NULL;
+    size_t len = 0;
+
+    uint32_t memTotal = 0,
+             shmem = 0,
+             memFree = 0,
+             buffers = 0,
+             cached = 0,
+             sReclaimable = 0,
+             swapTotal = 0,
+             swapFree = 0;
+
+    while (getline(&line, &len, meminfo) != EOF)
+    {
+        sscanf(line, "MemTotal: %u", &memTotal);
+        sscanf(line, "Shmem: %u", &shmem);
+        sscanf(line, "MemFree: %u", &memFree);
+        sscanf(line, "Buffers: %u", &buffers);
+        sscanf(line, "Cached: %u", &cached);
+        sscanf(line, "SReclaimable: %u", &sReclaimable);
+        sscanf(line, "SwapTotal: %u", &swapTotal);
+        sscanf(line, "SwapFree: %u", &swapFree);
+    }
+
+    if(line != NULL)
+        free(line);
+
+    fclose(meminfo);
+
+    memory->ram.bytesTotal = memTotal * (uint64_t) 1024;
+    memory->ram.bytesUsed = (memTotal + shmem - memFree - buffers - cached - sReclaimable) * (uint64_t) 1024;
+
+    memory->swap.bytesTotal = swapTotal * (uint64_t) 1024;
+    memory->swap.bytesUsed = (swapTotal - swapFree) * (uint64_t) 1024;
+}
@@ -0,0 +1,11 @@
+#include "os.h"
+#include "detection/internal.h"
+
+void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance);
+
+const FFOSResult* ffDetectOS(const FFinstance* instance)
+{
+    FF_DETECTION_INTERNAL_GUARD(FFOSResult,
+        ffDetectOSImpl(&result, instance)
+    );
+}
@@ -1,13 +1,12 @@
 #pragma once

-#ifndef FF_INCLUDED_detection_os
-#define FF_INCLUDED_detection_os
+#ifndef FF_INCLUDED_detection_os_os
+#define FF_INCLUDED_detection_os_os

 #include "fastfetch.h"

 typedef struct FFOSResult
 {
-    FFstrbuf systemName;
    FFstrbuf name;
    FFstrbuf prettyName;
    FFstrbuf id;
@@ -18,6 +17,7 @@ typedef struct FFOSResult
    FFstrbuf versionID;
    FFstrbuf codename;
    FFstrbuf buildID;
+    FFstrbuf systemName;
    FFstrbuf architecture;
 } FFOSResult;

@@ -0,0 +1,38 @@
+#include "os.h"
+#include "common/settings.h"
+
+void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance)
+{
+    FF_UNUSED(instance);
+
+    ffStrbufInit(&os->name);
+    ffStrbufSetS(&os->name, "Android");
+
+    ffStrbufInit(&os->prettyName);
+    ffStrbufSetS(&os->prettyName, "Android");
+
+    ffStrbufInit(&os->id);
+    ffStrbufSetS(&os->id, "android");
+
+    ffStrbufInit(&os->version);
+    ffSettingsGetAndroidProperty("ro.build.version.release", &os->version);
+
+    ffStrbufInit(&os->versionID);
+    ffSettingsGetAndroidProperty("ro.build.version.release", &os->versionID);
+
+    ffStrbufInit(&os->codename);
+    ffSettingsGetAndroidProperty("ro.build.version.codename", &os->codename);
+
+    ffStrbufInit(&os->buildID);
+    ffSettingsGetAndroidProperty("ro.build.id", &os->buildID);
+
+    ffStrbufInit(&os->systemName);
+    ffStrbufSetS(&os->systemName, instance->state.utsname.sysname);
+
+    ffStrbufInit(&os->architecture);
+    ffStrbufSetS(&os->architecture, instance->state.utsname.machine);
+
+    ffStrbufInitA(&os->idLike, 0);
+    ffStrbufInitA(&os->variant, 0);
+    ffStrbufInitA(&os->variantID, 0);
+}
@@ -0,0 +1,93 @@
+#include "os.h"
+#include "common/properties.h"
+#include "common/settings.h"
+
+#include <stdlib.h>
+#include <sys/sysctl.h>
+
+typedef enum PListKey
+{
+    PLIST_KEY_NAME,
+    PLIST_KEY_VERSION,
+    PLIST_KEY_BUILD,
+    PLIST_KEY_OTHER
+} PListKey;
+
+static void parseFile(FFOSResult* os)
+{
+    FILE* plist = fopen("/System/Library/CoreServices/SystemVersion.plist", "r");
+    if(plist == NULL)
+    return;
+
+    char* line = NULL;
+    size_t len = 0;
+    PListKey key = PLIST_KEY_OTHER;
+
+    FFstrbuf keyBuffer;
+    ffStrbufInit(&keyBuffer);
+
+    while(getline(&line, &len, plist) != EOF)
+    {
+        if(ffParsePropLine(line, "<key>", &keyBuffer))
+        {
+            if(ffStrbufIgnCaseCompS(&keyBuffer, "ProductName") == 0)
+                key = PLIST_KEY_NAME;
+            else if(ffStrbufIgnCaseCompS(&keyBuffer, "ProductUserVisibleVersion") == 0)
+                key = PLIST_KEY_VERSION;
+            else if(ffStrbufIgnCaseCompS(&keyBuffer, "ProductBuildVersion") == 0)
+                key = PLIST_KEY_BUILD;
+            else
+                key = PLIST_KEY_OTHER;
+
+            ffStrbufClear(&keyBuffer);
+            continue;
+        }
+
+        if(key == PLIST_KEY_NAME)
+            ffParsePropLine(line, "<string>", &os->name);
+        else if(key == PLIST_KEY_VERSION)
+            ffParsePropLine(line, "<string>", &os->version);
+        else if(key == PLIST_KEY_BUILD)
+            ffParsePropLine(line, "<string>", &os->buildID);
+    }
+
+    ffStrbufDestroy(&keyBuffer);
+
+    if(line != NULL)
+        free(line);
+
+    fclose(plist);
+}
+
+void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance)
+{
+    FF_UNUSED(instance);
+
+    ffStrbufInit(&os->name);
+    ffStrbufInit(&os->version);
+    ffStrbufInit(&os->buildID);
+    ffStrbufInit(&os->id);
+    ffStrbufInit(&os->prettyName);
+    ffStrbufInit(&os->versionID);
+    ffStrbufInit(&os->systemName);
+    ffStrbufInit(&os->architecture);
+
+    ffStrbufInitA(&os->codename, 0);
+    ffStrbufInitA(&os->idLike, 0);
+    ffStrbufInitA(&os->variant, 0);
+    ffStrbufInitA(&os->variantID, 0);
+
+    parseFile(os);
+
+    if(ffStrbufStartsWithIgnCaseS(&os->name, "MacOS"))
+        ffStrbufAppendS(&os->id, "macos");
+
+    if(os->version.length == 0)
+        ffSettingsGetAppleProperty("kern.osproductversion", &os->version);
+
+    //TODO map version to pretty name
+    ffStrbufAppend(&os->prettyName, &os->name);
+    ffStrbufAppend(&os->versionID, &os->version);
+    ffSettingsGetAppleProperty("kern.ostype", &os->systemName);
+    ffSettingsGetAppleProperty("hw.machine", &os->architecture);
+}
@@ -1,21 +1,20 @@
-#include "fastfetch.h"
-#include "detection/os.h"
+#include "os.h"
 #include "common/properties.h"
 #include "common/parsing.h"

 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>

-#if __ANDROID__
-    #include "common/settings.h"
-#else
+static inline bool allRelevantValuesSet(const FFOSResult* result)
+{
+    return result->id.length > 0
+        && result->name.length > 0
+        && result->prettyName.length > 0
+    ;
+}

 static bool parseFile(const char* fileName, FFOSResult* result)
 {
-    if(result->id.length > 0 && result->name.length > 0 && result->prettyName.length > 0)
-        return true;
-
    return ffParsePropFileValues(fileName, 13, (FFpropquery[]) {
        {"NAME =", &result->name},
        {"DISTRIB_DESCRIPTION =", &result->prettyName},
@@ -94,73 +93,59 @@ static void getUbuntuFlavour(FFOSResult* result)
    }
 }

-#endif
-
-const FFOSResult* ffDetectOS(const FFinstance* instance)
+static void detectOS(FFOSResult* os, const FFinstance* instance)
 {
-    static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-    static FFOSResult result;
-    static bool init = false;
-    pthread_mutex_lock(&mutex);
-    if(init)
-    {
-        pthread_mutex_unlock(&mutex);
-        return &result;
-    }
-    init = true;
-
-    ffStrbufInit(&result.systemName);
-    ffStrbufInit(&result.name);
-    ffStrbufInit(&result.prettyName);
-    ffStrbufInit(&result.id);
-    ffStrbufInit(&result.idLike);
-    ffStrbufInit(&result.variant);
-    ffStrbufInit(&result.variantID);
-    ffStrbufInit(&result.version);
-    ffStrbufInit(&result.versionID);
-    ffStrbufInit(&result.codename);
-    ffStrbufInit(&result.buildID);
-    ffStrbufInit(&result.architecture);
-
-    ffStrbufSetS(&result.systemName, instance->state.utsname.sysname);
-    ffStrbufSetS(&result.architecture, instance->state.utsname.machine);
-
-#if !__ANDROID__
    if(instance->config.osFile.length > 0)
    {
-        parseFile(instance->config.osFile.chars, &result);
+        parseFile(instance->config.osFile.chars, os);
+        return;
    }
-    else if(instance->config.escapeBedrock && parseFile(FASTFETCH_TARGET_DIR_ROOT"/bedrock/etc/bedrock-release", &result))
+
+    if(instance->config.escapeBedrock && parseFile(FASTFETCH_TARGET_DIR_ROOT"/bedrock/etc/bedrock-release", os))
    {
-        if(result.id.length == 0)
-            ffStrbufAppendS(&result.id, "bedrock");
+        if(os->id.length == 0)
+            ffStrbufAppendS(&os->id, "bedrock");

-        if(result.name.length == 0)
-            ffStrbufAppendS(&result.name, "Bedrock");
+        if(os->name.length == 0)
+            ffStrbufAppendS(&os->name, "Bedrock");

-        if(result.prettyName.length == 0)
-            ffStrbufAppendS(&result.prettyName, "Bedrock Linux");
-    }
-    else
-    {
-        parseFile(FASTFETCH_TARGET_DIR_ROOT"/etc/os-release", &result);
-        parseFile(FASTFETCH_TARGET_DIR_USR"/lib/os-release", &result);
-        parseFile(FASTFETCH_TARGET_DIR_ROOT"/etc/lsb-release", &result);
+        if(os->prettyName.length == 0)
+            ffStrbufAppendS(&os->prettyName, "Bedrock Linux");
+
+        return;
    }

-    if(ffStrbufIgnCaseCompS(&result.id, "ubuntu") == 0)
-        getUbuntuFlavour(&result);
+    parseFile(FASTFETCH_TARGET_DIR_ROOT"/etc/os-release", os);
+    if(allRelevantValuesSet(os))
+        return;

-#else
-    ffStrbufSetS(&result.name, "Android");
-    ffStrbufSetS(&result.id, "android");
-    ffSettingsGetAndroidProperty("ro.build.version.release", &result.versionID);
-    ffSettingsGetAndroidProperty("ro.build.version.release", &result.version);
-    ffSettingsGetAndroidProperty("ro.build.version.codename", &result.codename);
-    ffSettingsGetAndroidProperty("ro.build.id", &result.buildID);
-#endif
+    parseFile(FASTFETCH_TARGET_DIR_USR"/lib/os-release", os);
+    if(allRelevantValuesSet(os))
+        return;

-    pthread_mutex_unlock(&mutex);
-
-    return &result;
+    parseFile(FASTFETCH_TARGET_DIR_ROOT"/etc/lsb-release", os);
+}
+
+void ffDetectOSImpl(FFOSResult* os, const FFinstance* instance)
+{
+    ffStrbufInit(&os->name);
+    ffStrbufInit(&os->prettyName);
+    ffStrbufInit(&os->id);
+    ffStrbufInit(&os->idLike);
+    ffStrbufInit(&os->variant);
+    ffStrbufInit(&os->variantID);
+    ffStrbufInit(&os->version);
+    ffStrbufInit(&os->versionID);
+    ffStrbufInit(&os->codename);
+    ffStrbufInit(&os->buildID);
+    ffStrbufInit(&os->systemName);
+    ffStrbufInit(&os->architecture);
+
+    ffStrbufSetS(&os->systemName, instance->state.utsname.sysname);
+    ffStrbufSetS(&os->architecture, instance->state.utsname.machine);
+
+    detectOS(os, instance);
+
+    if(ffStrbufIgnCaseCompS(&os->id, "ubuntu") == 0)
+        getUbuntuFlavour(os);
 }
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "detection/qt.h"
 #include "common/properties.h"
-#include "detection/displayserver.h"
+#include "detection/displayserver/displayserver.h"

 #include <stdlib.h>
 #include <string.h>
@@ -63,10 +63,8 @@ static bool parseHwmonDir(FFstrbuf* dir, FFTempValue* value)
    return value->name.length > 0 || value->deviceClass.length > 0;
 }

-const FFTempsResult* ffDetectTemps(const FFinstance* instance)
+const FFTempsResult* ffDetectTemps()
 {
-    FF_UNUSED(instance)
-
    static FFTempsResult result;
    static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
    static bool init = false;
@@ -17,6 +17,6 @@ typedef struct FFTempsResult
    FFlist values; //List of FFTempValue
 } FFTempsResult;

-const FFTempsResult* ffDetectTemps(const FFinstance* instance);
+const FFTempsResult* ffDetectTemps();

 #endif
@@ -137,6 +137,10 @@ static void getTerminalFromEnv(FFTerminalShellResult* result)
        getenv("TMUX_TMPDIR") != NULL
    )) term = "Termux";

+    //MacOS
+    if(!ffStrSet(term))
+        term = getenv("TERM_PROGRAM");
+
    //Normal Terminal
    if(!ffStrSet(term))
        term = getenv("TERM");
@@ -6,6 +6,10 @@
 #include <pthread.h>
 #include <netdb.h>

+#ifndef HOST_NAME_MAX
+    #define HOST_NAME_MAX 64
+#endif
+
 const FFTitleResult* ffDetectTitle(const FFinstance* instance)
 {
    static FFTitleResult result;
@@ -27,9 +31,27 @@ const FFTitleResult* ffDetectTitle(const FFinstance* instance)
    ffStrbufAppendS(&result.hostname, instance->state.utsname.nodename);

    ffStrbufInitA(&result.fqdn, HOST_NAME_MAX);
-    struct hostent* host = gethostbyname(result.hostname.chars);
-    if(host != NULL)
-        ffStrbufAppendS(&result.fqdn, host->h_name);
+
+    #ifndef __APPLE__
+    struct addrinfo hints = {0};
+    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_flags = AI_CANONNAME;
+
+    struct addrinfo* info = NULL;
+
+    if(getaddrinfo(result.hostname.chars, "80", &hints, &info) == 0)
+    {
+        struct addrinfo* current = info;
+        while(result.fqdn.length == 0 && current != NULL)
+        {
+            ffStrbufAppendS(&result.fqdn, current->ai_canonname);
+            current = current->ai_next;
+        }
+
+        freeaddrinfo(info);
+    }
+    #endif
+
    if(result.fqdn.length == 0)
        ffStrbufAppend(&result.fqdn, &result.hostname);

@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "detection/vulkan.h"
+#include "detection/gpu/gpu.h"

 #include <pthread.h>

@@ -32,14 +33,14 @@ static void applyDriverName(VkPhysicalDeviceDriverProperties* properties, FFstrb
    ffStrbufAppendC(result, ']');
 }

-static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
+static const char* detectVulkan(const FFinstance* instance, FFVulkanResult* result)
 {
-    FF_LIBRARY_LOAD(vulkan, instance->config.libVulkan, , "libvulkan.so", 2)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkGetInstanceProcAddr,)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkCreateInstance,)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkDestroyInstance,)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkEnumeratePhysicalDevices,)
-    FF_LIBRARY_LOAD_SYMBOL(vulkan, vkGetPhysicalDeviceProperties,)
+    FF_LIBRARY_LOAD(vulkan, instance->config.libVulkan, "dlopen libvulkan"FF_LIBRARY_EXTENSION " failed", "libvulkan"FF_LIBRARY_EXTENSION, 2)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkGetInstanceProcAddr)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkCreateInstance)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkDestroyInstance)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkEnumeratePhysicalDevices)
+    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkGetPhysicalDeviceProperties)

    //Some drivers (nvdc) print messages to stdout
    //and thats the best way i found to disable that
@@ -84,9 +85,16 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
        .pApplicationInfo = &applicationInfo,
        .enabledLayerCount = 0,
        .ppEnabledLayerNames = NULL,
-        .enabledExtensionCount = 0,
-        .ppEnabledExtensionNames = NULL,
-        .flags = 0
+
+        #if defined(__APPLE__) && defined(VK_KHR_portability_enumeration)
+            .enabledExtensionCount = 1,
+            .ppEnabledExtensionNames = (const char* const[]) { VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME },
+            .flags = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR
+        #else
+            .enabledExtensionCount = 0,
+            .ppEnabledExtensionNames = NULL,
+            .flags = 0
+        #endif
    };

    VkInstance vkInstance;
@@ -94,7 +102,7 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
    {
        dlclose(vulkan);
        ffSuppressIO(false);
-        return;
+        return "ffvkCreateInstance() failed";
    }


@@ -109,7 +117,7 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
        ffvkDestroyInstance(vkInstance, NULL);
        dlclose(vulkan);
        ffSuppressIO(false);
-        return;
+        return "ffvkEnumeratePhysicalDevices() failed";
    }

    VkPhysicalDevice* physicalDevices = malloc(sizeof(VkPhysicalDevice) * physicalDeviceCount);
@@ -119,7 +127,7 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
        ffvkDestroyInstance(vkInstance, NULL);
        dlclose(vulkan);
        ffSuppressIO(false);
-        return;
+        return "ffvkEnumeratePhysicalDevices() failed";
    }

    PFN_vkGetPhysicalDeviceProperties2 ffvkGetPhysicalDeviceProperties2 = (PFN_vkGetPhysicalDeviceProperties2) ffvkGetInstanceProcAddr(vkInstance, "vkGetPhysicalDeviceProperties2");
@@ -175,12 +183,15 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
        if(physicalDeviceProperties.properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_CPU)
            continue;

-        FFGPUResult* gpu = ffListAdd(&result->devices);
-        ffStrbufInit(&gpu->vendor);
+        FFGPUResult* gpu = ffListAdd(&result->gpus);
+
        ffStrbufInit(&gpu->name);
-        ffStrbufInit(&gpu->driver);
-        gpu->temperature = 0.0 / 0.0; //NaN, no way to detect temperature using vulkan
        ffStrbufAppendS(&gpu->name, physicalDeviceProperties.properties.deviceName);
+
+        //No way to detect those using vulkan
+        ffStrbufInit(&gpu->vendor);
+        ffStrbufInit(&gpu->driver);
+        gpu->temperature = FF_GPU_TEMP_UNSET;
    }

    //If the highest device version is lower than the instance version, use it as our vulkan version
@@ -197,6 +208,7 @@ static void detectVulkan(const FFinstance* instance, FFVulkanResult* result)
    ffvkDestroyInstance(vkInstance, NULL);
    dlclose(vulkan);
    ffSuppressIO(false);
+    return NULL;
 }

 #endif
@@ -218,12 +230,13 @@ const FFVulkanResult* ffDetectVulkan(const FFinstance* instance)
    ffStrbufInit(&result.driver);
    ffStrbufInit(&result.apiVersion);
    ffStrbufInit(&result.conformanceVersion);
-    ffListInit(&result.devices, sizeof(FFGPUResult));
+    ffListInit(&result.gpus, sizeof(FFGPUResult));

    #ifdef FF_HAVE_VULKAN
-        detectVulkan(instance, &result);
+        result.error = detectVulkan(instance, &result);
    #else
        FF_UNUSED(instance);
+        result.error = "fastfetch was compiled without vulkan support";
    #endif

    pthread_mutex_unlock(&mutex);
@@ -5,20 +5,13 @@

 #include "fastfetch.h"

-typedef struct FFGPUResult
-{
-    FFstrbuf vendor;
-    FFstrbuf name;
-    FFstrbuf driver;
-    double temperature;
-} FFGPUResult;
-
 typedef struct FFVulkanResult
 {
    FFstrbuf driver;
    FFstrbuf apiVersion;
    FFstrbuf conformanceVersion;
-    FFlist devices; //List of FFGPUResult
+    FFlist gpus; //List of FFGPUResult, see detection/gpu/gpu.h
+    const char* error;
 } FFVulkanResult;

 const FFVulkanResult* ffDetectVulkan(const FFinstance* instance);
@@ -2,16 +2,24 @@
 #include "util/FFvaluestore.h"
 #include "common/printing.h"
 #include "common/parsing.h"
+#include "common/io.h"

 #include <stdlib.h>
+#include <ctype.h>
 #include <string.h>
 #include <dirent.h>
 #include <sys/stat.h>

+typedef struct CustomValue
+{
+    bool printKey;
+    FFstrbuf value;
+} CustomValue;
+
 // Things only needed by fastfetch
 typedef struct FFdata
 {
-    FFvaluestore valuestore;
+    FFvaluestore customValues;
    FFstrbuf structure;
    bool loadUserConfig;
 } FFdata;
@@ -106,7 +114,7 @@ static inline void printCommandHelp(const char* command)
    }
    else if(strcasecmp(command, "packages-format") == 0)
    {
-        constructAndPrintCommandHelpFormat("packages", "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (xbps), {8} (nix-user), {9} (nix-default), {10} (flatpak), {11} (snap)", 11,
+        constructAndPrintCommandHelpFormat("packages", "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (xbps), {8} (nix-system), {9} (nix-user), {10} (nix-default), {11} (apk), {12} (flatpak), {13} (snap), {14} (brew)", 14,
            "Number of all packages",
            "Number of pacman packages",
            "Pacman branch on manjaro",
@@ -117,8 +125,10 @@ static inline void printCommandHelp(const char* command)
            "Number of nix-system packages",
            "Number of nix-user packages",
            "Number of nix-default packages",
+            "Number of apk packages",
            "Number of flatpak packages",
-            "Number of snap packages"
+            "Number of snap packages",
+            "Number of brew packages"
        );
    }
    else if(strcasecmp(command, "shell-format") == 0)
@@ -220,10 +230,17 @@ static inline void printCommandHelp(const char* command)
    }
    else if(strcasecmp(command, "terminal-format") == 0)
    {
-        constructAndPrintCommandHelpFormat("terminal", "{3}", 3,
+        constructAndPrintCommandHelpFormat("terminal", "{3}", 10,
            "Terminal process name",
            "Terminal path with exe name",
-            "Terminal exe name"
+            "Terminal exe name",
+            "Shell process name",
+            "Shell path with exe name",
+            "Shell exe name",
+            "Shell version",
+            "User shell path with exe name",
+            "User shell exe name",
+            "User shell version"
        );
    }
    else if(strcasecmp(command, "terminal-font-format") == 0)
@@ -238,22 +255,15 @@ static inline void printCommandHelp(const char* command)
    }
    else if(strcasecmp(command, "cpu-format") == 0)
    {
-        constructAndPrintCommandHelpFormat("cpu", "{2} ({7}) @ {15}GHz", 15,
-            "CPU name",
-            "Prettified CPU name",
-            "CPU Vendor name (Vendor ID)",
-            "CPU logical core count online",
-            "CPU logical core count configured",
-            "CPU physical core count",
-            "Always set core count",
-            "CPU package temperature",
-            "frequency bios limit",
-            "frequency scaling max",
-            "frequency scaling min",
-            "frequency info max",
-            "frequency info min",
-            "frequeny from /proc/cpuinfo",
-            "most accurate frequeny"
+        constructAndPrintCommandHelpFormat("cpu", "{1} ({5}) @ {7}GHz", 8,
+            "Name",
+            "Vendor",
+            "Physical core count",
+            "Logical core count",
+            "Online core count",
+            "Min frequency",
+            "Max frequency",
+            "Temperature"
        );
    }
    else if(strcasecmp(command, "cpu-usage-format") == 0)
@@ -264,30 +274,36 @@ static inline void printCommandHelp(const char* command)
    }
    else if(strcasecmp(command, "gpu-format") == 0)
    {
-        constructAndPrintCommandHelpFormat("gpu", "{2} {4}", 6,
+        constructAndPrintCommandHelpFormat("gpu", "{} {}", 4,
            "GPU vendor",
-            "GPU vendor pretty",
            "GPU name",
-            "GPU name pretty",
            "GPU driver",
            "GPU temperature"
        );
    }
    else if(strcasecmp(command, "memory-format") == 0)
    {
-        constructAndPrintCommandHelpFormat("memory", "{}MiB / {}MiB ({}%)", 3,
-            "Used memory",
-            "Total memory",
-            "Used memory percentage"
+        constructAndPrintCommandHelpFormat("memory", "{} / {} ({}%)", 3,
+            "Used size",
+            "Total size",
+            "Percentage used"
+        );
+    }
+    else if(strcasecmp(command, "swap-format") == 0)
+    {
+        constructAndPrintCommandHelpFormat("swap", "{} / {} ({}%)", 3,
+            "Used size",
+            "Total size",
+            "Percentage used"
        );
    }
    else if(strcasecmp(command, "disk-format") == 0)
    {
        constructAndPrintCommandHelpFormat("disk", "{}GiB / {}GiB ({4}%)", 4,
-            "Used disk space",
-            "Total disk space",
-            "Number of files",
-            "Used disk space percentage"
+            "Used size",
+            "Total size",
+            "Percentage used",
+            "Num files"
        );
    }
    else if(strcasecmp(command, "battery-format") == 0)
@@ -320,20 +336,20 @@ static inline void printCommandHelp(const char* command)
    }
    else if(strcasecmp(command, "player-format") == 0)
    {
-        constructAndPrintCommandHelpFormat("player", "{}", 3,
+        constructAndPrintCommandHelpFormat("player", "{}", 4,
            "Pretty player name",
            "Player name",
-            "DBus bus name"
+            "DBus bus name",
+            "URL name"
        );
    }
-    else if(strcasecmp(command, "song-format") == 0)
+    else if(strcasecmp(command, "song-format") == 0 || strcasecmp(command, "media-format") == 0)
    {
-        constructAndPrintCommandHelpFormat("song", "{3} - {4} - {1}", 5,
-            "Song name pretty",
-            "Song name",
+        constructAndPrintCommandHelpFormat("song", "{3} - {1}", 4,
+            "Pretty media name",
+            "Media name",
            "Artist name",
-            "Album name",
-            "Song url"
+            "Album name"
        );
    }
    else if(strcasecmp(command, "datetime-format") == 0 || strcasecmp(command, "date-format") == 0 || strcasecmp(command, "time-format") == 0)
@@ -444,60 +460,67 @@ static inline void listAvailablePresets(FFinstance* instance)

 static void parseOption(FFinstance* instance, FFdata* data, const char* key, const char* value);

-static void parseConfigFile(FFinstance* instance, FFdata* data, FILE* file)
+static bool parseConfigFile(FFinstance* instance, FFdata* data, const char* path)
 {
-    char* lineStart = NULL;
+    FILE* file = fopen(path, "r");
+    if(file == NULL)
+        return false;
+
+    char* line = NULL;
    size_t len = 0;
    ssize_t read;

-    FFstrbuf line;
-    ffStrbufInitA(&line, 256); //The default structure line needs this size
-
-    while ((read = getline(&lineStart, &len, file)) != -1)
+    while ((read = getline(&line, &len, file)) != -1)
    {
-        ffStrbufSetS(&line, lineStart);
-        ffStrbufTrimRight(&line, '\n');
-        ffStrbufTrim(&line, ' ');
+        char* lineStart = line;
+        char* lineEnd = line + read - 1;

-        if(line.length == 0 || line.chars[0] == '#')
+        //Trim line left
+        while(isspace(*lineStart))
+            ++lineStart;
+
+        //Continue if line is empty or a comment
+        if(*lineStart == '\0' || *lineStart == '#')
            continue;

-        uint32_t firstSpace = ffStrbufFirstIndexC(&line, ' ');
+        //Trim line right
+        while(lineEnd > lineStart && isspace(*lineEnd))
+            --lineEnd;
+        *(lineEnd + 1) = '\0';

-        if(firstSpace >= line.length)
+        char* valueStart = strchr(lineStart, ' ');
+
+        //If the line has no white space, it is only a key
+        if(valueStart == NULL)
        {
-            parseOption(instance, data, line.chars, NULL);
+            parseOption(instance, data, lineStart, NULL);
            continue;
        }

-        //Separate key and value by simply replacing the first space with a \0
-        char* valueStart = &line.chars[firstSpace];
+        //separate the key from the value
        *valueStart = '\0';
        ++valueStart;

-        //Trim whitespace at beginning of value
-        while(*valueStart == ' ')
+        //Trim space of value left
+        while(isspace(*valueStart))
            ++valueStart;

        //If we want whitespace in values, we need to quote it. This is done to keep consistency with shell.
-        if(*valueStart == '"')
+        if((*valueStart == '"' || *valueStart == '\'') && *valueStart == *lineEnd && lineEnd > valueStart)
        {
-            char* last = line.chars + line.length - 1;
-            if(*last == '"')
-            {
-                ++valueStart;
-                *last = '\0';
-                --line.length;
-            }
+            ++valueStart;
+            *lineEnd = '\0';
+            --lineEnd;
        }

-        parseOption(instance, data, line.chars, valueStart);
+        parseOption(instance, data, lineStart, valueStart);
    }

-    ffStrbufDestroy(&line);
+    if(line != NULL)
+        free(line);

-    if(lineStart != NULL)
-        free(lineStart);
+    fclose(file);
+    return true;
 }

 static void optionParseConfigFile(FFinstance* instance, FFdata* data, const char* key, const char* value)
@@ -508,13 +531,12 @@ static void optionParseConfigFile(FFinstance* instance, FFdata* data, const char
        exit(413);
    }

-    FILE* file = fopen(value, "r");
-    if(file != NULL)
-    {
-        parseConfigFile(instance, data, file);
-        fclose(file);
+    //Try to load as an absolute path
+
+    if(parseConfigFile(instance, data, value))
        return;
-   }
+
+    //Try to load as an user preset

    FFstrbuf filename;
    ffStrbufInitA(&filename, 64);
@@ -523,26 +545,28 @@ static void optionParseConfigFile(FFinstance* instance, FFdata* data, const char
    ffStrbufAppendS(&filename, "/.local/share/fastfetch/presets/");
    ffStrbufAppendS(&filename, value);

-    file = fopen(filename.chars, "r");
-    if(file != NULL)
+    if(parseConfigFile(instance, data, filename.chars))
    {
-        parseConfigFile(instance, data, file);
-        fclose(file);
+        ffStrbufDestroy(&filename);
        return;
    }

+
+    //Try to load as a system preset
+
    ffStrbufSetS(&filename, FASTFETCH_TARGET_DIR_USR"/share/fastfetch/presets/");
    ffStrbufAppendS(&filename, value);

-    file = fopen(filename.chars, "r");
-    if(file != NULL)
+    if(parseConfigFile(instance, data, filename.chars))
    {
-        parseConfigFile(instance, data, file);
-        fclose(file);
+        ffStrbufDestroy(&filename);
        return;
    }

+    //File not found
+
    fprintf(stderr, "Error: couldn't find config: %s\n", value);
+    ffStrbufDestroy(&filename);
    exit(414);
 }

@@ -668,6 +692,65 @@ static uint32_t optionParseUInt32(const char* key, const char* value)
    return num;
 }

+static void optionParseCustomValue(FFdata* data, const char* key, const char* value, bool printKey)
+{
+    if(value == NULL)
+    {
+        fprintf(stderr, "Error: usage: %s <key=value>\n", key);
+        exit(411);
+    }
+
+    char* separator = strchr(value, '=');
+
+    if(separator == NULL)
+    {
+        fprintf(stderr, "Error: usage: %s <key=value>, '=' missing\n", key);
+        exit(412);
+    }
+
+    *separator = '\0';
+
+    bool created;
+    CustomValue* customValue = ffValuestoreSet(&data->customValues, value, &created);
+    if(created)
+        ffStrbufInit(&customValue->value);
+    ffStrbufSetS(&customValue->value, separator + 1);
+    customValue->printKey = printKey;
+}
+
+static void optionParseEnum(const char* argumentKey, const char* requestedKey, void* result, ...)
+{
+    if(requestedKey == NULL)
+    {
+        fprintf(stderr, "Error: usage: %s <value>\n", argumentKey);
+        exit(476);
+    }
+
+    va_list args;
+    va_start(args, result);
+
+    while(true)
+    {
+        const char* key = va_arg(args, const char*);
+        if(key == NULL)
+            break;
+
+        int value = va_arg(args, int); //C standard guarantees that enumeration constants are presented as ints
+
+        if(strcasecmp(requestedKey, key) == 0)
+        {
+            *(int*)result = value;
+            va_end(args);
+            return;
+        }
+    }
+
+    va_end(args);
+
+    fprintf(stderr, "Error: unknown %s value: %s\n", argumentKey, requestedKey);
+    exit(478);
+}
+
 static void parseOption(FFinstance* instance, FFdata* data, const char* key, const char* value)
 {
    ///////////////////////
@@ -780,31 +863,16 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
    }
    else if(strcasecmp(key, "--logo-type") == 0)
    {
-        if(value == NULL)
-        {
-            fprintf(stderr, "Error: usage: %s <type>\n", key);
-            exit(476);
-        }
-
-        if(strcasecmp(value, "auto") == 0)
-            instance->config.logo.type = FF_LOGO_TYPE_AUTO;
-        else if(strcasecmp(value, "builtin") == 0)
-            instance->config.logo.type = FF_LOGO_TYPE_BUILTIN;
-        else if(strcasecmp(value, "file") == 0)
-            instance->config.logo.type = FF_LOGO_TYPE_FILE;
-        else if(strcasecmp(value, "raw") == 0)
-            instance->config.logo.type = FF_LOGO_TYPE_RAW;
-        else if(strcasecmp(value, "sixel") == 0)
-            instance->config.logo.type = FF_LOGO_TYPE_SIXEL;
-        else if(strcasecmp(value, "kitty") == 0)
-            instance->config.logo.type = FF_LOGO_TYPE_KITTY;
-        else if(strcasecmp(value, "chafa") == 0)
-            instance->config.logo.type = FF_LOGO_TYPE_CHAFA;
-        else
-        {
-            fprintf(stderr, "Error: unknown logo type: %s\n", value);
-            exit(478);
-        }
+        optionParseEnum(key, value, &instance->config.logo.type,
+            "auto", FF_LOGO_TYPE_AUTO,
+            "builtin", FF_LOGO_TYPE_BUILTIN,
+            "file", FF_LOGO_TYPE_FILE,
+            "raw", FF_LOGO_TYPE_RAW,
+            "sixel", FF_LOGO_TYPE_SIXEL,
+            "kitty", FF_LOGO_TYPE_KITTY,
+            "chafa", FF_LOGO_TYPE_CHAFA,
+            NULL
+        );
    }
    else if(strncasecmp(key, "--logo-color-", 13) == 0 && key[13] != '\0' && key[14] == '\0') // matches "--logo-color-*"
    {
@@ -848,7 +916,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
    }
    else if(strcasecmp(key, "--file") == 0)
    {
-        optionCheckString(key, value, &instance->config.logo.source);
+        optionParseString(key, value, &instance->config.logo.source);
        instance->config.logo.type = FF_LOGO_TYPE_FILE;
    }
    else if(strcasecmp(key, "--raw") == 0)
@@ -876,27 +944,27 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
        optionParseString(key, value, &data->structure);
    else if(strcasecmp(key, "--separator") == 0)
        optionParseString(key, value, &instance->config.separator);
+    else if(strcasecmp(key, "--color-keys") == 0)
+        optionParseColor(key, value, &instance->config.colorKeys);
+    else if(strcasecmp(key, "--color-title") == 0)
+        optionParseColor(key, value, &instance->config.colorTitle);
    else if(strcasecmp(key, "-c") == 0 || strcasecmp(key, "--color") == 0)
-        optionParseColor(key, value, &instance->config.mainColor);
-    else if(strcasecmp(key, "--set") == 0)
    {
-        if(value == NULL)
-        {
-            fprintf(stderr, "Error: usage: %s <key=value>\n", key);
-            exit(411);
-        }
-
-        char* separator = strchr(value, '=');
-
-        if(separator == NULL)
-        {
-            fprintf(stderr, "Error: usage: %s <key=value>, '=' missing\n", key);
-            exit(412);
-        }
-
-        *separator = '\0';
-
-        ffValuestoreSet(&data->valuestore, value, separator + 1);
+        optionParseColor(key, value, &instance->config.colorKeys);
+        ffStrbufSet(&instance->config.colorTitle, &instance->config.colorKeys);
+    }
+    else if(strcasecmp(key, "--set") == 0)
+        optionParseCustomValue(data, key, value, true);
+    else if(strcasecmp(key, "--set-keyless") == 0)
+        optionParseCustomValue(data, key, value, false);
+    else if(strcasecmp(key, "--binary-prefix") == 0)
+    {
+        optionParseEnum(key, value, &instance->config.binaryPrefixType,
+            "iec", FF_BINARY_PREFIX_TYPE_IEC,
+            "si", FF_BINARY_PREFIX_TYPE_SI,
+            "jedec", FF_BINARY_PREFIX_TYPE_JEDEC,
+            NULL
+        );
    }

    ////////////////////////////////
@@ -1029,6 +1097,12 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
        optionParseString(key, value, &instance->config.memory.outputFormat);
    else if(strcasecmp(key, "--memory-error") == 0)
        optionParseString(key, value, &instance->config.memory.errorFormat);
+    else if(strcasecmp(key, "--swap-key") == 0)
+        optionParseString(key, value, &instance->config.swap.key);
+    else if(strcasecmp(key, "--swap-format") == 0)
+        optionParseString(key, value, &instance->config.swap.outputFormat);
+    else if(strcasecmp(key, "--swap-error") == 0)
+        optionParseString(key, value, &instance->config.swap.errorFormat);
    else if(strcasecmp(key, "--disk-key") == 0)
        optionParseString(key, value, &instance->config.disk.key);
    else if(strcasecmp(key, "--disk-format") == 0)
@@ -1065,11 +1139,11 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
        optionParseString(key, value, &instance->config.player.outputFormat);
    else if(strcasecmp(key, "--player-error") == 0)
        optionParseString(key, value, &instance->config.player.errorFormat);
-    else if(strcasecmp(key, "--song-key") == 0)
+    else if(strcasecmp(key, "--song-key") == 0 || strcasecmp(key, "--media-key") == 0)
        optionParseString(key, value, &instance->config.song.key);
-    else if(strcasecmp(key, "--song-format") == 0)
+    else if(strcasecmp(key, "--song-format") == 0 || strcasecmp(key, "--media-format") == 0)
        optionParseString(key, value, &instance->config.song.outputFormat);
-    else if(strcasecmp(key, "--song-error") == 0)
+    else if(strcasecmp(key, "--song-error") == 0 || strcasecmp(key, "--media-error") == 0)
        optionParseString(key, value, &instance->config.song.errorFormat);
    else if(strcasecmp(key, "--datetime-key") == 0)
        optionParseString(key, value, &instance->config.dateTime.key);
@@ -1179,25 +1253,13 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
        instance->config.publicIpTimeout = optionParseUInt32(key, value);
    else if(strcasecmp(key, "--gl") == 0)
    {
-        if(value == NULL)
-        {
-            fprintf(stderr, "Error: usage: %s <type>\n", key);
-            exit(491);
-        }
-
-        if(strcasecmp(value, "auto") == 0)
-            instance->config.glType = FF_GL_TYPE_AUTO;
-        else if(strcasecmp(value, "egl") == 0)
-            instance->config.glType = FF_GL_TYPE_EGL;
-        else if(strcasecmp(value, "glx") == 0)
-            instance->config.glType = FF_GL_TYPE_GLX;
-        else if(strcasecmp(value, "osmesa") == 0)
-            instance->config.glType = FF_GL_TYPE_OSMESA;
-        else
-        {
-            fprintf(stderr, "Error: unknown gl type: %s\n", value);
-            exit(492);
-        }
+        optionParseEnum(key, value, &instance->config.glType,
+            "auto", FF_GL_TYPE_AUTO,
+            "egl", FF_GL_TYPE_EGL,
+            "glx", FF_GL_TYPE_GLX,
+            "osmesa", FF_GL_TYPE_OSMESA,
+            NULL
+        );
    }

    //////////////////
@@ -1213,12 +1275,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con

 static void parseConfigFileSystem(FFinstance* instance, FFdata* data)
 {
-    FILE* file = fopen(FASTFETCH_TARGET_DIR_ROOT"/etc/fastfetch/config.conf", "r");
-    if(file == NULL)
-        return;
-
-    parseConfigFile(instance, data, file);
-    fclose(file);
+    parseConfigFile(instance, data, FASTFETCH_TARGET_DIR_ROOT"/etc/fastfetch/config.conf");
 }

 static void parseConfigFileUser(FFinstance* instance, FFdata* data)
@@ -1229,28 +1286,10 @@ static void parseConfigFileUser(FFinstance* instance, FFdata* data)
    FFstrbuf* filename = ffListGet(&instance->state.configDirs, 0);
    uint32_t filenameLength = filename->length;

-    mkdir(filename->chars, S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH); //I hope everybody has a config folder, but who knows
+    ffStrbufAppendS(filename, "/fastfetch/config.conf");

-    ffStrbufAppendS(filename, "/fastfetch/");
-    mkdir(filename->chars, S_IRWXU | S_IRGRP | S_IROTH);
-
-    ffStrbufAppendS(filename, "config.conf");
-
-    FILE* file = fopen(filename->chars, "r");
-    if(file != NULL)
-    {
-        parseConfigFile(instance, data, file);
-        fclose(file);
-        ffStrbufSubstrBefore(filename, filenameLength);
-        return;
-    }
-
-    file = fopen(filename->chars, "w");
-    if(file != NULL)
-    {
-        fputs(FASTFETCH_DATATEXT_CONFIG_USER, file);
-        fclose(file);
-    }
+    if(!parseConfigFile(instance, data, filename->chars))
+        ffWriteFileData(filename->chars, sizeof(FASTFETCH_DATATEXT_CONFIG_USER), FASTFETCH_DATATEXT_CONFIG_USER);

    ffStrbufSubstrBefore(filename, filenameLength);
 }
@@ -1264,7 +1303,6 @@ static void parseArguments(FFinstance* instance, FFdata* data, int argc, const c
    {
        if(i == argc - 1 || (
            *argv[i + 1] == '-' &&
-            strcasecmp(argv[i], "--offsetx") != 0 && // --offsetx allows negative values
            strcasecmp(argv[i], "--separator-string") != 0 // Separator string can start with a -
        )) {
            parseOption(instance, data, argv[i], NULL);
@@ -1279,10 +1317,10 @@ static void parseArguments(FFinstance* instance, FFdata* data, int argc, const c

 static void parseStructureCommand(FFinstance* instance, FFdata* data, const char* line)
 {
-    const char* setValue = ffValuestoreGet(&data->valuestore, line);
-    if(setValue != NULL)
+    CustomValue* customValue = ffValuestoreGet(&data->customValues, line);
+    if(customValue != NULL)
    {
-        ffPrintCustom(instance, line, setValue);
+        ffPrintCustom(instance, customValue->printKey ? line : NULL, customValue->value.chars);
        return;
    }

@@ -1334,6 +1372,8 @@ static void parseStructureCommand(FFinstance* instance, FFdata* data, const char
        ffPrintGPU(instance);
    else if(strcasecmp(line, "memory") == 0)
        ffPrintMemory(instance);
+    else if(strcasecmp(line, "swap") == 0)
+        ffPrintSwap(instance);
    else if(strcasecmp(line, "disk") == 0)
        ffPrintDisk(instance);
    else if(strcasecmp(line, "battery") == 0)
@@ -1346,7 +1386,7 @@ static void parseStructureCommand(FFinstance* instance, FFdata* data, const char
        ffPrintPublicIp(instance);
    else if(strcasecmp(line, "player") == 0)
        ffPrintPlayer(instance);
-    else if(strcasecmp(line, "song") == 0)
+    else if(strcasecmp(line, "media") == 0 || strcasecmp(line, "song") == 0)
        ffPrintSong(instance);
    else if(strcasecmp(line, "datetime") == 0)
        ffPrintDateTime(instance);
@@ -1373,7 +1413,7 @@ int main(int argc, const char** argv)

    //Data stores things only needed for the configuration of fastfetch
    FFdata data;
-    ffValuestoreInit(&data.valuestore);
+    ffValuestoreInit(&data.customValues, sizeof(CustomValue));
    ffStrbufInitA(&data.structure, 256);
    data.loadUserConfig = true;

@@ -10,7 +10,10 @@

 #include <pwd.h>
 #include <sys/utsname.h>
-#include <sys/sysinfo.h>
+
+#if FF_HAVE_SYSINFO_H
+    #include <sys/sysinfo.h>
+#endif

 #include "util/FFstrbuf.h"
 #include "util/FFlist.h"
@@ -35,6 +38,13 @@ typedef enum FFLogoType
    FF_LOGO_TYPE_CHAFA    //Image file, printed as ascii art using libchafa
 } FFLogoType;

+typedef enum FFBinaryPrefixType
+{
+    FF_BINARY_PREFIX_TYPE_IEC,   // 1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ... (standard)
+    FF_BINARY_PREFIX_TYPE_SI,    // 1000 Bytes = 1 KB, 1000 KB = 1 MB, ...
+    FF_BINARY_PREFIX_TYPE_JEDEC, // 1024 Bytes = 1 kB, 1024 K = 1 MB, ...
+} FFBinaryPrefixType;
+
 typedef enum FFGLType
 {
    FF_GL_TYPE_AUTO,
@@ -64,7 +74,10 @@ typedef struct FFconfig
        bool printRemaining;
    } logo;

-    FFstrbuf mainColor; //If this is empty, ffLogoPrint will set it to the main color of the logo
+    //If one of those is empty, ffLogoPrint will set them
+    FFstrbuf colorKeys;
+    FFstrbuf colorTitle;
+
    FFstrbuf separator;

    bool showErrors;
@@ -74,6 +87,7 @@ typedef struct FFconfig
    bool disableLinewrap;
    bool hideCursor;
    bool escapeBedrock;
+    FFBinaryPrefixType binaryPrefixType;
    FFGLType glType;
    bool pipe; //disables logo and all escape sequences
    bool multithreading;
@@ -99,6 +113,7 @@ typedef struct FFconfig
    FFModuleArgs cpuUsage;
    FFModuleArgs gpu;
    FFModuleArgs memory;
+    FFModuleArgs swap;
    FFModuleArgs disk;
    FFModuleArgs battery;
    FFModuleArgs locale;
@@ -161,7 +176,10 @@ typedef struct FFstate

    struct passwd* passwd;
    struct utsname utsname;
-    struct sysinfo sysinfo;
+
+    #if FF_HAVE_SYSINFO_H
+        struct sysinfo sysinfo;
+    #endif

    FFlist configDirs;
    FFstrbuf cacheDir;
@@ -231,6 +249,7 @@ void ffPrintCPU(FFinstance* instance);
 void ffPrintCPUUsage(FFinstance* instance);
 void ffPrintGPU(FFinstance* instance);
 void ffPrintMemory(FFinstance* instance);
+void ffPrintSwap(FFinstance* instance); //Also in modules/memory.c
 void ffPrintDisk(FFinstance* instance);
 void ffPrintBattery(FFinstance* instance);
 void ffPrintLocale(FFinstance* instance);
@@ -37,6 +37,7 @@ int main(int argc, char** argv)
    //ffPrintCPUUsage(&instance);
    ffPrintGPU(&instance);
    ffPrintMemory(&instance);
+    //ffPrintSwap(&instance);
    ffPrintDisk(&instance);
    ffPrintBattery(&instance);
    //ffPrintPlayer(&instance);
@@ -49,6 +50,7 @@ int main(int argc, char** argv)
    //ffPrintTime(&instance);
    //ffPrintVulkan(&instance);
    //ffPrintOpenGL(&instance);
+    //ffPrintOpenCL(&instance);
    ffPrintBreak(&instance);
    ffPrintColors(&instance);

@@ -4,6 +4,8 @@
 #define FF_LOGO_NAMES(...) static const char* names[] = (const char*[]) { __VA_ARGS__, NULL }; logo.names = names;
 #define FF_LOGO_LINES(x) logo.data = x;
 #define FF_LOGO_COLORS(...) static const char* colors[] = (const char*[]) { __VA_ARGS__, NULL }; logo.builtinColors = colors;
+#define FF_LOGO_COLOR_KEYS(x) logo.colorKeys = x;
+#define FF_LOGO_COLOR_TITLE(x) logo.colorTitle = x;
 #define FF_LOGO_RETURN return &logo;

 const FFlogo* ffLogoBuiltinGetUnknown()
@@ -31,15 +33,57 @@ const FFlogo* ffLogoBuiltinGetUnknown()
        "         \"\""
    )
    FF_LOGO_COLORS("")
+    FF_LOGO_COLOR_KEYS("")
+    FF_LOGO_COLOR_TITLE("")
    FF_LOGO_RETURN
 }

 static const FFlogo* getLogoNone()
 {
    FF_LOGO_INIT
-    FF_LOGO_NAMES("none", "empty", "")
+    FF_LOGO_NAMES("none", "empty")
    FF_LOGO_LINES("")
    FF_LOGO_COLORS("")
+    FF_LOGO_COLOR_KEYS("")
+    FF_LOGO_COLOR_TITLE("")
+    FF_LOGO_RETURN
+}
+
+static const FFlogo* getLogoAlmaLinux()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("almalinux")
+    FF_LOGO_LINES(
+        "$1         'c:.\n"
+        "$1        lkkkx, ..       $2..   ,cc,\n"
+        "$1        okkkk:ckkx'  $2.lxkkx.okkkkd\n"
+        "$1        .:llcokkx'  $2:kkkxkko:xkkd,\n"
+        "$1      .xkkkkdood:  $2;kx,  .lkxlll;\n"
+        "$1       xkkx.       $2xk'     xkkkkk:\n"
+        "$1       'xkx.       $2xd      .....,.\n"
+        "$3      .. $1:xkl'     $2:c      ..''..\n"
+        "$3    .dkx'  $1.:ldl:'. $2'  $4':lollldkkxo;\n"
+        "$3  .''lkkko'                     $4ckkkx.\n"
+        "$3'xkkkd:kkd.       ..  $5;'        $4:kkxo.\n"
+        "$3,xkkkd;kk'      ,d;    $5ld.   $4':dkd::cc,\n"
+        "$3 .,,.;xkko'.';lxo.      $5dx,  $4:kkk'xkkkkc\n"
+        "$3     'dkkkkkxo:.        $5;kx  $4.kkk:;xkkd.\n"
+        "$3       .....   $5.;dk:.   $5lkk.  $4:;,\n"
+        "             $5:kkkkkkkdoxkkx\n"
+        "              ,c,,;;;:xkkd.\n"
+        "                ;kkkkl...\n"
+        "                ;kkkkl\n"
+        "                 ,od;";
+    )
+    FF_LOGO_COLORS(
+        "31", // red
+        "1;33", // yellow
+        "34", // blue
+        "1;32", // light green
+        "36" // cyan
+    )
+    FF_LOGO_COLOR_KEYS("1;33"); //yellow
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -72,6 +116,8 @@ static const FFlogo* getLogoAlpine()
    FF_LOGO_COLORS(
        "34" //blue
    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -90,6 +136,8 @@ static const FFlogo* getLogoAlpineSmall()
    FF_LOGO_COLORS(
        "34" //blue
    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -121,6 +169,8 @@ static const FFlogo* getLogoAndroid()
        "32", //green
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -139,6 +189,8 @@ static const FFlogo* getLogoAndroidSmall()
    FF_LOGO_COLORS(
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -170,6 +222,8 @@ static const FFlogo* getLogoArch()
    FF_LOGO_COLORS(
        "36" //cyan
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("36"); //cyan
    FF_LOGO_RETURN
 }

@@ -189,6 +243,8 @@ static const FFlogo* getLogoArchSmall()
    FF_LOGO_COLORS(
        "36" //cyan
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("36"); //cyan
    FF_LOGO_RETURN
 }

@@ -221,6 +277,8 @@ static const FFlogo* getLogoArtix()
    FF_LOGO_COLORS(
        "36" //cyan
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("36"); //cyan
    FF_LOGO_RETURN
 }

@@ -240,6 +298,8 @@ static const FFlogo* getLogoArtixSmall()
    FF_LOGO_COLORS(
        "36" //cyan
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("36"); //cyan
    FF_LOGO_RETURN
 }

@@ -273,6 +333,8 @@ static const FFlogo* getLogoArcoLinux()
        "34", //blue
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("34"); //green
+    FF_LOGO_COLOR_TITLE("34"); //green
    FF_LOGO_RETURN
 }

@@ -303,6 +365,8 @@ static const FFlogo* getLogoBedrock()
        "90", //grey
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("90"); //grey
+    FF_LOGO_COLOR_TITLE("37"); //white
    FF_LOGO_RETURN
 }

@@ -339,9 +403,34 @@ static const FFlogo* getLogoCachyOS()
        "32", //green
        "30"  //black
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("36"); //cyan
    FF_LOGO_RETURN
 }

+static const FFlogo* getLogoCachyOSSmall()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("cachy_small", "cachyos_small", "cachy-linux-small", "cachyos-linux-small")
+    FF_LOGO_LINES(
+        "   /''''''''''''/\n"
+        "  /''''''''''''/\n"
+        " /''''''/\n"
+        "/''''''/\n"
+        "\\......\\\n"
+        " \\......\\\n"
+        "  \\.............../\n"
+        "   \\............./\n"
+    )
+    FF_LOGO_COLORS(
+        "36" //cyan
+    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("36"); //cyan
+    FF_LOGO_RETURN
+}
+
+
 static const FFlogo* getLogoCelOS()
 {
    FF_LOGO_INIT
@@ -367,6 +456,8 @@ static const FFlogo* getLogoCelOS()
        "35", //magenta
        "30" //black
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -402,6 +493,8 @@ static const FFlogo* getLogoCentOS()
        "35", //magenta
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("33"); //yellow
    FF_LOGO_RETURN
 }

@@ -424,6 +517,8 @@ static const FFlogo* getLogoCentOSSmall()
        "34", //blue
        "35" //magenta
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("33"); //yellow
    FF_LOGO_RETURN
 }

@@ -454,6 +549,8 @@ static const FFlogo* getLogoDebian()
        "31", //red
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("31"); //red
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -472,6 +569,8 @@ static const FFlogo* getLogoDebianSmall()
    FF_LOGO_COLORS(
        "31" //red
    )
+    FF_LOGO_COLOR_KEYS("31"); //red
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -499,6 +598,8 @@ static const FFlogo* getLogoDevuan()
    FF_LOGO_COLORS(
        "35" //magenta
    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("35"); //magenta
    FF_LOGO_RETURN
 }

@@ -516,8 +617,10 @@ static const FFlogo* getLogoDevuanSmall()
        "#@@@#=:\n"
    )
    FF_LOGO_COLORS(
-        "34" //blue
+        "35" //magenta
    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("35"); //magenta
    FF_LOGO_RETURN
 }

@@ -548,6 +651,8 @@ static const FFlogo* getLogoDeepin()
    FF_LOGO_COLORS(
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -577,6 +682,8 @@ static const FFlogo* getLogoEndeavour()
        "31", //red
        "34" //blue
    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -609,6 +716,8 @@ static const FFlogo* getLogoFedora()
        "34", //blue
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -630,6 +739,8 @@ static const FFlogo* getLogoFedoraSmall()
    FF_LOGO_COLORS(
        "34" //blue
    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -660,6 +771,8 @@ static const FFlogo* getLogoFedoraOld()
        "34", //blue
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -690,6 +803,8 @@ static const FFlogo* getLogoGaruda()
    FF_LOGO_COLORS(
        "31" //red
    )
+    FF_LOGO_COLOR_KEYS("31"); //red
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -721,6 +836,8 @@ static const FFlogo* getLogoGentoo()
        "35", //magenta
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("35"); //magenta
    FF_LOGO_RETURN
 }

@@ -741,6 +858,8 @@ static const FFlogo* getLogoGentooSmall()
        "35", //magenta
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("35"); //magenta
    FF_LOGO_RETURN
 }

@@ -772,6 +891,31 @@ static const FFlogo* getLogoKDENeon()
    FF_LOGO_COLORS(
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
+    FF_LOGO_RETURN
+}
+
+static const FFlogo* getLogoKISSLinux()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("kiss", "kiss-linux", "kisslinux")
+    FF_LOGO_LINES(
+        "   $3 ___     \n"
+        "   ($2.· $3|     \n"
+        "   ($1<> $3|     \n"
+        "  / $2__$3  \\    \n"
+        " ( $1/  \\ $3/|   \n"
+        "$1_$3/\\ $2__)$3/$1_$3)   \n"
+        "$1\\/$3-____$1\\/$2    \n"
+    )
+    FF_LOGO_COLORS(
+        "35", //magenta
+        "37", //white
+        "34" //blue
+    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -805,6 +949,36 @@ static const FFlogo* getLogoKubuntu()
        "34", //blue
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
+    FF_LOGO_RETURN
+}
+
+static const FFlogo* getLogoLangitKetujuh()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("l7", "langitketujuh", "LangitKetujuh")
+    FF_LOGO_LINES(
+	"\n"
+	"\n"
+	"   $2. '7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7\n"
+	"   $2L7.   '7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7\n"
+	"   $2L7L7L      7L7L7L7L7L7L7L7L7L7L7L7L7L7\n"
+	"   $2L7L7L7                          L7L7L7\n"
+	"   $2L7L7L7           'L7L7L7L7L7L7L7L7L7L7\n"
+	"   $2L7L7L7               'L7L7L7L7L7L7L7L7\n"
+	"   $2L7L7L7                   'L7L7L7L7L7L7\n"
+	"   $2L7L7L7                          L7L7L7\n"
+	"   $2L7L7L7L7L7L7L7L7L7L7LL7L7L7.    '7L7L7\n"
+	"   $2L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L.   'L7\n"
+	"   $2L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7.  '\n"
+    )
+    FF_LOGO_COLORS(
+        "34", //blue
+        "37" //white
+    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -831,6 +1005,43 @@ static const FFlogo* getLogoLinux()
        "30", //black
        "33" //yellow
    )
+    FF_LOGO_COLOR_KEYS("37"); //white
+    FF_LOGO_COLOR_TITLE("37"); //white
+    FF_LOGO_RETURN
+}
+
+static const FFlogo* getLogoMacOS()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("macos", "mac", "apple", "darwin", "osx")
+    FF_LOGO_LINES(
+        "                     $1c.'\n"
+        "                 ,xNMM.\n"
+        "               .OMMMMo\n"
+        "               lMM\"\n"
+        "     .;loddo:.  .olloddol;.\n"
+        "   cKMMMMMMMMMMNWMMMMMMMMMM0:\n"
+        " $2.KMMMMMMMMMMMMMMMMMMMMMMMWd.\n"
+        " XMMMMMMMMMMMMMMMMMMMMMMMX.\n"
+        "$3;MMMMMMMMMMMMMMMMMMMMMMMM:\n"
+        ":MMMMMMMMMMMMMMMMMMMMMMMM:\n"
+        ".MMMMMMMMMMMMMMMMMMMMMMMMX.\n"
+        " kMMMMMMMMMMMMMMMMMMMMMMMMWd.\n"
+        " $4'XMMMMMMMMMMMMMMMMMMMMMMMMMMk\n"
+        "  'XMMMMMMMMMMMMMMMMMMMMMMMMK.\n"
+        "    $5kMMMMMMMMMMMMMMMMMMMMMMd\n"
+        "     ;KMMMMMMMWXXWMMMMMMMk.\n"
+        "       \"cooc*\"    \"*coo'\""
+    )
+    FF_LOGO_COLORS(
+        "32", //green
+        "33", //yellow
+        "31", //red
+        "35", //magenta
+        "34" //blue
+    )
+    FF_LOGO_COLOR_KEYS("33"); //yellow
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -857,6 +1068,8 @@ static const FFlogo* getLogoManjaro()
    FF_LOGO_COLORS(
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -876,6 +1089,8 @@ static const FFlogo* getLogoManjaroSmall()
    FF_LOGO_COLORS(
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -908,6 +1123,8 @@ static const FFlogo* getLogoMint()
        "32", //green
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -928,6 +1145,8 @@ static const FFlogo* getLogoMintSmall()
        "32", //green
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -957,6 +1176,49 @@ static const FFlogo* getLogoMintOld()
        "32", //green
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
+    FF_LOGO_RETURN
+}
+
+static const FFlogo* getLogoMsys2()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("msys2")
+    FF_LOGO_LINES(
+        "$2                 ...\n"
+        "              5GB###GJ.             !YPGGGG\n"
+        "              7@@@@@@@B.          :G@@@@@@@\n"
+        "              7@@@@@@@@Y         ~&@@@@@@@@$3YJYY5YY?L\n"
+        "             $2!@@@@@@@@@@^       ^&@@@@@@@$3#PP555555PBY\n"
+        "            $2~&@@@@@@@@@@?      ^&@@@@@@$3#5YY5YYYYYYYY#7\n"
+        "           $2^&@@@@@@@@@@@B     :#@@@@@@@$3G5BBYGPYYYYYY#J\n"
+        "          $2^#@@@&J#@@@@@@@~   .B@@@@@@@@@@@P $3?#YYYYYPB.\n"
+        "         $2:#@@@@7 G@@@@@@@J   P@@@#!&@@@@@@G$3.GGYYYYGB^\n"
+        "        $2:#@@@@J  Y@@@@@@@B  5@@@&:.&@@@@@@&$3BBYYY5B5.\n"
+        "       $2:#@@@@Y   !@@@@@@@@!Y@@@&~ .#@@@@@@$3GYYYYYBP  JP~\n"
+        "      $2:#@@@@P    :&@@@@@@@@@@@&~   B@@@@@$3#5YYYYYPGPGPGG\n"
+        "     $2^#@@@@G.     P@@@@@@@@@@@!    P@@@@$3GYYYYYYYYYYYYBY\n"
+        "    $2^#@@@@B:      ^@@@@@@@@@@7     !@@@$3#GGGGGGGPPPP5GB:\n"
+        "   $2!&@@@@B:        Y@@@@@@@@?       P@@@@@@@@@&?  $3^PY:\n"
+        "  $27&@@@@5.          P@@@@@@?         P@@@@@@@@@B\n"
+        " Y@@@&P!             5@@@@7           7G@@@@@&P~\n"
+        ".JJ?~:                ^JY~              ^!5J!^:\n"
+        "                             $1:@P5#B. #G  7&^ :@P5#B.\n"
+        "                             !&P^.   ?@~ #P  !&P^.  \n"
+        "                              .?BG!   #G5@~   .?BG! \n"
+        "                               :.B@.  7@@5     :.B@.\n"
+        "                             !PYY5Y   :&@^   !PYY5Y \n"
+        "                                      ~@Y\n"
+        "                                      !5:"
+    )
+    FF_LOGO_COLORS(
+        "35", //magenta
+        "37", //white
+        "31" //red
+    )
+    FF_LOGO_COLOR_KEYS("35"); //magenta
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -990,6 +1252,8 @@ static const FFlogo* getLogoNixOS()
        "34", //blue
        "36" //cyan
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -1031,6 +1295,8 @@ static const FFlogo* getLogoNixOsOld()
        "34", //blue
        "36" //cyan
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -1050,6 +1316,8 @@ static const FFlogo* getLogoNixOsSmall()
    FF_LOGO_COLORS(
        "34" //blue
    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -1081,6 +1349,8 @@ static const FFlogo* getLogoOpenSuse()
        "32", //green
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -1100,6 +1370,8 @@ static const FFlogo* getLogoOpenSuseSmall()
    FF_LOGO_COLORS(
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -1108,7 +1380,7 @@ static const FFlogo* getLogoOpenSuseLeap()
    FF_LOGO_INIT
    FF_LOGO_NAMES("opensuse_leap", "open_suse_leap", "opensuse-leap", "open-suse-leap", "suse_leap", "suse-leap", "opensuseleap")
    FF_LOGO_LINES(
-        "                 $2.-++:.\n"
+        "                 .-++:.\n"
        "               ./oooooo/-\n"
        "            `:oooooooooooo:.\n"
        "          -+oooooooooooooooo+-`\n"
@@ -1126,9 +1398,10 @@ static const FFlogo* getLogoOpenSuseLeap()
        "                  `:/."
    )
    FF_LOGO_COLORS(
-        "32", //green
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -1137,7 +1410,7 @@ static const FFlogo* getLogoOpenSuseTumbleweed()
    FF_LOGO_INIT
    FF_LOGO_NAMES("opensuse_tumbleweed", "open_suse_tumbleweed", "opensuse-tumbleweed", "open-suse-tumbleweed", "suse_tumbleweed", "suse-tumbleweed", "opensusetumbleweed")
    FF_LOGO_LINES(
-        "                                    $2......\n"
+        "                                    ......\n"
        "     .,cdxxxoc,.               .:kKMMMNWMMMNk:.\n"
        "    cKMMN0OOOKWMMXo. ;        ;0MWk:.      .:OMMk.\n"
        "  ;WMK;.       .lKMMNM,     :NMK,             .OMW;\n"
@@ -1152,9 +1425,10 @@ static const FFlogo* getLogoOpenSuseTumbleweed()
        "         .....                    .:dOOXXKOxl,"
    )
    FF_LOGO_COLORS(
-        "32", //green
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -1188,6 +1462,8 @@ static const FFlogo* getLogoPop()
        "36", //cyan
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("36"); //cyan
    FF_LOGO_RETURN
 }

@@ -1208,6 +1484,8 @@ static const FFlogo* getLogoPopSmall()
    FF_LOGO_COLORS(
        "36" //cyan
    )
+    FF_LOGO_COLOR_KEYS("36"); //cyan
+    FF_LOGO_COLOR_TITLE("36"); //cyan
    FF_LOGO_RETURN
 }

@@ -1241,6 +1519,8 @@ static const FFlogo* getLogoReborn()
        "34", //blue
        "36" //cyan
    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -1264,6 +1544,8 @@ static const FFlogo* getLogoRebornSmall()
    FF_LOGO_COLORS(
        "34" //blue
    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -1294,6 +1576,8 @@ static const FFlogo* getLogoRedHatEnterpriseLinux()
    FF_LOGO_COLORS(
        "31" //red
    )
+    FF_LOGO_COLOR_KEYS("31"); //red
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -1324,6 +1608,8 @@ static const FFlogo* getLogoRedstarOS()
    FF_LOGO_COLORS(
        "31" //red
    )
+    FF_LOGO_COLOR_KEYS("31"); //red
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -1355,6 +1641,99 @@ static const FFlogo* getLogoRockyLinux()
    FF_LOGO_COLORS(
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("32"); //green
+    FF_LOGO_COLOR_TITLE("32"); //green
+    FF_LOGO_RETURN
+}
+
+static const FFlogo* getLogoRosaLinux()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("rosa", "rosa-linux", "rosalinux")
+    FF_LOGO_LINES(
+        "            ROSAROSAROSAROSAR\n"
+        "        ROSA               AROS\n"
+        "      ROS   SAROSAROSAROSAR   AROS\n"
+        "    RO   ROSAROSAROSAROSAROSAR   RO\n"
+        "  ARO  AROSAROSAROSARO      AROS  ROS\n"
+        " ARO  ROSAROS         OSAR   ROSA  ROS\n"
+        " RO  AROSA   ROSAROSAROSA    ROSAR  RO\n"
+        "RO  ROSAR  ROSAROSAROSAR  R  ROSARO  RO\n"
+        "RO  ROSA  AROSAROSAROSA  AR  ROSARO  AR\n"
+        "RO AROS  ROSAROSAROSA   ROS  AROSARO AR\n"
+        "RO AROS  ROSAROSARO   ROSARO  ROSARO AR\n"
+        "RO  ROS  AROSAROS   ROSAROSA AROSAR  AR\n"
+        "RO  ROSA  ROS     ROSAROSAR  ROSARO  RO\n"
+        " RO  ROS     AROSAROSAROSA  ROSARO  AR\n"
+        " ARO  ROSA   ROSAROSAROS   AROSAR  ARO\n"
+        "  ARO  OROSA      R      ROSAROS  ROS\n"
+        "    RO   AROSAROS   AROSAROSAR   RO\n"
+        "     AROS   AROSAROSAROSARO   AROS\n"
+        "        ROSA               SARO\n"
+        "           ROSAROSAROSAROSAR"
+    )
+    FF_LOGO_COLORS(
+        "34" //blue
+    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
+    FF_LOGO_RETURN
+}
+
+static const FFlogo* getLogoSlackware()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("slackware", "slackware-linux", "slackwarelinux")
+    FF_LOGO_LINES(
+        "                  :::::::::\n"
+        "            :::::::::::::::::::\n"
+        "         :::::::::::::::::::::::::\n"
+        "       ::::::::$2cllcccccllllllll$1::::::\n"
+        "    :::::::::$2lc               dc$1:::::::\n"
+        "   ::::::::$2cl   clllccllll    oc$1:::::::::\n"
+        "  :::::::::$2o   lc$1::::::::$2co   oc$1::::::::::\n"
+        " ::::::::::$2o    cccclc$1:::::$2clcc$1::::::::::::\n"
+        " :::::::::::$2lc        cclccclc$1:::::::::::::\n"
+        "::::::::::::::$2lcclcc          lc$1::::::::::::\n"
+        "::::::::::$2cclcc$1:::::$2lccclc     oc$1:::::::::::\n"
+        "::::::::::$2o    l$1::::::::::$2l    lc$1:::::::::::\n"
+        " :::::$2cll$1:$2o     clcllcccll     o$1:::::::::::\n"
+        " :::::$2occ$1:$2o                  clc$1:::::::::::\n"
+        "  ::::$2ocl$1:$2ccslclccclclccclclc$1:::::::::::::\n"
+        "   :::$2oclcccccccccccccllllllllllllll$1:::::\n"
+        "    ::$2lcc1lcccccccccccccccccccccccco$1::::\n"
+        "      ::::::::::::::::::::::::::::::::\n"
+        "        ::::::::::::::::::::::::::::\n"
+        "           ::::::::::::::::::::::\n"
+        "                ::::::::::::"
+    )
+    FF_LOGO_COLORS(
+        "34", //blue
+        "37" //white
+    )
+    FF_LOGO_COLOR_KEYS("34") //blue
+    FF_LOGO_COLOR_TITLE("34") //blue
+    FF_LOGO_RETURN
+}
+
+static const FFlogo* getLogoSlackwareSmall()
+{
+    FF_LOGO_INIT
+    FF_LOGO_NAMES("slackware-small", "slackware-linux-small", "slackware_small", "slackwarelinux_small")
+    FF_LOGO_LINES(
+        "   ________\n"
+        "  /  ______|\n"
+        "  | |______\n"
+        "  \\______  \\\n"
+        "   ______| |\n"
+        "| |________/\n"
+        "|____________"
+    )
+    FF_LOGO_COLORS(
+        "34" //blue
+    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -1388,6 +1767,8 @@ static const FFlogo* getLogoUbuntu()
        "31", //red
        "37" //white
    )
+    FF_LOGO_COLOR_KEYS("31"); //red
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -1406,6 +1787,8 @@ static const FFlogo* getLogoUbuntuSmall()
    FF_LOGO_COLORS(
        "31" //red
    )
+    FF_LOGO_COLOR_KEYS("31"); //red
+    FF_LOGO_COLOR_TITLE("31"); //red
    FF_LOGO_RETURN
 }

@@ -1437,6 +1820,8 @@ static const FFlogo* getLogoVoid()
        "32", //green
        "30" //black
    )
+    FF_LOGO_COLOR_KEYS("37"); //white
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -1456,6 +1841,8 @@ static const FFlogo* getLogoVoidSmall()
    FF_LOGO_COLORS(
        "32" //green
    )
+    FF_LOGO_COLOR_KEYS("37"); //white
+    FF_LOGO_COLOR_TITLE("32"); //green
    FF_LOGO_RETURN
 }

@@ -1485,6 +1872,8 @@ static const FFlogo* getLogoZorin()
    FF_LOGO_COLORS(
        "34" //blue
    )
+    FF_LOGO_COLOR_KEYS("34"); //blue
+    FF_LOGO_COLOR_TITLE("34"); //blue
    FF_LOGO_RETURN
 }

@@ -1493,6 +1882,7 @@ GetLogoMethod* ffLogoBuiltinGetAll()
    static GetLogoMethod logoMethods[] = {
        ffLogoBuiltinGetUnknown,
        getLogoNone,
+        getLogoAlmaLinux,
        getLogoAlpine,
        getLogoAlpineSmall,
        getLogoAndroid,
@@ -1504,6 +1894,7 @@ GetLogoMethod* ffLogoBuiltinGetAll()
        getLogoArtixSmall,
        getLogoBedrock,
        getLogoCachyOS,
+        getLogoCachyOSSmall,
        getLogoCelOS,
        getLogoCentOS,
        getLogoCentOSSmall,
@@ -1520,13 +1911,17 @@ GetLogoMethod* ffLogoBuiltinGetAll()
        getLogoGentoo,
        getLogoGentooSmall,
        getLogoKDENeon,
+        getLogoKISSLinux,
        getLogoKubuntu,
+        getLogoLangitKetujuh,
        getLogoLinux,
+        getLogoMacOS,
        getLogoManjaro,
        getLogoManjaroSmall,
        getLogoMint,
        getLogoMintSmall,
        getLogoMintOld,
+        getLogoMsys2,
        getLogoNixOS,
        getLogoNixOsOld,
        getLogoNixOsSmall,
@@ -1541,6 +1936,9 @@ GetLogoMethod* ffLogoBuiltinGetAll()
        getLogoRedHatEnterpriseLinux,
        getLogoRedstarOS,
        getLogoRockyLinux,
+        getLogoRosaLinux,
+        getLogoSlackware,
+        getLogoSlackwareSmall,
        getLogoUbuntu,
        getLogoUbuntuSmall,
        getLogoVoid,
@@ -15,7 +15,7 @@ static void* logoResize(const void* image, size_t width, size_t height, void* ex
 FFLogoImageResult ffLogoPrintImageIM6(FFinstance* instance, FFLogoRequestData* requestData)
 {
    FF_LIBRARY_LOAD(imageMagick, instance->config.libImageMagick, FF_LOGO_IMAGE_RESULT_INIT_ERROR, "libMagickCore-6.Q16HDRI.so", 8, "libMagickCore-6.Q16.so", 8)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(imageMagick, ffResizeImage, ResizeImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR);
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(imageMagick, ffResizeImage, ResizeImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR);

    FFIMData imData;
    imData.resizeFunc = logoResize;
@@ -15,7 +15,7 @@ static void* logoResize(const void* image, size_t width, size_t height, void* ex
 FFLogoImageResult ffLogoPrintImageIM7(FFinstance* instance, FFLogoRequestData* requestData)
 {
    FF_LIBRARY_LOAD(imageMagick, instance->config.libImageMagick, FF_LOGO_IMAGE_RESULT_INIT_ERROR, "libMagickCore-7.Q16HDRI.so", 11, "libMagickCore-7.Q16.so", 11)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(imageMagick, ffResizeImage, ResizeImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR);
+    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(imageMagick, ffResizeImage, ResizeImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR);

    FFIMData imData;
    imData.resizeFunc = logoResize;
@@ -282,9 +282,9 @@ FFLogoImageResult ffLogoPrintImageImpl(FFinstance* instance, FFLogoRequestData*

    ImageData imageData;

-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(imData->library, imageData.ffCopyMagickString, CopyMagickString, FF_LOGO_IMAGE_RESULT_INIT_ERROR)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(imData->library, imageData.ffImageToBlob, ImageToBlob, FF_LOGO_IMAGE_RESULT_INIT_ERROR)
-    FF_LIBRARY_LOAD_SYMBOL_ADRESS(imData->library, imageData.ffBase64Encode, Base64Encode, FF_LOGO_IMAGE_RESULT_INIT_ERROR)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(imData->library, imageData, CopyMagickString, FF_LOGO_IMAGE_RESULT_INIT_ERROR)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(imData->library, imageData, ImageToBlob, FF_LOGO_IMAGE_RESULT_INIT_ERROR)
+    FF_LIBRARY_LOAD_SYMBOL_VAR(imData->library, imageData, Base64Encode, FF_LOGO_IMAGE_RESULT_INIT_ERROR)

    imageData.exceptionInfo = ffAcquireExceptionInfo();
    if(imageData.exceptionInfo == NULL)
@@ -1,7 +1,7 @@
 #include "logo.h"
 #include "common/io.h"
 #include "common/printing.h"
-#include "detection/os.h"
+#include "detection/os/os.h"
 #include "detection/terminalshell.h"

 #include <ctype.h>
@@ -150,10 +150,13 @@ void ffLogoPrintChars(FFinstance* instance, const char* data, bool doColorReplac
        printf("\033[%uA", instance->state.logoHeight);
 }

-static void logoApplyMainColor(FFinstance* instance, const FFlogo* logo)
+static void logoApplyColors(FFinstance* instance, const FFlogo* logo)
 {
-    if(instance->config.mainColor.length == 0)
-        ffStrbufAppendS(&instance->config.mainColor, logo->builtinColors[0]);
+    if(instance->config.colorKeys.length == 0)
+        ffStrbufAppendS(&instance->config.colorKeys, logo->colorKeys);
+
+    if(instance->config.colorTitle.length == 0)
+        ffStrbufAppendS(&instance->config.colorTitle, logo->colorTitle);
 }

 static bool logoHasName(const FFlogo* logo, const char* name)
@@ -214,14 +217,14 @@ static const FFlogo* logoGetBuiltinDetected(FFinstance* instance)
    return ffLogoBuiltinGetUnknown();
 }

-static inline void logoApplyMainColorDetected(FFinstance* instance)
+static inline void logoApplyColorsDetected(FFinstance* instance)
 {
-    logoApplyMainColor(instance, logoGetBuiltinDetected(instance));
+    logoApplyColors(instance, logoGetBuiltinDetected(instance));
 }

 static void logoPrintStruct(FFinstance* instance, const FFlogo* logo)
 {
-    logoApplyMainColor(instance, logo);
+    logoApplyColors(instance, logo);

    const char** colors = logo->builtinColors;
    for(int i = 0; *colors != NULL && i < FASTFETCH_LOGO_MAX_COLORS; i++, colors++)
@@ -259,7 +262,7 @@ static bool logoPrintFileIfExists(FFinstance* instance, bool doColorReplacement)
        return false;
    }

-    logoApplyMainColorDetected(instance);
+    logoApplyColorsDetected(instance);
    ffLogoPrintChars(instance, content.chars, doColorReplacement);
    ffStrbufDestroy(&content);
    return true;
@@ -270,7 +273,7 @@ static bool logoPrintImageIfExists(FFinstance* instance, FFLogoType logo)
    if(!ffLogoPrintImageIfExists(instance, logo))
        return false;

-    logoApplyMainColorDetected(instance);
+    logoApplyColorsDetected(instance);
    return true;
 }

@@ -10,6 +10,8 @@ typedef struct FFlogo
    const char* data;
    const char** names; //Null terminated
    const char** builtinColors; //Null terminated
+    const char* colorKeys;
+    const char* colorTitle;
 } FFlogo;

 typedef const FFlogo*(*GetLogoMethod)();
@@ -1,213 +1,51 @@
 #include "fastfetch.h"
-#include "common/io.h"
-#include "common/properties.h"
 #include "common/printing.h"
 #include "common/caching.h"
-#include "detection/temps.h"
-
-#include <stdlib.h>
+#include "detection/cpu/cpu.h"

 #define FF_CPU_MODULE_NAME "CPU"
-#define FF_CPU_NUM_FORMAT_ARGS 15
-
-static double getGhz(const char* policyFile, const char* cpuFile)
-{
-    FFstrbuf content;
-    ffStrbufInit(&content);
-
-    ffReadFileBuffer(policyFile, &content);
-    if(content.length == 0)
-        ffReadFileBuffer(cpuFile, &content);
-
-    double herz = ffStrbufToDouble(&content);
-
-    ffStrbufDestroy(&content);
-
-    //ffStrbufToDouble failed
-    if(herz != herz)
-        return 0;
-
-    herz /= 1000.0; //to MHz
-    return herz / 1000.0; //to GHz
-}
-
-static double detectCPUTemp(const FFinstance* instance)
-{
-    const FFTempsResult *temps = ffDetectTemps(instance);
-
-    for(uint32_t i = 0; i < temps->values.length; i++)
-    {
-        FFTempValue* value = ffListGet(&temps->values, i);
-
-        if(
-            ffStrbufFirstIndexS(&value->name, "cpu") < value->name.length ||
-            ffStrbufCompS(&value->name, "k10temp") == 0 ||
-            ffStrbufCompS(&value->name, "coretemp") == 0
-        ) return value->value;
-    }
-
-    return 0.0 / 0.0; //NaN
-}
+#define FF_CPU_NUM_FORMAT_ARGS 8

 void ffPrintCPU(FFinstance* instance)
 {
    if(ffPrintFromCache(instance, FF_CPU_MODULE_NAME, &instance->config.cpu, FF_CPU_NUM_FORMAT_ARGS))
        return;

-    FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
-    if(cpuinfo == NULL)
+    const FFCPUResult* cpu = ffDetectCPU();
+
+    if(cpu->vendor.length == 0 && cpu->name.length == 0 && cpu->coresOnline == 0)
    {
-        ffPrintError(instance, FF_CPU_MODULE_NAME, 0, &instance->config.cpu, "fopen(\"""/proc/cpuinfo\", \"r\") == NULL");
+        ffPrintError(instance, FF_CPU_MODULE_NAME, 0, &instance->config.cpu, "No CPU detected");
        return;
    }

-    FFstrbuf name;
-    ffStrbufInitA(&name, 64);
+    FFstrbuf output;
+    ffStrbufInitA(&output, 128);

-    FFstrbuf vendor;
-    ffStrbufInitA(&vendor, 64);
-
-    FFstrbuf physicalCoresString;
-    ffStrbufInit(&physicalCoresString);
-
-    FFstrbuf procGhzString;
-    ffStrbufInit(&procGhzString);
-
-    char* line = NULL;
-    size_t len = 0;
-
-    while(getline(&line, &len, cpuinfo) != -1)
+    if(cpu->name.length > 0)
+        ffStrbufAppend(&output, &cpu->name);
+    else if(cpu->vendor.length > 0)
    {
-        //Stop after the first CPU
-        if(name.length > 0 && (*line == '\0' || *line == '\n'))
-            break;
-
-        (void)(
-            ffParsePropLine(line, "model name :", &name) ||
-            ffParsePropLine(line, "vendor_id :", &vendor) ||
-            ffParsePropLine(line, "cpu cores :", &physicalCoresString) ||
-            ffParsePropLine(line, "cpu MHz :", &procGhzString) ||
-            (name.length == 0 && ffParsePropLine(line, "Hardware :", &name)) //For Android devices
-        );
-    }
-
-    if(line != NULL)
-        free(line);
-
-    fclose(cpuinfo);
-
-    double procGhz = ffStrbufToDouble(&procGhzString);
-    if(procGhz != procGhz)
-        procGhz = 0; //NaN
-    else
-        procGhz /= 1000.0; //To GHz
-
-    ffStrbufDestroy(&procGhzString);
-
-    double biosLimit      = getGhz("/sys/devices/system/cpu/cpufreq/policy0/bios_limit",       "/sys/devices/system/cpu/cpu0/cpufreq/bios_limit");
-    double scalingMaxFreq = getGhz("/sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq", "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq");
-    double scalingMinFreq = getGhz("/sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq", "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq");
-    double infoMaxFreq    = getGhz("/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_max_freq", "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq");
-    double infoMinFreq    = getGhz("/sys/devices/system/cpu/cpufreq/policy0/cpuinfo_min_freq", "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq");
-
-    int numProcsOnline = get_nprocs();
-    int numProcsAvailable = get_nprocs_conf();
-
-    int physicalCores = 1;
-    sscanf(physicalCoresString.chars, "%i", &physicalCores);
-    ffStrbufDestroy(&physicalCoresString);
-
-    //The current get_nprocs* returns 1 on failure. It also makes no sense to have a (1) as count
-    int numProcs = numProcsOnline;
-    if(numProcs <= 1)
-        numProcs = numProcsAvailable;
-    if(numProcs <= 1)
-        numProcs = physicalCores;
-
-    double ghz = biosLimit;
-    if(ghz == 0)
-        ghz = scalingMaxFreq;
-    if(ghz == 0)
-        ghz = infoMaxFreq;
-    if(ghz == 0)
-        ghz = procGhz;
-    if(ghz == 0)
-        ghz = scalingMinFreq;
-    if(ghz == 0)
-        ghz = infoMinFreq;
-
-    if(
-        name.length == 0 &&
-        vendor.length == 0 &&
-        numProcs <= 1 &&
-        ghz <= 0
-    ) {
-        ffStrbufDestroy(&name);
-        ffStrbufDestroy(&vendor);
-        ffPrintError(instance, FF_CPU_MODULE_NAME, 0, &instance->config.cpu, "No CPU info found in /proc/cpuinfo");
-        return;
-    }
-
-    FFstrbuf namePretty;
-    ffStrbufInitA(&namePretty, 64);
-    ffStrbufAppend(&namePretty, &name);
-
-    const char* removeStrings[] = {
-        "(R)", "(r)", "(TM)", "(tm)",
-        " CPU", " FPU", " APU", " Processor",
-        " Dual-Core", " Quad-Core", " Six-Core", " Eight-Core", " Ten-Core",
-        " 2-Core", " 4-Core", " 6-Core", " 8-Core", " 10-Core", " 12-Core", " 14-Core", " 16-Core"
-    };
-
-    ffStrbufRemoveStringsA(&namePretty, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
-    ffStrbufSubstrBeforeFirstC(&namePretty, '@'); //Cut the speed output in the name as we append our own
-    ffStrbufTrimRight(&namePretty, ' '); //If we removed the @ in previous step there was most likely a space before it
-
-    double cpuTemp;
-    if(instance->config.cpu.outputFormat.length > 0)
-        cpuTemp = detectCPUTemp(instance);
-
-    FFstrbuf cpu;
-    ffStrbufInitA(&cpu, 128);
-
-    if(namePretty.length > 0)
-        ffStrbufAppend(&cpu, &namePretty);
-    else if(name.length > 0)
-        ffStrbufAppend(&cpu, &name);
-    else if(vendor.length > 0)
-    {
-        ffStrbufAppend(&cpu, &vendor);
-        ffStrbufAppendS(&cpu, " CPU");
+        ffStrbufAppend(&output, &cpu->vendor);
+        ffStrbufAppendS(&output, " CPU");
    }
    else
-        ffStrbufAppendS(&cpu, "CPU");
+        ffStrbufAppendS(&output, "CPU");

-    if(numProcs > 1)
-        ffStrbufAppendF(&cpu, " (%i)", numProcs);
+    if(cpu->coresOnline > 1)
+        ffStrbufAppendF(&output, " (%u)", cpu->coresOnline);

-    if(ghz > 0)
-        ffStrbufAppendF(&cpu, " @ %.9gGHz", ghz);
+    if(cpu->frequencyMax > 0.0)
+        ffStrbufAppendF(&output, " @ %.9gGHz", cpu->frequencyMax);

-    ffPrintAndWriteToCache(instance, FF_CPU_MODULE_NAME, &instance->config.cpu, &cpu, FF_CPU_NUM_FORMAT_ARGS, (FFformatarg[]){
-        {FF_FORMAT_ARG_TYPE_STRBUF, &name},
-        {FF_FORMAT_ARG_TYPE_STRBUF, &namePretty},
-        {FF_FORMAT_ARG_TYPE_STRBUF, &vendor},
-        {FF_FORMAT_ARG_TYPE_INT, &numProcsOnline},
-        {FF_FORMAT_ARG_TYPE_INT, &numProcsAvailable},
-        {FF_FORMAT_ARG_TYPE_INT, &physicalCores},
-        {FF_FORMAT_ARG_TYPE_INT, &numProcs},
-        {FF_FORMAT_ARG_TYPE_DOUBLE, &cpuTemp},
-        {FF_FORMAT_ARG_TYPE_DOUBLE, &biosLimit},
-        {FF_FORMAT_ARG_TYPE_DOUBLE, &scalingMaxFreq},
-        {FF_FORMAT_ARG_TYPE_DOUBLE, &scalingMinFreq},
-        {FF_FORMAT_ARG_TYPE_DOUBLE, &infoMaxFreq},
-        {FF_FORMAT_ARG_TYPE_DOUBLE, &infoMinFreq},
-        {FF_FORMAT_ARG_TYPE_DOUBLE, &procGhz},
-        {FF_FORMAT_ARG_TYPE_DOUBLE, &ghz}
+    ffPrintAndWriteToCache(instance, FF_CPU_MODULE_NAME, &instance->config.cpu, &output, FF_CPU_NUM_FORMAT_ARGS, (FFformatarg[]){
+        {FF_FORMAT_ARG_TYPE_STRBUF, &cpu->name},
+        {FF_FORMAT_ARG_TYPE_STRBUF, &cpu->vendor},
+        {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresPhysical},
+        {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresLogical},
+        {FF_FORMAT_ARG_TYPE_UINT16, &cpu->coresOnline},
+        {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->frequencyMin},
+        {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->frequencyMax},
+        {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu->temperature}
    });
-
-    ffStrbufDestroy(&cpu);
-    ffStrbufDestroy(&namePretty);
-    ffStrbufDestroy(&name);
-    ffStrbufDestroy(&vendor);
 }
@@ -4,7 +4,7 @@
 #include "common/parsing.h"
 #include "common/settings.h"
 #include "detection/gtk.h"
-#include "detection/displayserver.h"
+#include "detection/displayserver/displayserver.h"

 #include <stdlib.h>

@@ -4,5 +4,6 @@
 void ffPrintCustom(FFinstance* instance, const char* key, const char* value)
 {
    ffPrintLogoAndKey(instance, key, 0, NULL);
-    puts(value);
+    ffPrintUserString(value);
+    puts(FASTFETCH_TEXT_MODIFIER_RESET);
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Linus Dierheimer	ddb0c344f5	Release 1.7.1 second try	2022-09-15 16:11:05 +02:00
Linus Dierheimer	67e433750a	Release 1.7.1	2022-09-15 16:02:55 +02:00
Linus Dierheimer	c4b024ec6c	Update bash completion	2022-09-15 15:41:24 +02:00
Linus Dierheimer	e98c18a64b	Fix two compiler warnings	2022-09-15 12:10:48 +02:00
Linus Dierheimer	acba1d29d9	Enable multithreading on macos	2022-09-15 11:59:06 +02:00
Linus Dierheimer	dd0f6354ef	MacOS custom WM support	2022-09-15 01:58:31 -07:00
Linus Dierheimer	0e2d353500	Merge pull request #232 from CarterLi/master Improve local-ip detection on macOS and print vulkan detection failing reason	2022-09-15 09:39:14 +02:00
李通洲	f9695f4148	Vulkan: print detailed reason of why failing instead of the general message `Failed to detect vulkan`	2022-09-15 13:32:08 +08:00
李通洲	8fdbadfbb2	LocalIp: fix `--localip-show-loop` on macOS loop on macOS is `lo0`	2022-09-15 13:27:27 +08:00
Linus Dierheimer	5c43119836	Fix used disk space calculation	2022-09-14 22:35:07 +02:00
Linus Dierheimer	545210e25e	Don't require FF_HAVE_OPENCL on Apple	2022-09-14 22:03:23 +02:00
Linus Dierheimer	6f60423c60	Unified gh actions for pull and push	2022-09-14 19:23:19 +02:00
Linus Dierheimer	6e6847a66b	Set more values in CMake project()	2022-09-14 19:12:51 +02:00
Linus Dierheimer	47c9fb9f6c	Refactore some macros	2022-09-14 19:03:50 +02:00
Linus Dierheimer	5e5c144582	Fix build on apple	2022-09-14 09:51:08 -07:00
Linus Dierheimer	ac330430bf	Link apple frameworks at compile time	2022-09-14 14:55:28 +02:00
Linus Dierheimer	52275b89dc	Try to unify linux and apple code paths	2022-09-14 12:41:43 +02:00
Linus Dierheimer	50bb06535c	Merge pull request #230 from CarterLi/master OpenGL / OpenCL: add macOS support	2022-09-13 06:19:40 -07:00
李通洲	a8b0e77189	OpenGL / OpenCL: add macOS support Note: FF_LIBRARY_LOAD and friends are not used because loading framework bundles are not supported by FF_LIBRARY_LOAD and support it is not easy. Since CGL is guaranteed to be supported by macOS system, we simply use static linking in this case.	2022-09-13 17:03:26 +08:00
Linus Dierheimer	b815464704	Merge pull request #226 from CarterLi/master OpenGL: add macOS support with SDL2	2022-09-12 06:24:43 -07:00
李通洲	93ac3f1971	Library: simplify macros	2022-09-12 21:10:05 +08:00
Carter Li	7c43e4b8e7	ci: show everything with fastfetch	2022-09-12 21:10:05 +08:00
Linus Dierheimer	d8e7588fc3	Merge pull request #229 from Evo112358/master Issue 223 pull request	2022-09-12 00:42:16 -07:00
Evo112358	9ea5de5efc	updated --help terminal-format	2022-09-12 15:57:05 +10:00
Evo112358	728759d38e	pull request to implement enhancement referenced in issue 223.	2022-09-12 15:51:53 +10:00
Linus Dierheimer	b0426828ab	Slackware logos #228	2022-09-11 21:10:32 +02:00
Linus Dierheimer	6de8153207	Make media detection more robust	2022-09-11 13:09:33 +02:00
Linus Dierheimer	2c4b80a093	Fix ENABLE_ZLIB requirements	2022-09-11 12:03:01 +02:00
Linus Dierheimer	c51903da35	GH Actions: share version as output	2022-09-11 11:56:00 +02:00
Linus Dierheimer	8b7092e4d4	gpu_apple.c: Use Ascii encoding	2022-09-11 02:44:19 -07:00
Linus Dierheimer	c54b7fbd57	Restore permissions after artifact upload	2022-09-11 11:10:02 +02:00
Linus Dierheimer	820854a2fa	Fix release action	2022-09-11 10:56:54 +02:00
Linus Dierheimer	ad4a71a2d5	Github actions: package for all platforms	2022-09-11 10:47:47 +02:00
Linus Dierheimer	22075e2d28	CMake: keep sysconfdir in cache	2022-09-09 22:43:53 +02:00
Linus Dierheimer	a926c9cf7e	Use vulkan as gpu fallback on all platforms	2022-09-09 20:43:24 +02:00
Linus Dierheimer	60c735d1a4	Enable Vulkan on MacOS	2022-09-09 20:37:56 +02:00
Linus Dierheimer	9466ee3e51	Even better GPU names	2022-09-09 17:53:19 +02:00
Linus Dierheimer	126c1a10bb	Correctly handle GPU names with multiple ']'	2022-09-09 17:48:55 +02:00
Linus Dierheimer	425e135bd8	Reintroduce gpu name modification	2022-09-09 17:47:16 +02:00
Linus Dierheimer	0a675fec8c	Give libpci a bigger buffer to work with #224	2022-09-09 17:40:08 +02:00
Linus Dierheimer	2c5b079b97	Apple M1 GPU support	2022-09-09 05:40:27 -07:00
Linus Dierheimer	0be1a41b5c	Update gpu_apple.c	2022-09-08 17:33:29 +02:00
Linus Dierheimer	883e0450b0	Correct intendation	2022-09-08 15:27:53 +02:00
Linus Dierheimer	2fc8a7e70b	Better brew package detection	2022-09-08 06:26:26 -07:00
Linus Dierheimer	be7f8f4117	Swap module #225	2022-09-08 14:51:31 +02:00
Linus Dierheimer	dd60e8aa75	fix build on macos	2022-09-08 01:50:18 -07:00
Linus Dierheimer	851899397e	Improve brew package detection	2022-09-08 10:45:56 +02:00
Linus Dierheimer	60a30d888f	GitHub actions: don't try to build deb on macos second try	2022-09-07 21:00:13 +02:00
Linus Dierheimer	999c8208b7	GitHub actions: don't try to build deb on macos	2022-09-07 20:58:14 +02:00
Linus Dierheimer	9143b6dbec	GitHub actions: build on macos too	2022-09-07 20:56:19 +02:00
Linus Dierheimer	16a706d3c5	Seperate color config of title and keys	2022-09-07 19:50:10 +02:00
Linus Dierheimer	58f436d8a2	Apple GPU: Set length of name buffer	2022-09-07 06:40:47 -07:00
Linus Dierheimer	47d1f2e673	Try to fix gpu_apple #222	2022-09-07 06:37:35 -07:00
Linus Dierheimer	8be4921bd0	Release 1.7.0	2022-09-06 18:59:03 +02:00
Linus Dierheimer	b22bcba220	Don't use LC_CTYPE for locale detection	2022-09-06 09:17:26 -07:00
Linus Dierheimer	5ee7ea46e7	Better variable naming	2022-09-06 18:03:31 +02:00
Linus Dierheimer	d93c934269	MacOS Resolution support	2022-09-06 08:04:45 -07:00
Linus Dierheimer	5c1ac33df2	MacOS WM & DE support	2022-09-06 06:52:50 -07:00
Linus Dierheimer	0b3bf3c273	Only build display server code on linux	2022-09-06 15:42:37 +02:00
Linus Dierheimer	7fd98829b0	Fix unused variable	2022-09-06 14:23:07 +02:00
Linus Dierheimer	282271a65a	MacOS disk support	2022-09-06 05:19:21 -07:00
Linus Dierheimer	9ef4b82cb9	Refactor disk module	2022-09-06 13:24:57 +02:00
Linus Dierheimer	10973dd9d1	Better MacOS GPU support	2022-09-06 02:28:32 -07:00
Linus Dierheimer	dfdffec1c9	MacOS GPU support	2022-09-05 13:41:05 -07:00
Linus Dierheimer	2283700a99	Refactor CMakeLists.txt	2022-09-05 19:56:00 +02:00
Linus Dierheimer	7b647e09da	Only enable library features on linux by default	2022-09-05 18:30:30 +02:00
Linus Dierheimer	54cb74c999	Separate gpu detection and printing logic	2022-09-05 17:42:42 +02:00
Linus Dierheimer	0f70cb408f	Updated presets	2022-09-05 16:11:35 +02:00
Linus Dierheimer	c80b1761dd	brew package support	2022-09-05 05:15:19 -07:00
Linus Dierheimer	a1fde6f922	MacOS memory support	2022-09-05 02:46:53 -07:00
Linus Dierheimer	6a44515cf2	Separate memory detection and printing logic	2022-09-05 10:57:09 +02:00
Linus Dierheimer	cfcc4c8375	MacOS cpu support	2022-09-04 14:12:04 -07:00
Linus Dierheimer	ea60fd0a0d	Separate cpu detection and printing logic	2022-09-04 22:20:12 +02:00
Linus Dierheimer	a4e0275263	Update README.md	2022-09-04 18:07:15 +02:00
Linus Dierheimer	71779fa4b1	Basic MacOS support	2022-09-04 09:02:11 -07:00
Linus Dierheimer	475099696f	MacOS logo	2022-09-04 16:32:45 +02:00
Linus Dierheimer	14670b6144	Always cast to right tv_usec type	2022-09-04 14:41:00 +02:00
Linus Dierheimer	327b1b142e	guard get_nproc with FF_HAVE_SYSCONF_H	2022-09-04 14:37:57 +02:00
Linus Dierheimer	9d106c6672	Enable build on MacOS Note that this commit just makes fastfetch compile, not work properly	2022-09-04 14:30:52 +02:00
Linus Dierheimer	df0e13b198	Fix possible segfault	2022-09-04 13:56:14 +02:00
Linus Dierheimer	6d0675820e	Fix build on Android	2022-09-04 13:36:56 +02:00
Linus Dierheimer	08b0bac2b9	Refactor os detection code	2022-09-04 13:33:18 +02:00
Linus Dierheimer	d387800bda	Separate host detection and printing logic	2022-09-04 12:43:30 +02:00
Linus Dierheimer	542ad5eab6	Small fixes to gpu code	2022-09-03 10:53:30 +02:00
Linus Dierheimer	99f42d0953	Fix build with old libpci versions	2022-09-01 17:22:35 +02:00
Linus Dierheimer	3b316bdd3f	Refactor pci code	2022-09-01 17:14:50 +02:00
Linus Dierheimer	f011f8851e	recache between commits too	2022-09-01 17:14:10 +02:00
Linus Dierheimer	8f23a52f53	Fix typos	2022-08-30 19:46:36 +02:00
Linus Dierheimer	8f53d33f29	Fix --file option	2022-08-29 11:01:29 +02:00
Linus Dierheimer	e6fa269f52	Update README.md	2022-08-29 09:24:03 +02:00
Linus Dierheimer	ca4a327de4	Update README.md	2022-08-28 18:42:53 +02:00
Linus Dierheimer	f4e777f3d2	Update README.md	2022-08-28 18:34:54 +02:00
Linus Dierheimer	136f73ea0b	Updated screenshots	2022-08-28 17:39:01 +02:00
Linus Dierheimer	28270541e6	use pci_read_byte to support older libpci versions	2022-08-28 16:01:34 +02:00
Linus Dierheimer	8197eddea8	Much better AMD gpu names	2022-08-28 15:51:28 +02:00
Linus Dierheimer	23bccc4802	MSYS2 logo #219	2022-08-27 16:15:31 +02:00
Linus Dierheimer	873c7d93b6	Fix ffStrSet	2022-08-27 12:22:03 +02:00
Linus Dierheimer	f4ee8667b1	Binary prefix option	2022-08-26 16:02:04 +02:00
Linus Dierheimer	50d3d4cdf4	Merge pull request #220 from sirlucjan/patch-1 Add CachyOS small logo	2022-08-25 12:41:51 +02:00
Piotr Gorski	df048035b5	Add CachyOS small logo Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>	2022-08-24 20:44:36 +02:00
Linus Dierheimer	952989c1e8	Show huge ram values in GiB #218	2022-08-23 13:53:12 +02:00
Linus Dierheimer	aa1237b0fd	Simplified config file loading logic	2022-08-22 12:45:20 +02:00
Linus Dierheimer	b87983c86b	Fix parsing quoted values in config files	2022-08-22 12:14:08 +02:00
Linus Dierheimer	779dbab647	Release 1.6.4	2022-08-22 00:13:13 +02:00
Linus Dierheimer	47373998d5	replace gethostbyname with getaddrinfo #217	2022-08-21 23:35:22 +02:00
Linus Dierheimer	11809e30b5	Parse config files faster	2022-08-21 21:08:11 +02:00
Linus Dierheimer	35253e085c	Unified storage of --set and --set-keyless values	2022-08-20 18:17:00 +02:00
Linus Dierheimer	112e83b7c3	Provide apk count to package format string	2022-08-18 22:02:21 +02:00
Linus Dierheimer	c74b34aa39	Merge pull request #216 from mxkrsv/apk-support Add APK (Alpine Package Keeper) support	2022-08-18 21:56:20 +02:00
Maxim Karasev	b2e0034c34	Add APK (Alpine Package Keeper) support	2022-08-18 22:28:40 +03:00
Linus Dierheimer	e3cdf9d9fd	Reset color after custom module	2022-08-18 11:45:44 +02:00
Linus Dierheimer	6cdb694e33	Do simple \ replacement in user strings	2022-08-18 11:36:30 +02:00
Linus Dierheimer	83016289e9	--set-keyless option	2022-08-18 10:44:21 +02:00
Linus Dierheimer	f9562d7132	Merge pull request #214 from jonathanspw/master add AlmaLinux logo	2022-08-17 09:19:38 +02:00
jonathanspw	2f66bc2c95	add AlmaLinux logo	2022-08-16 20:10:47 -05:00
Linus Dierheimer	d7c848225c	Update CHANGELOG.md	2022-08-12 21:52:29 +02:00
Linus Dierheimer	8404ae8e70	Merge pull request #212 from ceamac/bugs/install-presets Fix installation of presets/ directory	2022-08-12 21:50:49 +02:00
Viorel	d75f72c8fe	Fix installation of presets/ directory	2022-08-12 22:35:31 +03:00
Linus Dierheimer	9fa00081e3	Release 1.6.2	2022-08-12 16:01:52 +02:00
Linus Dierheimer	fca37b59c8	Print xbps package count once again #209	2022-08-12 09:40:02 +02:00
Linus Dierheimer	2fe7476c67	Better xbps package count #209	2022-08-07 19:42:16 +02:00
Linus Dierheimer	03cbd64d8a	Merge pull request #208 from hervyqa/langitketujuh Add LangitKetujuh Linux logo	2022-08-03 13:03:06 +02:00
Hervy Qurrotul Ainur Rozi	f65aeed96f	Add LangitKetujuh Linux logo	2022-08-03 16:46:14 +07:00
Linus Dierheimer	b63f419cde	Merge pull request #207 from draumaz/master Add KISS Linux logo	2022-08-02 15:14:41 +02:00
draumaz	99aa2f7b45	swap order	2022-08-02 12:29:44 +00:00
draumaz	b251c32c12	fix colors, update README	2022-08-02 12:24:15 +00:00
draumaz	034e23d7e3	Merge branch 'LinusDierheimer:master' into master	2022-08-02 05:13:30 -07:00
Linus Dierheimer	bba912d42e	Add missing include	2022-08-02 10:24:54 +02:00
draumaz	597652c35a	one more backslash	2022-08-02 05:56:20 +00:00
draumaz	7f67846ad9	add KISS Linux logo	2022-08-02 05:51:15 +00:00
Linus Dierheimer	bc2e292e22	Update issue templates	2022-07-31 17:44:07 +02:00
Linus Dierheimer	75dc228120	Update issue templates	2022-07-31 17:39:54 +02:00
Linus Dierheimer	bc783f6efd	Update issue templates	2022-07-31 17:33:03 +02:00
Linus Dierheimer	85e1d2b40c	Add logo request template	2022-07-31 17:31:30 +02:00
Linus Dierheimer	3338189354	Rosa Linux logo	2022-07-31 17:22:03 +02:00
Linus Dierheimer	d4c836fd25	Handle empty xdg env vars better	2022-07-30 23:30:46 +02:00
Linus Dierheimer	6787f1eba8	Merge branches 'master' and 'master' of github.com:LinusDierheimer/fastfetch	2022-07-27 21:56:42 +02:00
Linus Dierheimer	eedc277bcf	Respect target dir config during installation	2022-07-27 21:56:28 +02:00