From b87df82d58f8a91dd497e068e1879291b40eb2f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <carter.li@eoitek.com>
Date: Thu, 19 Dec 2024 11:00:16 +0800
Subject: [PATCH 01/38] Shell (Windows): use $POWERSHELL_VERSION if available

---
 src/detection/terminalshell/terminalshell.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c
index ebacb444f..a591829a2 100644
--- a/src/detection/terminalshell/terminalshell.c
+++ b/src/detection/terminalshell/terminalshell.c
@@ -109,6 +109,15 @@ static bool getShellVersionFish(FFstrbuf* exe, FFstrbuf* version)
 
 static bool getShellVersionPwsh(FFstrbuf* exe, FFstrbuf* version)
 {
+    // Requires manually setting $POWERSHELL_VERSION
+    // $env:POWERSHELL_VERSION = $PSVersionTable.PSVersion.ToString(); fastfetch.exe
+    const char* env = getenv("POWERSHELL_VERSION");
+    if (env)
+    {
+        ffStrbufSetS(version, env);
+        return true;
+    }
+
     #ifdef _WIN32
     if(getFileVersion(exe->chars, version))
     {
@@ -249,6 +258,13 @@ static bool getShellVersionZsh(FFstrbuf* exe, FFstrbuf* exePath, FFstrbuf* versi
 #ifdef _WIN32
 static bool getShellVersionWinPowerShell(FFstrbuf* exe, FFstrbuf* version)
 {
+    const char* env = getenv("POWERSHELL_VERSION");
+    if (env)
+    {
+        ffStrbufSetS(version, env);
+        return true;
+    }
+
     return ffProcessAppendStdOut(version, (char* const[]) {
         exe->chars,
         "-NoLogo",

From 3bb82423b3e603add76d32f7433c12503463200d Mon Sep 17 00:00:00 2001
From: JohnTheCoolingFan <43478602+JohnTheCoolingFan@users.noreply.github.com>
Date: Thu, 19 Dec 2024 11:18:42 +0300
Subject: [PATCH 02/38] OS (Linux): Refactor Armbian version detection and add
 support for ubuntu-based armbian detection (#1447)

* Add support for detection of Armbian as Ubuntu flavor

Ubuntu can be used to build Armbian, it is one of the official bases for
Armbian. This allows the detection of Armbian in case it is based on
Ubuntu.

* Refactor Armbian detection

* Armbian: set idLike to id before setting id to "armbian"

* Tidy up detectArmbianVersion
---
 src/detection/os/os_linux.c | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c
index d4ec8b0be..f293d5f0e 100644
--- a/src/detection/os/os_linux.c
+++ b/src/detection/os/os_linux.c
@@ -46,13 +46,33 @@ static bool parseOsRelease(const char* fileName, FFOSResult* result)
     });
 }
 
+// Common logic for detecting Armbian image version
+FF_MAYBE_UNUSED static bool detectArmbianVersion(FFOSResult* result)
+{
+    if (ffStrbufStartsWithS(&result->prettyName, "Armbian ")) // Official Armbian release images
+        ffStrbufSetS(&result->name, "Armbian");
+    else if (ffStrbufStartsWithS(&result->prettyName, "Armbian-unofficial ")) // Unofficial Armbian image built from source
+        ffStrbufSetS(&result->name, "Armbian (custom build)");
+    else
+        return false;
+    ffStrbufSet(&result->idLike, &result->id);
+    ffStrbufSetS(&result->id, "armbian");
+    ffStrbufClear(&result->versionID);
+    uint32_t versionStart = ffStrbufFirstIndexC(&result->prettyName, ' ') + 1;
+    uint32_t versionEnd = ffStrbufNextIndexC(&result->prettyName, versionStart, ' ');
+    ffStrbufSetNS(&result->versionID, versionEnd - versionStart, result->prettyName.chars + versionStart);
+    return true;
+}
+
 FF_MAYBE_UNUSED static void getUbuntuFlavour(FFOSResult* result)
 {
     const char* xdgConfigDirs = getenv("XDG_CONFIG_DIRS");
     if(!ffStrSet(xdgConfigDirs))
         return;
 
-    if(ffStrbufStartsWithS(&result->prettyName, "Linux Lite "))
+    if (detectArmbianVersion(result))
+        return;
+    else if(ffStrbufStartsWithS(&result->prettyName, "Linux Lite "))
     {
         ffStrbufSetS(&result->name, "Linux Lite");
         ffStrbufSetS(&result->id, "linuxlite");
@@ -164,28 +184,8 @@ FF_MAYBE_UNUSED static void getDebianVersion(FFOSResult* result)
 
 FF_MAYBE_UNUSED static bool detectDebianDerived(FFOSResult* result)
 {
-    if (ffStrbufStartsWithS(&result->prettyName, "Armbian ")) // Armbian 24.2.1 bookworm
-    {
-        ffStrbufSetS(&result->name, "Armbian");
-        ffStrbufSetS(&result->id, "armbian");
-        ffStrbufSetS(&result->idLike, "debian");
-        ffStrbufClear(&result->versionID);
-        uint32_t versionStart = ffStrbufFirstIndexC(&result->prettyName, ' ') + 1;
-        uint32_t versionEnd = ffStrbufNextIndexC(&result->prettyName, versionStart, ' ');
-        ffStrbufSetNS(&result->versionID, versionEnd - versionStart, result->prettyName.chars + versionStart);
+    if (detectArmbianVersion(result))
         return true;
-    }
-    else if (ffStrbufStartsWithS(&result->prettyName, "Armbian-unofficial ")) // Unofficial Armbian image built from source
-    {
-        ffStrbufSetS(&result->name, "Armbian (custom build)");
-        ffStrbufSetS(&result->id, "armbian");
-        ffStrbufSetS(&result->idLike, "debian");
-        ffStrbufClear(&result->versionID);
-        uint32_t versionStart = ffStrbufFirstIndexC(&result->prettyName, ' ') + 1;
-        uint32_t versionEnd = ffStrbufNextIndexC(&result->prettyName, versionStart, ' ');
-        ffStrbufSetNS(&result->versionID, versionEnd - versionStart, result->prettyName.chars + versionStart);
-        return true;
-    }
     else if (ffStrbufStartsWithS(&result->name, "Loc-OS"))
     {
         ffStrbufSetS(&result->id, "locos");

From 41240e9460ec7cd0f19785ddb5a32ab331d3e3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Thu, 19 Dec 2024 13:37:05 +0800
Subject: [PATCH 03/38] FFlist: fix return value of `ffListPop`

---
 src/util/FFlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/FFlist.c b/src/util/FFlist.c
index e640f507e..c1af330d5 100644
--- a/src/util/FFlist.c
+++ b/src/util/FFlist.c
@@ -34,5 +34,5 @@ bool ffListPop(FFlist* list, void* result)
 
     memcpy(result, ffListGet(list, list->length - 1), list->elementSize);
     --list->length;
-    return result;
+    return true;
 }

From 4bef8013379c2492ac2e2019a6e452a0e0f3d894 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Fri, 20 Dec 2024 10:41:18 +0800
Subject: [PATCH 04/38] BluetoothRadio (Linux): improve performance by reducing
 size of dbus response

---
 .../bluetoothradio/bluetoothradio_linux.c     | 199 +++++++-----------
 1 file changed, 71 insertions(+), 128 deletions(-)

diff --git a/src/detection/bluetoothradio/bluetoothradio_linux.c b/src/detection/bluetoothradio/bluetoothradio_linux.c
index 05b77523c..50427e57f 100644
--- a/src/detection/bluetoothradio/bluetoothradio_linux.c
+++ b/src/detection/bluetoothradio/bluetoothradio_linux.c
@@ -3,56 +3,47 @@
 
 #ifdef FF_HAVE_DBUS
 #include "common/dbus.h"
+#include "common/io/io.h"
 
-/* Example dbus reply, striped to only the relevant parts:
-array [                                                     //root
+/* Example dbus reply:
+array [
     dict entry(
-        object path "/org/bluez/hci0"
-        array [
-            dict entry(
-                string "org.bluez.Adapter1"
-                array [
-                    dict entry(
-                        string "Address"
-                        variant string "XX:XX:XX:XX:XX:XX"
-                    )
-                    dict entry(
-                        string "Name"
-                        variant string "xxxxxxxx"
-                    )
-                    dict entry(
-                        string "Powered"
-                        variant boolean true
-                    )
-                    dict entry(
-                        string "PowerState"
-                        variant string "on"
-                    )
-                    dict entry(
-                        string "Manufacturer"
-                        variant uint16 2
-                    )
-                    dict entry(
-                        string "Version"
-                        variant byte 12
-                    )
-                ]
-            )
-        ]
+        string "Address"
+        variant string "XX:XX:XX:XX:XX:XX"
+    )
+    dict entry(
+        string "Name"
+        variant string "xxxxxxxx"
+    )
+    dict entry(
+        string "Powered"
+        variant boolean true
+    )
+    dict entry(
+        string "PowerState"
+        variant string "on"
+    )
+    dict entry(
+        string "Manufacturer"
+        variant uint16 2
+    )
+    dict entry(
+        string "Version"
+        variant byte 12
     )
 ]
 */
 
-static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothRadioResult* device)
+static const char* detectBluetoothProperty(FFBluetoothRadioResult* device, FFDBusData* dbus, DBusMessageIter* iter)
 {
     if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
-        return;
+        return "Expected dict entry";
 
     DBusMessageIter dictIter;
     dbus->lib->ffdbus_message_iter_recurse(iter, &dictIter);
 
     if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_STRING)
-        return;
+        return "Expected dict entry key to be a string";
 
     const char* deviceProperty;
     dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &deviceProperty);
@@ -77,121 +68,73 @@ static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBlue
         ffDBusGetBool(dbus, &dictIter, &device->discoverable);
     else if(ffStrEquals(deviceProperty, "Pairable"))
         ffDBusGetBool(dbus, &dictIter, &device->connectable);
+
+    return NULL;
 }
 
-static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothRadioResult* device)
+static const char* detectBluetoothRoot(FFBluetoothRadioResult* device, const char* hciName, FFDBusData* dbus)
 {
-    if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
-        return;
+    char objPath[300];
+    snprintf(objPath, sizeof(objPath), "/org/bluez/%s", hciName);
 
-    DBusMessageIter dictIter;
-    dbus->lib->ffdbus_message_iter_recurse(iter, &dictIter);
+    DBusMessage* properties = ffDBusGetMethodReply(dbus, "org.bluez", objPath, "org.freedesktop.DBus.Properties", "GetAll", "org.bluez.Adapter1");
+    if(!properties)
+        return "Failed to call org.freedesktop.DBus.Properties.GetAll";
 
-    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_STRING)
-        return;
-
-    const char* propertyType;
-    dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &propertyType);
-
-    if(!ffStrContains(propertyType, ".Adapter"))
-        return; //We don't care about other properties
-
-    dbus->lib->ffdbus_message_iter_next(&dictIter);
-
-    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_ARRAY)
-        return;
-
-    DBusMessageIter arrayIter;
-    dbus->lib->ffdbus_message_iter_recurse(&dictIter, &arrayIter);
-
-    do
+    DBusMessageIter rootIter;
+    if(!dbus->lib->ffdbus_message_iter_init(properties, &rootIter))
     {
-        detectBluetoothValue(dbus, &arrayIter, device);
-    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
-}
-
-static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
-{
-    if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
-        return;
-
-    DBusMessageIter dictIter;
-    dbus->lib->ffdbus_message_iter_recurse(iter, &dictIter);
-
-    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_OBJECT_PATH)
-        return;
-
-    const char* objectPath;
-    dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &objectPath);
-
-    //We want adapter objects
-    if(!ffStrStartsWith(objectPath, "/org/bluez/hci") || ffStrContains(objectPath, "/dev_"))
-        return;
-
-    dbus->lib->ffdbus_message_iter_next(&dictIter);
-
-    if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_ARRAY)
-        return;
-
-    DBusMessageIter arrayIter;
-    dbus->lib->ffdbus_message_iter_recurse(&dictIter, &arrayIter);
-
-    FFBluetoothRadioResult* device = ffListAdd(devices);
-    ffStrbufInit(&device->name);
-    ffStrbufInit(&device->address);
-    ffStrbufInitStatic(&device->vendor, "Unknown");
-    device->lmpVersion = INT_MIN;
-    device->lmpSubversion = INT_MIN;
-    device->enabled = false;
-
-    do
-    {
-        detectBluetoothProperty(dbus, &arrayIter, device);
-    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
-
-    if(device->name.length == 0)
-    {
-        ffStrbufDestroy(&device->name);
-        ffStrbufDestroy(&device->address);
-        --devices->length;
+        dbus->lib->ffdbus_message_unref(properties);
+        return "Failed to get root iterator of org.freedesktop.DBus.Properties.GetAll";
     }
-}
 
-static void detectBluetoothRoot(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
-{
-    if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
-        return;
+    if(dbus->lib->ffdbus_message_iter_get_arg_type(&rootIter) != DBUS_TYPE_ARRAY)
+    {
+        dbus->lib->ffdbus_message_unref(properties);
+        return "Expected array";
+    }
 
     DBusMessageIter arrayIter;
-    dbus->lib->ffdbus_message_iter_recurse(iter, &arrayIter);
+    dbus->lib->ffdbus_message_iter_recurse(&rootIter, &arrayIter);
 
     do
     {
-        detectBluetoothObject(devices, dbus, &arrayIter);
+        detectBluetoothProperty(device, dbus, &arrayIter);
     } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
+
+    dbus->lib->ffdbus_message_unref(properties);
+    return NULL;
 }
 
 static const char* detectBluetooth(FFlist* devices)
 {
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/bluetooth");
+    if(dirp == NULL)
+        return "Failed to open /sys/class/bluetooth";
+
     FFDBusData dbus;
     const char* error = ffDBusLoadData(DBUS_BUS_SYSTEM, &dbus);
     if(error)
         return error;
 
-    DBusMessage* managedObjects = ffDBusGetMethodReply(&dbus, "org.bluez", "/", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects", NULL);
-    if(!managedObjects)
-        return "Failed to call GetManagedObjects";
-
-    DBusMessageIter rootIter;
-    if(!dbus.lib->ffdbus_message_iter_init(managedObjects, &rootIter))
+    struct dirent* entry;
+    while ((entry = readdir(dirp)) != NULL)
     {
-        dbus.lib->ffdbus_message_unref(managedObjects);
-        return "Failed to get root iterator of GetManagedObjects";
+        if (entry->d_name[0] == '.')
+            continue;
+
+        if (strchr(entry->d_name, ':') != NULL) // ignore connected devices
+            continue;
+
+        FFBluetoothRadioResult* device = ffListAdd(devices);
+        ffStrbufInit(&device->name);
+        ffStrbufInit(&device->address);
+        ffStrbufInitStatic(&device->vendor, "Unknown");
+        device->lmpVersion = INT_MIN;
+        device->lmpSubversion = INT_MIN;
+        device->enabled = false;
+        detectBluetoothRoot(device, entry->d_name, &dbus);
     }
-
-    detectBluetoothRoot(devices, &dbus, &rootIter);
-
-    dbus.lib->ffdbus_message_unref(managedObjects);
     return NULL;
 }
 
@@ -202,7 +145,7 @@ const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothRadioResult */)
     #ifdef FF_HAVE_DBUS
         return detectBluetooth(devices);
     #else
-        FF_UNUSED(devices) 
+        FF_UNUSED(devices)
         return "Fastfetch was compiled without DBus support";
     #endif
 }

From 4f807f26a952e3e6ff60f2ded44cb3a0ad66f4d9 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Fri, 20 Dec 2024 11:07:09 +0800
Subject: [PATCH 05/38] Bluetooth (Linux): improve performance when
 `showDisconnected == false`

If no connected devices found, no dbus calls will be emitted

Fix #1450
---
 src/detection/bluetooth/bluetooth.h           |  2 +-
 src/detection/bluetooth/bluetooth_apple.m     |  2 +-
 src/detection/bluetooth/bluetooth_linux.c     | 22 ++++++++++++++++++-
 src/detection/bluetooth/bluetooth_nosupport.c |  2 +-
 src/detection/bluetooth/bluetooth_windows.c   |  2 +-
 src/modules/bluetooth/bluetooth.c             |  6 ++---
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/detection/bluetooth/bluetooth.h b/src/detection/bluetooth/bluetooth.h
index 0702abbdb..57bf9ef3a 100644
--- a/src/detection/bluetooth/bluetooth.h
+++ b/src/detection/bluetooth/bluetooth.h
@@ -11,4 +11,4 @@ typedef struct FFBluetoothResult
     bool connected;
 } FFBluetoothResult;
 
-const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */);
+const char* ffDetectBluetooth(FFBluetoothOptions* options, FFlist* devices /* FFBluetoothResult */);
diff --git a/src/detection/bluetooth/bluetooth_apple.m b/src/detection/bluetooth/bluetooth_apple.m
index 4f29deb56..dfd2d0efc 100644
--- a/src/detection/bluetooth/bluetooth_apple.m
+++ b/src/detection/bluetooth/bluetooth_apple.m
@@ -10,7 +10,7 @@
     @property (nonatomic) uint8_t batteryPercentSingle;
 @end
 
-const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
+const char* ffDetectBluetooth(FFBluetoothOptions* options, FFlist* devices /* FFBluetoothResult */)
 {
     NSArray<IOBluetoothDevice*>* ioDevices = IOBluetoothDevice.pairedDevices;
     if(!ioDevices)
diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c
index b7ae5a839..ea1f09719 100644
--- a/src/detection/bluetooth/bluetooth_linux.c
+++ b/src/detection/bluetooth/bluetooth_linux.c
@@ -3,6 +3,7 @@
 
 #ifdef FF_HAVE_DBUS
 #include "common/dbus.h"
+#include "common/io/io.h"
 
 /* Example dbus reply, striped to only the relevant parts:
 array [                                                     //root
@@ -192,11 +193,30 @@ static const char* detectBluetooth(FFlist* devices)
     return NULL;
 }
 
+static bool hasConnectedDevices(void)
+{
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/bluetooth");
+    if(dirp == NULL)
+        return false;
+
+    struct dirent* entry;
+    while ((entry = readdir(dirp)) != NULL)
+    {
+        if (strchr(entry->d_name, ':') != NULL) // ignore connected devices
+            return true;
+    }
+
+    return false;
+}
+
 #endif
 
-const char* ffDetectBluetooth(FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothResult */)
+const char* ffDetectBluetooth(FFBluetoothOptions* options, FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothResult */)
 {
     #ifdef FF_HAVE_DBUS
+        if (!options->showDisconnected && !hasConnectedDevices())
+            return NULL;
+
         return detectBluetooth(devices);
     #else
         return "Fastfetch was compiled without DBus support";
diff --git a/src/detection/bluetooth/bluetooth_nosupport.c b/src/detection/bluetooth/bluetooth_nosupport.c
index 8db5a465c..c119ecb95 100644
--- a/src/detection/bluetooth/bluetooth_nosupport.c
+++ b/src/detection/bluetooth/bluetooth_nosupport.c
@@ -1,6 +1,6 @@
 #include "bluetooth.h"
 
-const char* ffDetectBluetooth(FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothResult */)
+const char* ffDetectBluetooth(FF_MAYBE_UNUSED FFBluetoothOptions* options, FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothResult */)
 {
     return "Not supported on this platform";
 }
diff --git a/src/detection/bluetooth/bluetooth_windows.c b/src/detection/bluetooth/bluetooth_windows.c
index 80b83837a..d59a31623 100644
--- a/src/detection/bluetooth/bluetooth_windows.c
+++ b/src/detection/bluetooth/bluetooth_windows.c
@@ -7,7 +7,7 @@
 
 #pragma GCC diagnostic ignored "-Wpointer-sign"
 
-const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
+const char* ffDetectBluetooth(FFBluetoothOptions* options, FFlist* devices /* FFBluetoothResult */)
 {
     // Actually bluetoothapis.dll, but it's missing on Windows 7
     FF_LIBRARY_LOAD(bluetoothapis, "dlopen bthprops.cpl failed", "bthprops.cpl", 1)
diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c
index fe3357d4f..7563b1d54 100644
--- a/src/modules/bluetooth/bluetooth.c
+++ b/src/modules/bluetooth/bluetooth.c
@@ -59,7 +59,7 @@ static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* de
 void ffPrintBluetooth(FFBluetoothOptions* options)
 {
     FF_LIST_AUTO_DESTROY devices = ffListCreate(sizeof (FFBluetoothResult));
-    const char* error = ffDetectBluetooth(&devices);
+    const char* error = ffDetectBluetooth(options, &devices);
 
     if(error)
     {
@@ -155,11 +155,11 @@ void ffGenerateBluetoothJsonConfig(FFBluetoothOptions* options, yyjson_mut_doc*
     ffPercentGenerateJsonConfig(doc, module, defaultOptions.percent, options->percent);
 }
 
-void ffGenerateBluetoothJsonResult(FF_MAYBE_UNUSED FFBluetoothOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
+void ffGenerateBluetoothJsonResult(FFBluetoothOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
 {
     FF_LIST_AUTO_DESTROY results = ffListCreate(sizeof(FFBluetoothResult));
 
-    const char* error = ffDetectBluetooth(&results);
+    const char* error = ffDetectBluetooth(options, &results);
     if (error)
     {
         yyjson_mut_obj_add_str(doc, module, "error", error);

From ae26692ef6e491543c9f8bfc9c3d96d3d368d085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <carter.li@eoitek.com>
Date: Fri, 20 Dec 2024 13:42:37 +0800
Subject: [PATCH 06/38] Bluetooth (macOS): don't report disconnected devices if
 `showDisconnected == false`

---
 src/detection/bluetooth/bluetooth_apple.m | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/detection/bluetooth/bluetooth_apple.m b/src/detection/bluetooth/bluetooth_apple.m
index dfd2d0efc..e7d3abd39 100644
--- a/src/detection/bluetooth/bluetooth_apple.m
+++ b/src/detection/bluetooth/bluetooth_apple.m
@@ -18,6 +18,9 @@ const char* ffDetectBluetooth(FFBluetoothOptions* options, FFlist* devices /* FF
 
     for(IOBluetoothDevice* ioDevice in ioDevices)
     {
+        if (!options->showDisconnected && !ioDevice.isConnected)
+            continue;
+
         FFBluetoothResult* device = ffListAdd(devices);
         ffStrbufInitS(&device->name, ioDevice.name.UTF8String);
         ffStrbufInitS(&device->address, ioDevice.addressString.UTF8String);

From b152b383a2fd7706834b4f2a8752e7059a302d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <carter.li@eoitek.com>
Date: Fri, 20 Dec 2024 13:43:30 +0800
Subject: [PATCH 07/38] Bluetooth (Windows): optimise

1. don't report disconnected devices if `showDisconnected == false`
2. don't report unknown devices
3. don't report errors when no devices found
---
 src/detection/bluetooth/bluetooth_windows.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/detection/bluetooth/bluetooth_windows.c b/src/detection/bluetooth/bluetooth_windows.c
index d59a31623..5da75fc83 100644
--- a/src/detection/bluetooth/bluetooth_windows.c
+++ b/src/detection/bluetooth/bluetooth_windows.c
@@ -20,13 +20,14 @@ const char* ffDetectBluetooth(FFBluetoothOptions* options, FFlist* devices /* FF
     };
     HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstDevice(&(BLUETOOTH_DEVICE_SEARCH_PARAMS) {
         .fReturnConnected = TRUE,
-        .fReturnRemembered = TRUE,
-        .fReturnAuthenticated = TRUE,
-        .fReturnUnknown = TRUE,
+        .fReturnRemembered = options->showDisconnected,
+        .fReturnAuthenticated = options->showDisconnected,
         .dwSize = sizeof(BLUETOOTH_DEVICE_SEARCH_PARAMS)
     }, &btdi);
     if(!hFind)
     {
+        if (GetLastError() == ERROR_NO_MORE_ITEMS)
+            return NULL;
         return "BluetoothFindFirstDevice() failed";
     }
 

From c5d4b207291744887be7930f51298cd5cdaea953 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Fri, 20 Dec 2024 14:44:54 +0800
Subject: [PATCH 08/38] TerminalShell (Android): ignore proot

---
 src/detection/terminalshell/terminalshell_linux.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c
index 5d63236f8..91160f3d3 100644
--- a/src/detection/terminalshell/terminalshell_linux.c
+++ b/src/detection/terminalshell/terminalshell_linux.c
@@ -57,6 +57,9 @@ static pid_t getShellInfo(FFShellResult* result, pid_t pid)
                 ffStrbufEqualS(&result->processName, "flashfetch")          ||
                 ffStrbufContainS(&result->processName, "debug")             ||
                 ffStrbufContainS(&result->processName, "not-found")         ||
+                #ifdef __ANDROID__
+                ffStrbufEqualS(&result->processName, "proot")              ||
+                #endif
                 ffStrbufEndsWithS(&result->processName, ".sh")
             )
             {
@@ -105,6 +108,9 @@ static pid_t getTerminalInfo(FFTerminalResult* result, pid_t pid)
             ffStrbufEqualS(&result->processName, "login")      ||
             ffStrbufEqualS(&result->processName, "clifm")      || // https://github.com/leo-arch/clifm/issues/289
             ffStrbufEqualS(&result->processName, "chezmoi")    || // #762
+            #ifdef __ANDROID__
+            ffStrbufEqualS(&result->processName, "proot")      ||
+            #endif
             #ifdef __linux__
             ffStrbufStartsWithS(&result->processName, "flatpak-") || // #707
             #endif

From 74586a9df1d0e82031453d7b5c20f448e7f8f4ef Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Fri, 20 Dec 2024 15:55:54 +0800
Subject: [PATCH 09/38] Bluetooth (Linux): improve performance

1. ignore unpaired devices
2. ignore disconnected devices when `showDisconnected == false`
---
 src/detection/bluetooth/bluetooth_linux.c | 82 +++++++++++++++--------
 1 file changed, 54 insertions(+), 28 deletions(-)

diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c
index ea1f09719..beaaba9b1 100644
--- a/src/detection/bluetooth/bluetooth_linux.c
+++ b/src/detection/bluetooth/bluetooth_linux.c
@@ -45,16 +45,16 @@ array [                                                     //root
 ]
 */
 
-static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothResult* device)
+static bool detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothResult* device)
 {
     if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
-        return;
+        return true;
 
     DBusMessageIter dictIter;
     dbus->lib->ffdbus_message_iter_recurse(iter, &dictIter);
 
     if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_STRING)
-        return;
+        return true;
 
     const char* deviceProperty;
     dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &deviceProperty);
@@ -75,6 +75,13 @@ static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBlue
     }
     else if(ffStrEquals(deviceProperty, "Connected"))
         ffDBusGetBool(dbus, &dictIter, &device->connected);
+    else if(ffStrEquals(deviceProperty, "Paired"))
+    {
+        bool paired = true;
+        ffDBusGetBool(dbus, &dictIter, &paired);
+        if (!paired) return false;
+    }
+    return true;
 }
 
 static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFBluetoothResult* device)
@@ -104,32 +111,37 @@ static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFB
 
     do
     {
-        detectBluetoothValue(dbus, &arrayIter, device);
+        bool shouldContinue = detectBluetoothValue(dbus, &arrayIter, device);
+        if (!shouldContinue)
+        {
+            ffStrbufClear(&device->name);
+            break;
+        }
     } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
 }
 
-static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
+static FFBluetoothResult* detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
 {
     if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DICT_ENTRY)
-        return;
+        return NULL;
 
     DBusMessageIter dictIter;
     dbus->lib->ffdbus_message_iter_recurse(iter, &dictIter);
 
     if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_OBJECT_PATH)
-        return;
+        return NULL;
 
     const char* objectPath;
     dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &objectPath);
 
     // We don't want adapter objects
     if(!ffStrContains(objectPath, "/dev_"))
-        return;
+        return NULL;
 
     dbus->lib->ffdbus_message_iter_next(&dictIter);
 
     if(dbus->lib->ffdbus_message_iter_get_arg_type(&dictIter) != DBUS_TYPE_ARRAY)
-        return;
+        return NULL;
 
     DBusMessageIter arrayIter;
     dbus->lib->ffdbus_message_iter_recurse(&dictIter, &arrayIter);
@@ -146,16 +158,10 @@ static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessage
         detectBluetoothProperty(dbus, &arrayIter, device);
     } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
 
-    if(device->name.length == 0)
-    {
-        ffStrbufDestroy(&device->name);
-        ffStrbufDestroy(&device->address);
-        ffStrbufDestroy(&device->type);
-        --devices->length;
-    }
+    return device;
 }
 
-static void detectBluetoothRoot(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
+static void detectBluetoothRoot(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter, int32_t connectedCount)
 {
     if(dbus->lib->ffdbus_message_iter_get_arg_type(iter) != DBUS_TYPE_ARRAY)
         return;
@@ -165,11 +171,25 @@ static void detectBluetoothRoot(FFlist* devices, FFDBusData* dbus, DBusMessageIt
 
     do
     {
-        detectBluetoothObject(devices, dbus, &arrayIter);
+        FFBluetoothResult* device = detectBluetoothObject(devices, dbus, &arrayIter);
+
+        if (device)
+        {
+            if(device->name.length == 0 || (connectedCount > 0 && !device->connected))
+            {
+                ffStrbufDestroy(&device->name);
+                ffStrbufDestroy(&device->address);
+                ffStrbufDestroy(&device->type);
+                --devices->length;
+            }
+
+            if (device->connected && --connectedCount == 0)
+                break;
+        }
     } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
 }
 
-static const char* detectBluetooth(FFlist* devices)
+static const char* detectBluetooth(FFlist* devices, int32_t connectedCount)
 {
     FFDBusData dbus;
     const char* error = ffDBusLoadData(DBUS_BUS_SYSTEM, &dbus);
@@ -187,26 +207,27 @@ static const char* detectBluetooth(FFlist* devices)
         return "Failed to get root iterator of GetManagedObjects";
     }
 
-    detectBluetoothRoot(devices, &dbus, &rootIter);
+    detectBluetoothRoot(devices, &dbus, &rootIter, connectedCount);
 
     dbus.lib->ffdbus_message_unref(managedObjects);
     return NULL;
 }
 
-static bool hasConnectedDevices(void)
+static uint32_t connectedDevices(void)
 {
     FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/bluetooth");
     if(dirp == NULL)
-        return false;
+        return 0;
 
+    uint32_t result = 0;
     struct dirent* entry;
     while ((entry = readdir(dirp)) != NULL)
     {
-        if (strchr(entry->d_name, ':') != NULL) // ignore connected devices
-            return true;
+        if (strchr(entry->d_name, ':') != NULL)
+            ++result;
     }
 
-    return false;
+    return result;
 }
 
 #endif
@@ -214,10 +235,15 @@ static bool hasConnectedDevices(void)
 const char* ffDetectBluetooth(FFBluetoothOptions* options, FF_MAYBE_UNUSED FFlist* devices /* FFBluetoothResult */)
 {
     #ifdef FF_HAVE_DBUS
-        if (!options->showDisconnected && !hasConnectedDevices())
-            return NULL;
+        int32_t connectedCount = -1;
+        if (!options->showDisconnected)
+        {
+            connectedCount = (int32_t) connectedDevices();
+            if (connectedCount == 0)
+                return NULL;
+        }
 
-        return detectBluetooth(devices);
+        return detectBluetooth(devices, connectedCount);
     #else
         return "Fastfetch was compiled without DBus support";
     #endif

From 14d6157901fd5be56858ce17cf31a0fab6074a69 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Fri, 20 Dec 2024 16:38:24 +0800
Subject: [PATCH 10/38] PhysicalDisk (Linux): fix interconnect type detection

Regression of b5a9d64

Fix #1453
---
 .../physicaldisk/physicaldisk_linux.c         | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c
index 6a41ada24..ed1fa87be 100644
--- a/src/detection/physicaldisk/physicaldisk_linux.c
+++ b/src/detection/physicaldisk/physicaldisk_linux.c
@@ -80,24 +80,28 @@ static void parsePhysicalDisk(int dfd, const char* devName, FFPhysicalDiskOption
 
     {
         ffStrbufInit(&device->interconnect);
-        char pathSysDeviceReal[PATH_MAX];
-        ssize_t pathLength = readlinkat(dfd, "device", pathSysDeviceReal, ARRAY_SIZE(pathSysDeviceReal) - 1);
-        if (pathLength > 0)
+        if (ffStrStartsWith(devName, "nvme"))
+            ffStrbufSetStatic(&device->interconnect, "NVMe");
+        else
         {
-            pathSysDeviceReal[pathLength] = '\0';
-
-            if (strstr(pathSysDeviceReal, "/usb") != NULL)
-                ffStrbufSetS(&device->interconnect, "USB");
-            else if (strstr(pathSysDeviceReal, "/nvme") != NULL)
-                ffStrbufSetS(&device->interconnect, "NVMe");
-            else if (strstr(pathSysDeviceReal, "/ata") != NULL)
-                ffStrbufSetS(&device->interconnect, "ATA");
-            else if (strstr(pathSysDeviceReal, "/scsi") != NULL)
-                ffStrbufSetS(&device->interconnect, "SCSI");
-            else
+            char pathSysDeviceLink[64];
+            snprintf(pathSysDeviceLink, ARRAY_SIZE(pathSysDeviceLink), "/sys/block/%s/device", devName);
+            char pathSysDeviceReal[PATH_MAX];
+            if (realpath(pathSysDeviceLink, pathSysDeviceReal))
             {
-                if (ffAppendFileBufferRelative(devfd, "transport", &device->interconnect))
-                    ffStrbufTrimRightSpace(&device->interconnect);
+                if (strstr(pathSysDeviceReal, "/usb") != NULL)
+                    ffStrbufSetStatic(&device->interconnect, "USB");
+                else if (strstr(pathSysDeviceReal, "/ata") != NULL)
+                    ffStrbufSetStatic(&device->interconnect, "ATA");
+                else if (strstr(pathSysDeviceReal, "/scsi") != NULL)
+                    ffStrbufSetStatic(&device->interconnect, "SCSI");
+                else if (strstr(pathSysDeviceReal, "/nvme") != NULL)
+                    ffStrbufSetStatic(&device->interconnect, "NVMe");
+                else
+                {
+                    if (ffAppendFileBufferRelative(devfd, "transport", &device->interconnect))
+                        ffStrbufTrimRightSpace(&device->interconnect);
+                }
             }
         }
     }

From dd41dfa0003a2f3409c4f870ae6a217ca817d760 Mon Sep 17 00:00:00 2001
From: Robin Candau <robincandau@protonmail.com>
Date: Sat, 21 Dec 2024 16:53:02 +0100
Subject: [PATCH 11/38] CMake: Add a cmake option to make flashfetch target
 optional (#1455)

Introduces the `-DBUILD_FLASHFETCH='ON'/'OFF'` build option so one can skip the `flashfetch` target (both from executable and install targets, option at `ON` by default to preserve compatibility with the current default behavior).
This is useful when distributing pre-built downstream packages (e.g. for Linux distributions packaging `fastfetch`) as building and shipping the `flashfetch` binary in such pre-built packages serves little to no purpose.
---
 CMakeLists.txt | 57 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ab90fcb3..12bc09eef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,6 +86,7 @@ cmake_dependent_option(ENABLE_PCIACCESS "Enable libpciaccess" ON "NetBSD OR Open
 option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded) yyjson library" OFF)
 option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF)
 option(ENABLE_LTO "Enable link-time optimization in release mode if supported" ON)
+option(BUILD_FLASHFETCH "Build flashfetch" ON) # Also build the flashfetch binary
 option(BUILD_TESTS "Build tests" OFF) # Also create test executables
 option(SET_TWEAK "Add tweak to project version" ON) # This is set to off by github actions for release builds
 option(IS_MUSL "Build with musl libc" OFF) # Used by Github Actions
@@ -1611,41 +1612,52 @@ target_link_libraries(fastfetch
     PRIVATE libfastfetch
 )
 
-add_executable(flashfetch
-    src/flashfetch.c
-)
-target_compile_definitions(flashfetch
-    PRIVATE FASTFETCH_TARGET_BINARY_NAME=flashfetch
-)
-target_link_libraries(flashfetch
-    PRIVATE libfastfetch
-)
-
 # Prevent fastfetch from linking to libstdc++
 set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
 set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "")
 set_target_properties(fastfetch PROPERTIES LINKER_LANGUAGE C)
-set_target_properties(flashfetch PROPERTIES LINKER_LANGUAGE C)
 
 if(WIN32)
     target_sources(fastfetch
         PRIVATE src/util/windows/version.rc
     )
-    target_sources(flashfetch
-        PRIVATE src/util/windows/version.rc
-    )
 elseif(APPLE)
     target_link_options(fastfetch
         PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,Info.plist
     )
-    target_link_options(flashfetch
-        PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,Info.plist
-    )
 endif()
 
 if(BINARY_LINK_TYPE STREQUAL "static")
     target_link_options(fastfetch PRIVATE "-static")
-    target_link_options(flashfetch PRIVATE "-static")
+endif()
+
+# Apply all above parameters to flashfetch if it is built
+if (BUILD_FLASHFETCH)
+    add_executable(flashfetch
+        src/flashfetch.c
+    )
+    target_compile_definitions(flashfetch
+        PRIVATE FASTFETCH_TARGET_BINARY_NAME=flashfetch
+    )
+    target_link_libraries(flashfetch
+        PRIVATE libfastfetch
+    )
+
+    set_target_properties(flashfetch PROPERTIES LINKER_LANGUAGE C)
+
+    if(WIN32)
+        target_sources(flashfetch
+            PRIVATE src/util/windows/version.rc
+        )
+    elseif(APPLE)
+        target_link_options(flashfetch
+            PRIVATE LINKER:-sectcreate,__TEXT,__info_plist,Info.plist
+        )
+    endif()
+
+    if(BINARY_LINK_TYPE STREQUAL "static")
+        target_link_options(flashfetch PRIVATE "-static")
+    endif()
 endif()
 
 ###################
@@ -1687,10 +1699,17 @@ endif()
 include(GNUInstallDirs)
 
 install(
-    TARGETS fastfetch flashfetch
+    TARGETS fastfetch
     DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )
 
+if (TARGET flashfetch)
+    install(
+        TARGETS flashfetch
+        DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    )
+endif()
+
 if (TARGET ffwinrt)
     install(
         TARGETS ffwinrt

From e2fc83fd484e364f6dfd2da173ceee905f0acdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Fri, 20 Dec 2024 21:22:20 +0800
Subject: [PATCH 12/38] Bluetooth (Windows): silence compiler warnings

---
 src/detection/bluetooth/bluetooth_windows.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/detection/bluetooth/bluetooth_windows.cpp b/src/detection/bluetooth/bluetooth_windows.cpp
index 70fc1de18..e995d2376 100644
--- a/src/detection/bluetooth/bluetooth_windows.cpp
+++ b/src/detection/bluetooth/bluetooth_windows.cpp
@@ -55,7 +55,7 @@ const char* ffBluetoothDetectBattery(FFlist* devices)
         on_scope_exit releaseCallResult([&] { pCallResult && pCallResult->Release(); });
 
         IWbemClassObject* pResultObject = nullptr;
-        if (FAILED(pCallResult->GetResultObject(WBEM_INFINITE, &pResultObject)))
+        if (FAILED(pCallResult->GetResultObject((LONG) WBEM_INFINITE, &pResultObject)))
             continue;
         on_scope_exit releaseResultObject([&] { pResultObject && pResultObject->Release(); });
 

From 4adf7fda2820e6cc2f52f65999b42321d8746b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Fri, 20 Dec 2024 21:28:22 +0800
Subject: [PATCH 13/38] Brightness (NetBSD): add support for builtin display

---
 CMakeLists.txt                             |  2 +-
 src/detection/brightness/brightness_nbsd.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 src/detection/brightness/brightness_nbsd.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12bc09eef..a4886e3a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -704,7 +704,7 @@ elseif(NetBSD)
         src/detection/bluetoothradio/bluetoothradio_linux.c
         src/detection/board/board_nbsd.c
         src/detection/bootmgr/bootmgr_nosupport.c
-        src/detection/brightness/brightness_nosupport.c
+        src/detection/brightness/brightness_nbsd.c
         src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_nbsd.c
         src/detection/cpu/cpu_nbsd.c
diff --git a/src/detection/brightness/brightness_nbsd.c b/src/detection/brightness/brightness_nbsd.c
new file mode 100644
index 000000000..e7a3144e4
--- /dev/null
+++ b/src/detection/brightness/brightness_nbsd.c
@@ -0,0 +1,20 @@
+#include "brightness.h"
+
+#include "common/sysctl.h"
+
+const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result)
+{
+    // https://man.netbsd.org/NetBSD-10.1/acpiout.4#DESCRIPTION
+
+    int value = ffSysctlGetInt("hw.acpi.acpiout0.brightness", -1);
+    if (value == -1)
+        return "sysctl(hw.acpi.acpiout0.brightness) failed";
+
+    FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
+    ffStrbufInitStatic(&brightness->name, "acpiout");
+
+    brightness->max = 100;
+    brightness->min = 0;
+    brightness->current = value;
+    return NULL;
+}

From 9c47a3a9e79ee7e28a9794ea24c7d837a4445219 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Fri, 20 Dec 2024 22:11:28 +0800
Subject: [PATCH 14/38] Brightness (OpenBSD): add support

Requires root permission. Not tested
---
 CMakeLists.txt                             |  2 +-
 src/detection/brightness/brightness_obsd.c | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 src/detection/brightness/brightness_obsd.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4886e3a4..447286642 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -786,7 +786,7 @@ elseif(OpenBSD)
         src/detection/bluetoothradio/bluetoothradio_linux.c
         src/detection/board/board_nosupport.c
         src/detection/bootmgr/bootmgr_nosupport.c
-        src/detection/brightness/brightness_nosupport.c
+        src/detection/brightness/brightness_obsd.c
         src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_obsd.c
diff --git a/src/detection/brightness/brightness_obsd.c b/src/detection/brightness/brightness_obsd.c
new file mode 100644
index 000000000..ea5d7334c
--- /dev/null
+++ b/src/detection/brightness/brightness_obsd.c
@@ -0,0 +1,30 @@
+#include "brightness.h"
+#include "common/io/io.h"
+
+#include <dev/wscons/wsconsio.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result)
+{
+    FF_AUTO_CLOSE_FD int devfd = open("/dev/ttyC0", O_RDONLY);
+
+    if (devfd < 0) return "open(dev/ttyC0, O_RDONLY) failed";
+
+    struct wsdisplay_param param = {
+        .param = WSDISPLAYIO_PARAM_BRIGHTNESS,
+    };
+
+    if (ioctl(devfd, WSDISPLAYIO_GETPARAM, &param) < 0)
+        return "ioctl(WSDISPLAYIO_GETPARAM) failed";
+
+    FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
+    ffStrbufInitStatic(&brightness->name, "wsdisplay");
+
+    brightness->max = param.max;
+    brightness->min = param.min;
+    brightness->current = param.curval;
+
+    return NULL;
+}

From 0f454b7140ec2d95437d4adc4f420947bf72eced Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 12:04:57 +0800
Subject: [PATCH 15/38] Battery (OpenBSD): add support

---
 CMakeLists.txt                       |  2 +-
 src/detection/battery/battery_obsd.c | 52 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 src/detection/battery/battery_obsd.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 447286642..a70379ee4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -780,7 +780,7 @@ elseif(OpenBSD)
         src/common/networking_linux.c
         src/common/processing_linux.c
         src/common/sysctl.c
-        src/detection/battery/battery_nosupport.c
+        src/detection/battery/battery_obsd.c
         src/detection/bios/bios_nosupport.c
         src/detection/bluetooth/bluetooth_linux.c
         src/detection/bluetoothradio/bluetoothradio_linux.c
diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c
new file mode 100644
index 000000000..034f8b20d
--- /dev/null
+++ b/src/detection/battery/battery_obsd.c
@@ -0,0 +1,52 @@
+#include "battery.h"
+#include "common/io/io.h"
+
+#include <machine/apmvar.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* result)
+{
+    FF_AUTO_CLOSE_FD int devfd = open("/dev/apm", O_RDONLY);
+
+    if (devfd < 0) return "open(dev/apm, O_RDONLY) failed";
+
+    struct apm_power_info info = {};
+
+    if (ioctl(devfd, APM_IOC_GETPOWER, &info) < 0)
+        return "ioctl(APM_IOC_GETPOWER) failed";
+
+    if (info.battery_state == APM_BATTERY_ABSENT)
+        return NULL;
+
+    FFBatteryResult* battery = (FFBatteryResult*) ffListAdd(result);
+    battery->temperature = FF_BATTERY_TEMP_UNSET;
+    battery->cycleCount = 0;
+    battery->timeRemaining = -1;
+    battery->capacity = info.battery_life;
+    ffStrbufInit(&battery->manufacturer);
+    ffStrbufInit(&battery->modelName);
+    ffStrbufInit(&battery->status);
+    ffStrbufInit(&battery->technology);
+    ffStrbufInit(&battery->serial);
+    ffStrbufInit(&battery->manufactureDate);
+
+    if (info.ac_state == APM_AC_ON)
+        ffStrbufAppendS(&battery->status, "AC Connected");
+    else if (info.ac_state == APM_AC_BACKUP)
+        ffStrbufAppendS(&battery->status, "Backup In Use");
+    else if (info.ac_state == APM_AC_OFF)
+    {
+        battery->timeRemaining = info.minutes_left * 60
+        ffStrbufAppendS(&battery->status, "Discharging");
+    }
+
+    if (info.battery_state == APM_BATT_CRITICAL || info.battery_state == APM_BATT_CHARGING)
+    {
+        if (battery->status.length) ffStrbufAppendS(&battery->status, ", ");
+        ffStrbufAppendS(&battery->status, info.battery_state == APM_BATT_CRITICAL ? "Critical" : "Charging");
+    }
+
+    return NULL;
+}

From 852a729581eca876c0b24ff1def2ff655ea99719 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 14:08:30 +0800
Subject: [PATCH 16/38] Battary (NetBSD): some basic investigation of acpi
 battery detection

---
 CMakeLists.txt                       |  3 +-
 src/detection/battery/battery_nbsd.c | 42 ++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/detection/battery/battery_nbsd.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a70379ee4..bb569c19d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -698,7 +698,7 @@ elseif(NetBSD)
         src/common/networking_linux.c
         src/common/processing_linux.c
         src/common/sysctl.c
-        src/detection/battery/battery_nosupport.c
+        src/detection/battery/battery_nbsd.c
         src/detection/bios/bios_nbsd.c
         src/detection/bluetooth/bluetooth_linux.c
         src/detection/bluetoothradio/bluetoothradio_linux.c
@@ -1486,6 +1486,7 @@ elseif(OpenBSD)
 elseif(NetBSD)
     target_link_libraries(libfastfetch
         PRIVATE "m"
+        PRIVATE "prop"
     )
 elseif(SunOS)
     target_link_libraries(libfastfetch
diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c
new file mode 100644
index 000000000..49f637559
--- /dev/null
+++ b/src/detection/battery/battery_nbsd.c
@@ -0,0 +1,42 @@
+#include "fastfetch.h"
+#include "battery.h"
+#include "common/io/io.h"
+
+#include <sys/envsys.h>
+#include <prop/proplib.h>
+#include <paths.h>
+#include <time.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
+{
+    FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);
+    if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";
+
+    prop_dictionary_t root = NULL;
+    if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)
+        return "prop_dictionary_recv_ioctl(ENVSYS_GETDICTIONARY) failed";
+
+    prop_array_t array = prop_dictionary_get(root, "acpiacad0");
+    if (!array)
+        return "No key `acpibat0` in root dictionary";
+
+    if (prop_array_count(array) != 2)
+        return "Unexpect `acpibat0` data";
+
+    prop_dictionary_t dict = prop_array_get(array, 0);
+    if (prop_object_type(dict) != PROP_TYPE_DICTIONARY)
+        return "Unexpect `acpibat0[0]`";
+
+    //prop_array_t keys = prop_dictionary_all_keys(dict);
+    //for (uint32_t i = 0; i < prop_array_count(keys); ++i)
+    //    puts(prop_dictionary_keysym_value(prop_array_get(keys, i)));
+
+    int acConnected = false;
+    prop_dictionary_get_int(dict, "cur-value", &acConnected);
+
+    // TODO: actually use acpibat0
+
+    return acConnected ? "AC Connected" : "Discharging";
+}

From 1ea3264b130673568dd14b7f833df6e758c498f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 18:38:54 +0800
Subject: [PATCH 17/38] SMBIOS (NetBSD): add more data

---
 src/detection/board/board_nbsd.c     | 2 ++
 src/detection/chassis/chassis_nbsd.c | 2 ++
 src/detection/host/host_nbsd.c       | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/src/detection/board/board_nbsd.c b/src/detection/board/board_nbsd.c
index 9557cc339..cc89149aa 100644
--- a/src/detection/board/board_nbsd.c
+++ b/src/detection/board/board_nbsd.c
@@ -10,6 +10,8 @@ const char* ffDetectBoard(FFBoardResult* board)
         ffCleanUpSmbiosValue(&board->version);
     if (ffSysctlGetString("machdep.dmi.board-vendor", &board->vendor) == NULL)
         ffCleanUpSmbiosValue(&board->vendor);
+    if (ffSysctlGetString("machdep.dmi.board-serial", &board->serial) == NULL)
+        ffCleanUpSmbiosValue(&board->serial);
 
     return NULL;
 }
diff --git a/src/detection/chassis/chassis_nbsd.c b/src/detection/chassis/chassis_nbsd.c
index 796c241a9..c2593bf85 100644
--- a/src/detection/chassis/chassis_nbsd.c
+++ b/src/detection/chassis/chassis_nbsd.c
@@ -10,6 +10,8 @@ const char* ffDetectChassis(FFChassisResult* chassis)
         ffCleanUpSmbiosValue(&chassis->version);
     if (ffSysctlGetString("machdep.dmi.chassis-vendor", &chassis->vendor) == NULL)
         ffCleanUpSmbiosValue(&chassis->vendor);
+    if (ffSysctlGetString("machdep.dmi.chassis-serial", &chassis->serial) == NULL)
+        ffCleanUpSmbiosValue(&chassis->serial);
 
     return NULL;
 }
diff --git a/src/detection/host/host_nbsd.c b/src/detection/host/host_nbsd.c
index 947198cb6..8fd61abf2 100644
--- a/src/detection/host/host_nbsd.c
+++ b/src/detection/host/host_nbsd.c
@@ -12,6 +12,10 @@ const char* ffDetectHost(FFHostResult* host)
         ffCleanUpSmbiosValue(&host->vendor);
     if (ffSysctlGetString("machdep.dmi.system-version", &host->version) == NULL)
         ffCleanUpSmbiosValue(&host->version);
+    if (ffSysctlGetString("machdep.dmi.system-serial", &host->serial) == NULL)
+        ffCleanUpSmbiosValue(&host->serial);
+    if (ffSysctlGetString("machdep.dmi.system-uuid", &host->uuid) == NULL)
+        ffCleanUpSmbiosValue(&host->uuid);
 
     return NULL;
 }

From 5a8dda27ffd4fe6ac029bc7d0c5e68f312251fbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 18:53:25 +0800
Subject: [PATCH 18/38] CPU (NetBSD): support temp and frequency detection

---
 src/detection/cpu/cpu_nbsd.c | 63 +++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c
index 0a78ed146..17ce880df 100644
--- a/src/detection/cpu/cpu_nbsd.c
+++ b/src/detection/cpu/cpu_nbsd.c
@@ -1,26 +1,42 @@
 #include "cpu.h"
 #include "common/sysctl.h"
-#include <sys/sysctl.h>
+#include "common/io/io.h"
+
+#include <sys/envsys.h>
+#include <prop/proplib.h>
+#include <paths.h>
+#include <time.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 static const char* detectCpuTemp(double* current)
 {
-    int temp = ffSysctlGetInt("dev.cpu.0.temperature", -999999);
-    if (temp == -999999)
-        return "ffSysctlGetInt(\"dev.cpu.0.temperature\") failed";
+    FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);
+    if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";
 
-    // In tenth of degrees Kelvin
-    *current = (double) temp / 10 - 273.15;
-    return NULL;
-}
+    prop_dictionary_t root = NULL;
+    if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)
+        return "prop_dictionary_recv_ioctl(ENVSYS_GETDICTIONARY) failed";
 
-static const char* detectThermalTemp(double* current)
-{
-    int temp = ffSysctlGetInt("hw.acpi.thermal.tz0.temperature", -999999);
-    if (temp == -999999)
-        return "ffSysctlGetInt(\"hw.acpi.thermal.tz0.temperature\") failed";
+    prop_array_t array = prop_dictionary_get(root, "coretemp0");
+    if (!array) array = prop_dictionary_get(root, "amdzentemp0");
+    if (!array) array = prop_dictionary_get(root, "viac7temp0");
+    if (!array) array = prop_dictionary_get(root, "acpitz0"); // Thermal Zones
+    if (!array) return "No temp data found in root dictionary";
+
+    if (prop_array_count(array) != 2)
+        return "Unexpect `xtemp0` data";
+
+    prop_dictionary_t dict = prop_array_get(array, 0);
+    if (prop_object_type(dict) != PROP_TYPE_DICTIONARY)
+        return "Unexpect `xtemp0[0]`";
+
+    int temp = 0; // in µK
+    if (!prop_dictionary_get_int(dict, "cur-value", &temp))
+        return "Failed to get temperature";
+
+    *current = temp / 1e6 - 273.15;
 
-    // In tenth of degrees Kelvin
-    *current = (double) temp / 10 - 273.15;
     return NULL;
 }
 
@@ -32,26 +48,21 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
             return "sysctlbyname(machdep.cpu_brand) failed";
     }
 
+    ffSysctlGetString("machdep.dmi.processor-vendor", &cpu->vendor);
+
     cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.ncpu", 1);
     cpu->coresLogical = cpu->coresPhysical;
     cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.ncpuonline", cpu->coresLogical);
 
     ffCPUDetectSpeedByCpuid(cpu);
 
-    {
-        struct clockinfo info;
-        size_t length = sizeof(info);
-        if (sysctl((int[]) {CTL_KERN, KERN_CLOCKRATE}, 2, &info, &length, NULL, 0) == 0)
-            cpu->frequencyBase = (uint32_t) info.hz / 1000;
-    }
+    uint32_t freq = (uint32_t) ffSysctlGetInt("machdep.cpu.frequency.target", 0);
+    if (freq > cpu->frequencyBase)
+        cpu->frequencyBase = freq;
 
     cpu->temperature = FF_CPU_TEMP_UNSET;
 
-    if (options->temp)
-    {
-        if (detectCpuTemp(&cpu->temperature) != NULL)
-            detectThermalTemp(&cpu->temperature);
-    }
+    if (options->temp) detectCpuTemp(&cpu->temperature);
 
     return NULL;
 }

From 45f7e2c0b2a9ee2bd13eeb0868117a4a906f7fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 19:57:34 +0800
Subject: [PATCH 19/38] Version (NetBSD): report sysname

---
 src/detection/version/version.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/detection/version/version.c b/src/detection/version/version.c
index 1f1deb348..a979bde5f 100644
--- a/src/detection/version/version.c
+++ b/src/detection/version/version.c
@@ -40,6 +40,8 @@
     #define FF_SYSNAME "SunOS"
 #elif defined(__OpenBSD__)
     #define FF_SYSNAME "OpenBSD"
+#elif defined(__NetBSD__)
+    #define FF_SYSNAME "NetBSD"
 #else
     #define FF_SYSNAME "unknown"
 #endif

From b38d7a4919c239f83be7b095f43a06d214a14589 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 20:13:07 +0800
Subject: [PATCH 20/38] Brightness (NetBSD): don't error out if the screen idx
 isn't 0

---
 src/detection/brightness/brightness_nbsd.c | 23 +++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/detection/brightness/brightness_nbsd.c b/src/detection/brightness/brightness_nbsd.c
index e7a3144e4..1fd7773b0 100644
--- a/src/detection/brightness/brightness_nbsd.c
+++ b/src/detection/brightness/brightness_nbsd.c
@@ -5,16 +5,21 @@
 const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result)
 {
     // https://man.netbsd.org/NetBSD-10.1/acpiout.4#DESCRIPTION
+    char key[] = "hw.acpi.acpiout0.brightness";
+    char* pn = key + strlen("hw.acpi.acpiout");
+    
+    for (uint32_t i = 0; i <= 9; ++i)
+    {
+        *pn = (char) ('0' + i);
+        int value = ffSysctlGetInt(key, -1);
+        if (value == -1) continue;
 
-    int value = ffSysctlGetInt("hw.acpi.acpiout0.brightness", -1);
-    if (value == -1)
-        return "sysctl(hw.acpi.acpiout0.brightness) failed";
+        FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
+        ffStrbufInitF(&brightness->name, "acpiout%d", i);
 
-    FFBrightnessResult* brightness = (FFBrightnessResult*) ffListAdd(result);
-    ffStrbufInitStatic(&brightness->name, "acpiout");
-
-    brightness->max = 100;
-    brightness->min = 0;
-    brightness->current = value;
+        brightness->max = 100;
+        brightness->min = 0;
+        brightness->current = value;
+    }
     return NULL;
 }

From b99f54b9f438c33e61c513183191228dab4934c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 20:23:18 +0800
Subject: [PATCH 21/38] CPU (NetBSD): trim CPU vendor

---
 src/detection/cpu/cpu_nbsd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c
index 17ce880df..c850766da 100644
--- a/src/detection/cpu/cpu_nbsd.c
+++ b/src/detection/cpu/cpu_nbsd.c
@@ -48,7 +48,8 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
             return "sysctlbyname(machdep.cpu_brand) failed";
     }
 
-    ffSysctlGetString("machdep.dmi.processor-vendor", &cpu->vendor);
+    if (ffSysctlGetString("machdep.dmi.processor-vendor", &cpu->vendor) == NULL)
+        ffStrbufTrimRightSpace(&cpu->vendor);
 
     cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.ncpu", 1);
     cpu->coresLogical = cpu->coresPhysical;

From b8048ee488ab3638ea37d01f805f2c82e3ac0cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 20:25:29 +0800
Subject: [PATCH 22/38] Bluetooth (BSD): disable

bluez is Linux specific
---
 CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb569c19d..886f84020 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -617,8 +617,8 @@ elseif(FreeBSD)
         src/common/sysctl.c
         src/detection/battery/battery_bsd.c
         src/detection/bios/bios_bsd.c
-        src/detection/bluetooth/bluetooth_linux.c
-        src/detection/bluetoothradio/bluetoothradio_linux.c
+        src/detection/bluetooth/bluetooth_nosupport.c
+        src/detection/bluetoothradio/bluetoothradio_nosupport.c
         src/detection/board/board_bsd.c
         src/detection/bootmgr/bootmgr_bsd.c
         src/detection/brightness/brightness_bsd.c
@@ -700,8 +700,8 @@ elseif(NetBSD)
         src/common/sysctl.c
         src/detection/battery/battery_nbsd.c
         src/detection/bios/bios_nbsd.c
-        src/detection/bluetooth/bluetooth_linux.c
-        src/detection/bluetoothradio/bluetoothradio_linux.c
+        src/detection/bluetooth/bluetooth_nosupport.c
+        src/detection/bluetoothradio/bluetoothradio_nosupport.c
         src/detection/board/board_nbsd.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nbsd.c
@@ -782,8 +782,8 @@ elseif(OpenBSD)
         src/common/sysctl.c
         src/detection/battery/battery_obsd.c
         src/detection/bios/bios_nosupport.c
-        src/detection/bluetooth/bluetooth_linux.c
-        src/detection/bluetoothradio/bluetoothradio_linux.c
+        src/detection/bluetooth/bluetooth_nosupport.c
+        src/detection/bluetoothradio/bluetoothradio_nosupport.c
         src/detection/board/board_nosupport.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_obsd.c

From 7c1991c2e3f9fb17a2abefb3f170c6ccfa6407c4 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Sat, 21 Dec 2024 22:29:41 +0800
Subject: [PATCH 23/38] Battery (NetBSD): add support

---
 src/detection/battery/battery_nbsd.c | 101 ++++++++++++++++++++++-----
 1 file changed, 83 insertions(+), 18 deletions(-)

diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c
index 49f637559..682bfbfd2 100644
--- a/src/detection/battery/battery_nbsd.c
+++ b/src/detection/battery/battery_nbsd.c
@@ -1,7 +1,12 @@
-#include "fastfetch.h"
 #include "battery.h"
 #include "common/io/io.h"
+#include "util/FFstrbuf.h"
+#include "util/stringUtils.h"
 
+#include <prop/prop_array.h>
+#include <prop/prop_bool.h>
+#include <prop/prop_dictionary.h>
+#include <prop/prop_object.h>
 #include <sys/envsys.h>
 #include <prop/proplib.h>
 #include <paths.h>
@@ -9,7 +14,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
+const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* results)
 {
     FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);
     if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";
@@ -18,25 +23,85 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
     if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)
         return "prop_dictionary_recv_ioctl(ENVSYS_GETDICTIONARY) failed";
 
-    prop_array_t array = prop_dictionary_get(root, "acpiacad0");
-    if (!array)
-        return "No key `acpibat0` in root dictionary";
+    bool acConnected = false;
+    {
+        prop_array_t acad = prop_dictionary_get(root, "acpiacad0");
+        if (acad)
+        {
+            prop_dictionary_t dict = prop_array_get(acad, 0);
+            prop_dictionary_get_uint8(dict, "cur-value", (uint8_t*) &acConnected);
+        }
+    }
 
-    if (prop_array_count(array) != 2)
-        return "Unexpect `acpibat0` data";
+    prop_object_iterator_t itKey = prop_dictionary_iterator(root);
+    for (prop_dictionary_keysym_t key; (key = prop_object_iterator_next(itKey)) != NULL; )
+    {
+        if (!ffStrStartsWith(prop_dictionary_keysym_value(key), "acpibat")) continue;
 
-    prop_dictionary_t dict = prop_array_get(array, 0);
-    if (prop_object_type(dict) != PROP_TYPE_DICTIONARY)
-        return "Unexpect `acpibat0[0]`";
+        prop_array_t bat = prop_dictionary_get_keysym(root, key);
+        uint32_t max = 0, curr = 0, dischargeRate = 0;
+        bool charging = false, critical = false;
+        prop_object_iterator_t iter = prop_array_iterator(bat);
+        for (prop_dictionary_t dict; (dict = prop_object_iterator_next(iter)) != NULL;)
+        {
+            if (prop_object_type(dict) != PROP_TYPE_DICTIONARY)
+                continue;
+        
+            const char* desc = NULL;
+            if (!prop_dictionary_get_string(dict, "description", &desc))
+                continue;
 
-    //prop_array_t keys = prop_dictionary_all_keys(dict);
-    //for (uint32_t i = 0; i < prop_array_count(keys); ++i)
-    //    puts(prop_dictionary_keysym_value(prop_array_get(keys, i)));
+            if (ffStrEquals(desc, "present"))
+            {
+                int value = 0;
+                if (prop_dictionary_get_int(dict, "cur-value", &value) && value == 0)
+                    continue;
+            }
+            else if (ffStrEquals(desc, "charging"))
+            {
+                prop_dictionary_get_uint8(dict, "cur-value", (uint8_t*) &charging);
+            }
+            else if (ffStrEquals(desc, "charge"))
+            {
+                prop_dictionary_get_uint32(dict, "max-value", &max);
+                prop_dictionary_get_uint32(dict, "cur-value", &curr);
+                const char* state = NULL;
+                if (prop_dictionary_get_string(dict, "state", &state) && ffStrEquals(state, "critical"))
+                    critical = true;
+            }
+            else if (ffStrEquals(desc, "discharge rate"))
+            {
+                prop_dictionary_get_uint(dict, "cur-value", &dischargeRate);
+            }
+        }
 
-    int acConnected = false;
-    prop_dictionary_get_int(dict, "cur-value", &acConnected);
+        if (max > 0)
+        {
+            FFBatteryResult* battery = ffListAdd(results);
+            battery->temperature = FF_BATTERY_TEMP_UNSET;
+            battery->cycleCount = 0;
+            ffStrbufInit(&battery->manufacturer);
+            ffStrbufInit(&battery->modelName);
+            ffStrbufInit(&battery->status);
+            ffStrbufInit(&battery->technology);
+            ffStrbufInit(&battery->serial);
+            ffStrbufInit(&battery->manufactureDate);
+            battery->timeRemaining = -1;
 
-    // TODO: actually use acpibat0
-
-    return acConnected ? "AC Connected" : "Discharging";
+            battery->capacity = (double) curr / max;
+            if (charging)
+                ffStrbufAppendS(&battery->status, "Charging, ");
+            else if (dischargeRate)
+                ffStrbufAppendS(&battery->status, "Discharging, ");
+            if (critical)
+                ffStrbufAppendS(&battery->status, "Critical, ");
+            if (acConnected)
+                ffStrbufAppendS(&battery->status, "AC Connected");
+            ffStrbufTrimRight(&battery->status, ' ');
+            ffStrbufTrimRight(&battery->status, ',');
+        }
+    }
+    prop_object_iterator_release(itKey);
+    
+    return NULL;
 }

From d3e40f625b25bfba0cae136ba32b5450004cf67b Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Sun, 22 Dec 2024 09:29:36 +0800
Subject: [PATCH 24/38] Battery (OpenBSD): fix build

---
 src/detection/battery/battery_obsd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c
index 034f8b20d..ea4f73148 100644
--- a/src/detection/battery/battery_obsd.c
+++ b/src/detection/battery/battery_obsd.c
@@ -38,7 +38,7 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
         ffStrbufAppendS(&battery->status, "Backup In Use");
     else if (info.ac_state == APM_AC_OFF)
     {
-        battery->timeRemaining = info.minutes_left * 60
+        battery->timeRemaining = (int) info.minutes_left * 60;
         ffStrbufAppendS(&battery->status, "Discharging");
     }
 

From 851f271ed566823340365804b037bc1e414cb54e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sun, 22 Dec 2024 14:20:32 +0800
Subject: [PATCH 25/38] CPU (NetBSD): fix typo

---
 src/detection/cpu/cpu_nbsd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c
index c850766da..12e6bb4cd 100644
--- a/src/detection/cpu/cpu_nbsd.c
+++ b/src/detection/cpu/cpu_nbsd.c
@@ -25,11 +25,11 @@ static const char* detectCpuTemp(double* current)
     if (!array) return "No temp data found in root dictionary";
 
     if (prop_array_count(array) != 2)
-        return "Unexpect `xtemp0` data";
+        return "Unexpected `xtemp0` data";
 
     prop_dictionary_t dict = prop_array_get(array, 0);
     if (prop_object_type(dict) != PROP_TYPE_DICTIONARY)
-        return "Unexpect `xtemp0[0]`";
+        return "Unexpected `xtemp0[0]`";
 
     int temp = 0; // in µK
     if (!prop_dictionary_get_int(dict, "cur-value", &temp))

From 2f3861e7328f08ba299cd45f4922142d341487a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sun, 22 Dec 2024 20:27:27 +0800
Subject: [PATCH 26/38] PhysicalMemory: clean up garbage data

---
 src/detection/physicalmemory/physicalmemory.c       | 1 +
 src/detection/physicalmemory/physicalmemory_linux.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/detection/physicalmemory/physicalmemory.c b/src/detection/physicalmemory/physicalmemory.c
index c5df181f3..70e111b08 100644
--- a/src/detection/physicalmemory/physicalmemory.c
+++ b/src/detection/physicalmemory/physicalmemory.c
@@ -23,6 +23,7 @@ static inline const char* getVendorString(unsigned vendorId)
 
 void FFPhysicalMemoryUpdateVendorString(FFPhysicalMemoryResult* device)
 {
+    if (device->vendor.length == 0) return;
     if (ffStrbufEqualS(&device->vendor, "Unknown"))
     {
         ffStrbufClear(&device->vendor);
diff --git a/src/detection/physicalmemory/physicalmemory_linux.c b/src/detection/physicalmemory/physicalmemory_linux.c
index fc83f92a3..cfc18fe30 100644
--- a/src/detection/physicalmemory/physicalmemory_linux.c
+++ b/src/detection/physicalmemory/physicalmemory_linux.c
@@ -191,6 +191,7 @@ const char* ffDetectPhysicalMemory(FFlist* result)
                 device->maxSpeed = data->Speed == 0xFFFF ? data->ExtendedSpeed : data->Speed;
 
             ffStrbufSetStatic(&device->vendor, ffSmbiosLocateString(strings, data->Manufacturer));
+            ffCleanUpSmbiosValue(&device->vendor);
             FFPhysicalMemoryUpdateVendorString(device);
 
             ffStrbufSetStatic(&device->serial, ffSmbiosLocateString(strings, data->SerialNumber));

From dadd4bfab641815f677b7d201b7792b3fdc9b473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sun, 22 Dec 2024 20:43:36 +0800
Subject: [PATCH 27/38] DiskIO (OpenBSD): remove debug output

---
 src/detection/diskio/diskio_obsd.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/detection/diskio/diskio_obsd.c b/src/detection/diskio/diskio_obsd.c
index b00b733a2..437d93caf 100644
--- a/src/detection/diskio/diskio_obsd.c
+++ b/src/detection/diskio/diskio_obsd.c
@@ -13,8 +13,6 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
         return "sysctl({HW_DISKSTATS}, NULL) failed";
     uint32_t nDrive = (uint32_t) (len / sizeof(struct diskstats));
 
-    printf("C: %d\n", nDrive);
-
     struct diskstats* stats = malloc(len);
 
     if (sysctl(mib, ARRAY_SIZE(mib), stats, &len, NULL, 0) < 0)

From e0253d71c0e3ff52db465567d6654dcd88d1b293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sun, 22 Dec 2024 20:45:51 +0800
Subject: [PATCH 28/38] Doc: add comments for running fastfetch in root

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 01f9d44bf..3563d39f8 100644
--- a/README.md
+++ b/README.md
@@ -199,6 +199,10 @@ Try upgrading `pci.ids`: Download <https://pci-ids.ucw.cz/v2.2/pci.ids> and over
 
 Alternatively, you may try to use `fastfetch --gpu-driver-specific`, so that `fastfetch` will try to ask the driver for GPU name if supported.
 
+### Q: I get error `Authorization required, but no authorization protocol specified` when running fastfetch in root
+
+Try `export XAUTHORITY=$HOME/.Xauthority`
+
 ### Q: Fastfetch cannot detect my awesome 3rd-party macOS window manager!
 
 Try `fastfetch --wm-detect-plugin`. See also [#984](https://github.com/fastfetch-cli/fastfetch/issues/984)

From 66085c087e6e46c1008bba70d204eb248eebcb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sun, 22 Dec 2024 21:48:18 +0800
Subject: [PATCH 29/38] Logo (Builtin): add NurOS

Fix #1456
---
 src/logo/ascii/nuros.txt | 12 ++++++++++++
 src/logo/builtin.c       |  9 +++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 src/logo/ascii/nuros.txt

diff --git a/src/logo/ascii/nuros.txt b/src/logo/ascii/nuros.txt
new file mode 100644
index 000000000..577b9c4d5
--- /dev/null
+++ b/src/logo/ascii/nuros.txt
@@ -0,0 +1,12 @@
+         ___╓╓___
+     _▄▄▓▓▀▀╜╜╨▀▓▓▓╗_
+   ╓▓▓▀²          `╙▓▓╖
+  ╣▓▀   _▄▓▓▓▓▓▓W_   ╙▓▓
+ ╣▓╜  ,▓▓▓▓▓▓▓▓▓▓▓▓_  ²▓▓
+╒▓▌   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓   ║▓m
+╞▓▓  í▓▓▓▓▓▓▓▓▓▓▓▓▓▓h  ╞▓╡
+²▓▓   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓   ║▓h
+ ║▓▄   ╙▓▓▓▓▓▓▓▓▓▓╜   ƒ▓▓
+  ╙▓▓_   ⁿ╙╨╝╝╝╜²   _╢▓╜
+    ╙▓▓╗__       _╗▓▓╜
+      `╙╝▓▓▓▓▓▓▓▓╝╙
\ No newline at end of file
diff --git a/src/logo/builtin.c b/src/logo/builtin.c
index a8271d6f5..44eb06b46 100644
--- a/src/logo/builtin.c
+++ b/src/logo/builtin.c
@@ -3086,6 +3086,15 @@ static const FFlogo N[] = {
         .colorKeys = FF_COLOR_FG_BLUE,
         .colorTitle = FF_COLOR_FG_WHITE,
     },
+    // NurOS
+    {
+        .names = {"NurOS"},
+        .lines = FASTFETCH_DATATEXT_LOGO_NUROS,
+        .colors = {
+            FF_COLOR_FG_BLUE,
+            FF_COLOR_FG_WHITE,
+        },
+    },
     // Nurunner
     {
         .names = {"Nurunner"},

From 47360315382c1ed43a0e3114e129823865d93429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Sun, 22 Dec 2024 22:19:02 +0800
Subject: [PATCH 30/38] Doc: update changelog [ci skip]

---
 CHANGELOG.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a8495dc6..2b57654a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+# 2.33.0
+
+Changes:
+* Introduce a new CMake flag `-DBUILD_FLASHFETCH=OFF` to disable building flashfetch binaries
+    * Package managers are encouraged to enable it. See <https://github.com/fastfetch-cli/fastfetch/discussions/627> for detail
+
+Bugfixes:
+* Fix interconnect type detection (#1453, PhysicalDisk, Linux)
+* Don't report `proot` as terminal (Terminal, Android)
+* Remove a debug output (DiskIO, OpenBSD)
+
+Features:
+* Use `$POWERSHELL_VERSION` as PowerShell version if available (Shell, Windows)
+    * Fetching Windows PowerShell version can be very slow. Add `$env:POWERSHELL_VERSION = $PSVersionTable.PSVersion.ToString()` in `$PROFILE` before running `fastfetch` to improve the performance of `Shell` module
+* Add support for ubuntu-based armbian detection (#1447, OS, Linux)
+* Improve performance of Bluetooth detection (Bluetooth)
+    * We no longer report disconnected bluetooth devices in `--format json` when `--bluetooth-show-disconnected` isn't specified
+* Support brightness level detection for builtin displays (Brightness, OpenBSD / NetBSD)
+    * Requires root permission on OpenBSD
+* Support battery level detection (Battery, OpenBSD / NetBSD)
+* Support CPU temperature detection in NetBSD (CPU, NetBSD)
+
+Logo:
+* Add NurOS
+
 # 2.32.1
 
 A hotfix for OpenBSD. No changes to other platforms.

From e0fd5111fe66b9b396b9393449ff25dfdd3b56c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui@live.cn>
Date: Tue, 24 Dec 2024 09:31:50 +0800
Subject: [PATCH 31/38] Media (Linux): Fix #1461 (WIP)

---
 src/detection/media/media_linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c
index a4953de50..7cf2a4c06 100644
--- a/src/detection/media/media_linux.c
+++ b/src/detection/media/media_linux.c
@@ -78,7 +78,7 @@ static bool parseMprisMetadata(FFDBusData* data, DBusMessageIter* rootIterator,
 static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResult* result)
 {
     // Get all properties at once to reduce the number of IPCs
-    DBusMessage* reply = ffDBusGetAllProperties(data, busName, "/org/mpris/MediaPlayer2", "");
+    DBusMessage* reply = ffDBusGetAllProperties(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player");
     if(reply == NULL)
         return false;
 

From d939f95c696b20cc89d32ac141fe5ef796353eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Tue, 24 Dec 2024 21:19:26 +0800
Subject: [PATCH 32/38] Vulkan (Android): hard code path of `libvulkan.so`, so
 that users don't need to install vulkan-loader wrapper of termux

---
 src/detection/vulkan/vulkan.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c
index 3f26b747e..571ab50d4 100644
--- a/src/detection/vulkan/vulkan.c
+++ b/src/detection/vulkan/vulkan.c
@@ -39,13 +39,20 @@ static void applyDriverName(VkPhysicalDeviceDriverPropertiesKHR* properties, FFs
 
 static const char* detectVulkan(FFVulkanResult* result)
 {
-    FF_LIBRARY_LOAD(vulkan, "dlopen libvulkan"FF_LIBRARY_EXTENSION " failed",
-        #ifdef __APPLE__
-            "libMoltenVK"FF_LIBRARY_EXTENSION, -1
-        #elif defined(_WIN32)
-            "vulkan-1"FF_LIBRARY_EXTENSION, -1
+    FF_LIBRARY_LOAD(vulkan, "dlopen libvulkan" FF_LIBRARY_EXTENSION " failed",
+        #if __ANDROID__
+            #if UINTPTR_MAX == UINT32_MAX
+                "/system/lib/"
+            #else
+                "/system/lib64/"
+            #endif
+            "libvulkan" FF_LIBRARY_EXTENSION, -1
+        #elif __APPLE__
+            "libMoltenVK" FF_LIBRARY_EXTENSION, -1
+        #elif _WIN32
+            "vulkan-1" FF_LIBRARY_EXTENSION, -1
         #else
-            "libvulkan"FF_LIBRARY_EXTENSION, 2
+            "libvulkan" FF_LIBRARY_EXTENSION, 2
         #endif
     )
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(vulkan, vkGetInstanceProcAddr)

From 28ec935c42135a59206e0bb458006e9fa82ef058 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Wed, 25 Dec 2024 08:50:28 +0800
Subject: [PATCH 33/38] Media (Linux): report player name

---
 src/detection/media/media_linux.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c
index 7cf2a4c06..8d977771e 100644
--- a/src/detection/media/media_linux.c
+++ b/src/detection/media/media_linux.c
@@ -112,10 +112,6 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
             parseMprisMetadata(data, &dictIterator, result);
         else if(ffStrEquals(key, "PlaybackStatus"))
             ffDBusGetString(data, &dictIterator, &result->status);
-        else if(ffStrEquals(key, "Identity"))
-            ffDBusGetString(data, &dictIterator, &result->player);
-        else if(ffStrEquals(key, "DesktopEntry"))
-            ffDBusGetString(data, &dictIterator, &desktopIdentity);
 
         FF_DBUS_ITER_CONTINUE(data, &arrayIterator)
     }
@@ -128,18 +124,15 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
         return false;
     }
 
-    if (result->player.length == 0)
-    {
-        if (desktopIdentity.length > 0)
-        {
-            ffStrbufDestroy(&result->player);
-            ffStrbufInitMove(&result->player, &desktopIdentity);
-        }
-        else
-        {
-            ffStrbufAppend(&result->player, &result->playerId);
-        }
-    }
+    //Set short bus name
+    ffStrbufAppendS(&result->playerId, busName + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
+
+    //We found a song, get the player name
+    ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "Identity", &result->player);
+    if(result->player.length == 0)
+        ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "DesktopEntry", &result->player);
+    if(result->player.length == 0)
+        ffStrbufAppend(&result->player, &result->playerId);
 
     data->lib->ffdbus_message_unref(reply);
 

From f38a51c9bcc993ada103164a5c68ca1a72c2fcef Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Wed, 25 Dec 2024 09:04:10 +0800
Subject: [PATCH 34/38] Media: make it able to print player info in custom
 format

---
 src/modules/media/media.c   | 18 ++++++++++++++----
 src/modules/player/player.c | 13 +------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/modules/media/media.c b/src/modules/media/media.c
index 8bdf13889..98e6aef45 100644
--- a/src/modules/media/media.c
+++ b/src/modules/media/media.c
@@ -99,6 +99,9 @@ void ffPrintMedia(FFMediaOptions* options)
             FF_FORMAT_ARG(media->artist, "artist"),
             FF_FORMAT_ARG(media->album, "album"),
             FF_FORMAT_ARG(media->status, "status"),
+            FF_FORMAT_ARG(media->player, "player-name"),
+            FF_FORMAT_ARG(media->playerId, "player-id"),
+            FF_FORMAT_ARG(media->url, "url"),
         }));
     }
 }
@@ -149,10 +152,17 @@ void ffGenerateMediaJsonResult(FF_MAYBE_UNUSED FFMediaOptions* options, yyjson_m
     }
 
     yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result");
-    yyjson_mut_obj_add_strbuf(doc, obj, "song", &media->song);
-    yyjson_mut_obj_add_strbuf(doc, obj, "artist", &media->artist);
-    yyjson_mut_obj_add_strbuf(doc, obj, "album", &media->album);
-    yyjson_mut_obj_add_strbuf(doc, obj, "status", &media->status);
+
+    yyjson_mut_val* song = yyjson_mut_obj_add_obj(doc, obj, "song");
+    yyjson_mut_obj_add_strbuf(doc, song, "name", &media->song);
+    yyjson_mut_obj_add_strbuf(doc, song, "artist", &media->artist);
+    yyjson_mut_obj_add_strbuf(doc, song, "album", &media->album);
+    yyjson_mut_obj_add_strbuf(doc, song, "status", &media->status);
+
+    yyjson_mut_val* player = yyjson_mut_obj_add_obj(doc, obj, "player");
+    yyjson_mut_obj_add_strbuf(doc, player, "name", &media->player);
+    yyjson_mut_obj_add_strbuf(doc, player, "id", &media->playerId);
+    yyjson_mut_obj_add_strbuf(doc, player, "url", &media->url);
 }
 
 static FFModuleBaseInfo ffModuleInfo = {
diff --git a/src/modules/player/player.c b/src/modules/player/player.c
index c462b3e2a..56f160149 100644
--- a/src/modules/player/player.c
+++ b/src/modules/player/player.c
@@ -118,18 +118,7 @@ void ffGeneratePlayerJsonConfig(FFPlayerOptions* options, yyjson_mut_doc* doc, y
 
 void ffGeneratePlayerJsonResult(FF_MAYBE_UNUSED FFMediaOptions* options, yyjson_mut_doc* doc, yyjson_mut_val* module)
 {
-    const FFMediaResult* media = ffDetectMedia();
-
-    if(media->error.length > 0)
-    {
-        yyjson_mut_obj_add_strbuf(doc, module, "error", &media->error);
-        return;
-    }
-
-    yyjson_mut_val* obj = yyjson_mut_obj_add_obj(doc, module, "result");
-    yyjson_mut_obj_add_strbuf(doc, obj, "player", &media->player);
-    yyjson_mut_obj_add_strbuf(doc, obj, "playerId", &media->playerId);
-    yyjson_mut_obj_add_strbuf(doc, obj, "url", &media->url);
+    yyjson_mut_obj_add_str(doc, module, "error", "Player module is an alias of Media module");
 }
 
 static FFModuleBaseInfo ffModuleInfo = {

From 2bfde87f84da5999b3180afa2e62e48085dd6cce Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Wed, 25 Dec 2024 09:37:20 +0800
Subject: [PATCH 35/38] Logo (Builtin): add GoralixOS

Fix #1462
---
 src/logo/ascii/goralixos.txt | 11 +++++++++++
 src/logo/builtin.c           |  9 +++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 src/logo/ascii/goralixos.txt

diff --git a/src/logo/ascii/goralixos.txt b/src/logo/ascii/goralixos.txt
new file mode 100644
index 000000000..907afc1f2
--- /dev/null
+++ b/src/logo/ascii/goralixos.txt
@@ -0,0 +1,11 @@
+              .7J~
+             ~G@&#5^             .^.
+           :5&&&&##B?.          !B&G7
+          7B##&&B##BBP~       ^P&@&##P~
+        $2^YGP5PBPPP5YY55?:   .7GGGB#BPPP7.
+      .?PPPPPPPPPP55YYY5Y!.^YPPPPPP5YYY5J~
+     !PPPPPPPPPPPPPP5YYYY5JY5PPPPPPP55YY55?:
+   ^YPPPPPPPPPPPPPPPPYYYYYYYYY5PPPPPPP5YYY5Y!.
+ .7PPPPPPPPPPPPPPPPPP5YYYYYYYYY55PPPPP5YYYYY5J~
+!5GPPPPPPPPPPPPPPPPPPPP55555555YY5PPPPPP5555555?:
+7777777777777777777777777!!!!!!!!!77777777!!!!!7!:
\ No newline at end of file
diff --git a/src/logo/builtin.c b/src/logo/builtin.c
index 44eb06b46..b062be144 100644
--- a/src/logo/builtin.c
+++ b/src/logo/builtin.c
@@ -1912,6 +1912,15 @@ static const FFlogo G[] = {
         .colorKeys = FF_COLOR_FG_MAGENTA,
         .colorTitle = FF_COLOR_FG_WHITE,
     },
+    // GoralixOS
+    {
+        .names = {"GoralixOS"},
+        .lines = FASTFETCH_DATATEXT_LOGO_GORALIXOS,
+        .colors = {
+            FF_COLOR_FG_WHITE,
+            FF_COLOR_FG_LIGHT_BLACK,
+        },
+    },
     // GrapheneOS
     {
         .names = {"GrapheneOS"},

From 2f13ee38146fb71cee452f3cbe6fcf0db38823c6 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Wed, 25 Dec 2024 10:26:55 +0800
Subject: [PATCH 36/38] Media (Linux): set player name manually for musikcube

---
 src/detection/media/media_linux.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c
index 8d977771e..4434f317e 100644
--- a/src/detection/media/media_linux.c
+++ b/src/detection/media/media_linux.c
@@ -128,11 +128,19 @@ static bool getBusProperties(FFDBusData* data, const char* busName, FFMediaResul
     ffStrbufAppendS(&result->playerId, busName + sizeof(FF_DBUS_MPRIS_PREFIX) - 1);
 
     //We found a song, get the player name
-    ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "Identity", &result->player);
-    if(result->player.length == 0)
-        ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "DesktopEntry", &result->player);
-    if(result->player.length == 0)
-        ffStrbufAppend(&result->player, &result->playerId);
+    if (ffStrbufStartsWithS(&result->playerId, "musikcube.instance"))
+    {
+        // dbus calls are EXTREMELY slow on musikcube, so we set the player name manually
+        ffStrbufSetStatic(&result->player, "musikcube");
+    }
+    else
+    {
+        ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "Identity", &result->player);
+        if(result->player.length == 0)
+            ffDBusGetPropertyString(data, busName, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2", "DesktopEntry", &result->player);
+        if(result->player.length == 0)
+            ffStrbufAppend(&result->player, &result->playerId);
+    }
 
     data->lib->ffdbus_message_unref(reply);
 

From e4202635af5669dde70de1c12cd0c767dd26abd7 Mon Sep 17 00:00:00 2001
From: Carter Li <zhangsongcui3371@sina.com>
Date: Wed, 25 Dec 2024 09:36:55 +0800
Subject: [PATCH 37/38] Doc: update changelog [ci skip]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b57654a5..16e800107 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Bugfixes:
 * Fix interconnect type detection (#1453, PhysicalDisk, Linux)
 * Don't report `proot` as terminal (Terminal, Android)
 * Remove a debug output (DiskIO, OpenBSD)
+* Fix media detection for some players (#1461, Media, Linux)
 
 Features:
 * Use `$POWERSHELL_VERSION` as PowerShell version if available (Shell, Windows)
@@ -19,9 +20,12 @@ Features:
     * Requires root permission on OpenBSD
 * Support battery level detection (Battery, OpenBSD / NetBSD)
 * Support CPU temperature detection in NetBSD (CPU, NetBSD)
+* Hard code path of `libvulkan.so` for Android
+    * So that users don't need to install the vulkan-loader wrapper of termux
 
 Logo:
 * Add NurOS
+* Add GoralixOS
 
 # 2.32.1
 

From f322405c041f737b76cb49b064b26180864d4444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
Date: Thu, 26 Dec 2024 08:54:23 +0800
Subject: [PATCH 38/38] Release: v2.33.0

---
 CHANGELOG.md   | 2 ++
 CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16e800107..ab2341eeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,11 @@ Changes:
 
 Bugfixes:
 * Fix interconnect type detection (#1453, PhysicalDisk, Linux)
+    * Regression of v2.28
 * Don't report `proot` as terminal (Terminal, Android)
 * Remove a debug output (DiskIO, OpenBSD)
 * Fix media detection for some players (#1461, Media, Linux)
+    * Regression of v2.32
 
 Features:
 * Use `$POWERSHELL_VERSION` as PowerShell version if available (Shell, Windows)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 886f84020..71c0e886e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.32.1
+    VERSION 2.33.0
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"