fastfetch-cli · Bluscream · Dec 26, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,10 +149,14 @@ else()
     message(STATUS "Threads type: disabled")
 endif()
 
-set(WARNING_FLAGS "-Wall -Wextra -Wconversion -Werror=uninitialized -Werror=return-type -Werror=vla")
+if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+    set(WARNING_FLAGS "-Wall -Wextra -Wconversion -Werror=uninitialized -Werror=return-type -Werror=vla")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion")
+else()
+    set(WARNING_FLAGS "")
+endif()
 
 set(CMAKE_C_STANDARD 11)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS} -Werror=incompatible-pointer-types -Werror=implicit-function-declaration -Werror=int-conversion")
 
 if(WIN32 OR Haiku OR ENABLE_DIRECTX_HEADERS)
     enable_language(CXX)
@@ -161,20 +165,27 @@ if(WIN32 OR Haiku OR ENABLE_DIRECTX_HEADERS)
 endif()
 
 if(WIN32)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--tsaware -Wl,--build-id -Wl,--subsystem,console:6.1,--major-os-version,6,--minor-os-version,1")
+    if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--tsaware -Wl,--build-id -Wl,--subsystem,console:6.1,--major-os-version,6,--minor-os-version,1")
+    else()
+        # MSVC linker flags
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE,6.1")
+    endif()
 elseif(APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-arc")
 endif()
 
-set(FASTFETCH_FLAGS_DEBUG "-fno-omit-frame-pointer")
-if(ENABLE_ASAN)
-    message(STATUS "Address sanitizer enabled (DEBUG only)")
-    set(FASTFETCH_FLAGS_DEBUG "${FASTFETCH_FLAGS_DEBUG} -fsanitize=address")
-endif()
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG}")
-set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG} -fstack-protector-all -fno-delete-null-pointer-checks")
-if(NOT WIN32)
-    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
+if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+    set(FASTFETCH_FLAGS_DEBUG "-fno-omit-frame-pointer")
+    if(ENABLE_ASAN)
+        message(STATUS "Address sanitizer enabled (DEBUG only)")
+        set(FASTFETCH_FLAGS_DEBUG "${FASTFETCH_FLAGS_DEBUG} -fsanitize=address")
+    endif()
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG}")
+    set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${FASTFETCH_FLAGS_DEBUG} -fstack-protector-all -fno-delete-null-pointer-checks")
+    if(NOT WIN32)
+        set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} -rdynamic")
+    endif()
 endif()
 
 if(ENABLE_LTO AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -467,6 +478,7 @@ set(LIBFASTFETCH_SRC
     src/modules/publicip/publicip.c
     src/modules/display/display.c
     src/modules/separator/separator.c
+    src/modules/security/security.c
     src/modules/shell/shell.c
     src/modules/sound/sound.c
     src/modules/swap/swap.c
@@ -514,6 +526,7 @@ if(LINUX)
         src/detection/board/board_linux.c
         src/detection/bootmgr/bootmgr_linux.c
         src/detection/brightness/brightness_linux.c
+        src/detection/security/security_linux.c
         src/detection/btrfs/btrfs_linux.c
         src/detection/chassis/chassis_linux.c
         src/detection/cpu/cpu_linux.c
@@ -600,6 +613,7 @@ elseif(ANDROID)
         src/detection/board/board_android.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
+        src/detection/security/security_nosupport.c
         src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_linux.c
@@ -1002,6 +1016,7 @@ elseif(WIN32)
         src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_windows.c
         src/detection/brightness/brightness_windows.cpp
+        src/detection/security/security_windows.c
         src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_windows.c
@@ -1073,6 +1088,7 @@ elseif(SunOS)
         src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
+        src/detection/security/security_nosupport.c
         src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_sunos.c
@@ -1154,6 +1170,7 @@ elseif(Haiku)
         src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
+        src/detection/security/security_nosupport.c
         src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_windows.c
         src/detection/cpu/cpu_haiku.c
@@ -1223,6 +1240,7 @@ elseif(GNU)
         src/detection/board/board_nosupport.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
+        src/detection/security/security_nosupport.c
         src/detection/btrfs/btrfs_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_linux.c

diff --git a/src/common/modules.c b/src/common/modules.c
@@ -126,6 +126,7 @@ static FFModuleBaseInfo* R[] = {
 
 static FFModuleBaseInfo* S[] = {
     &ffSeparatorModuleInfo,
+    &ffSecurityModuleInfo,
     &ffShellModuleInfo,
     &ffSoundModuleInfo,
     &ffSwapModuleInfo,

diff --git a/src/data/structure.txt b/src/data/structure.txt
@@ -1 +1 @@
-Title:Separator:OS:Host:Kernel:Uptime:Packages:Shell:Display:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:LocalIp:Battery:PowerAdapter:Locale:Break:Colors
+Title:Separator:OS:Host:Bios:Board:Security:Kernel:Uptime:Packages:Shell:Display:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:LocalIp:Battery:PowerAdapter:Locale:Break:Colors
diff --git a/src/detection/security/security.h b/src/detection/security/security.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "fastfetch.h"
+#include "modules/security/option.h"
+
+typedef struct FFSecurityResult
+{
+    FFstrbuf tpmStatus;
+    FFstrbuf secureBootStatus;
+} FFSecurityResult;
+
+const char* ffDetectSecurity(FFSecurityResult* result);
diff --git a/src/detection/security/security_linux.c b/src/detection/security/security_linux.c
@@ -0,0 +1,53 @@
+#include "security.h"
+#include "detection/tpm/tpm.h"
+#include "detection/bootmgr/bootmgr.h"
+
+const char* ffDetectSecurity(FFSecurityResult* result)
+{
+    ffStrbufInit(&result->tpmStatus);
+    ffStrbufInit(&result->secureBootStatus);
+
+    // Detect TPM
+    FFTPMResult tpm = {
+        .version = ffStrbufCreate(),
+        .description = ffStrbufCreate()
+    };
+    const char* tpmError = ffDetectTPM(&tpm);
+    if (tpmError == NULL)
+    {
+        if (tpm.version.length > 0)
+            ffStrbufSetF(&result->tpmStatus, "TPM %s", tpm.version.chars);
+        else
+            ffStrbufSetStatic(&result->tpmStatus, "TPM OK");
+    }
+    else
+    {
+        ffStrbufSetStatic(&result->tpmStatus, "TPM Not Available");
+    }
+    ffStrbufDestroy(&tpm.version);
+    ffStrbufDestroy(&tpm.description);
+
+    // Detect Secure Boot
+    FFBootmgrResult bootmgr = {
+        .name = ffStrbufCreate(),
+        .firmware = ffStrbufCreate(),
+        .order = 0,
+        .secureBoot = false
+    };
+    const char* bootmgrError = ffDetectBootmgr(&bootmgr);
+    if (bootmgrError == NULL)
+    {
+        if (bootmgr.secureBoot)
+            ffStrbufSetStatic(&result->secureBootStatus, "Secure Boot Enabled");
+        else
+            ffStrbufSetStatic(&result->secureBootStatus, "Secure Boot Disabled");
+    }
+    else
+    {
+        ffStrbufSetStatic(&result->secureBootStatus, "Secure Boot Unknown");
+    }
+    ffStrbufDestroy(&bootmgr.name);
+    ffStrbufDestroy(&bootmgr.firmware);
+
+    return NULL;
+}
diff --git a/src/detection/security/security_nosupport.c b/src/detection/security/security_nosupport.c
@@ -0,0 +1,10 @@
+#include "security.h"
+
+const char* ffDetectSecurity(FFSecurityResult* result)
+{
+    ffStrbufInit(&result->tpmStatus);
+    ffStrbufInit(&result->secureBootStatus);
+    ffStrbufSetStatic(&result->tpmStatus, "TPM Not Available");
+    ffStrbufSetStatic(&result->secureBootStatus, "Secure Boot Unknown");
+    return NULL;
+}
diff --git a/src/detection/security/security_windows.c b/src/detection/security/security_windows.c
@@ -0,0 +1,47 @@
+#include "security.h"
+#include "detection/tpm/tpm.h"
+#include "util/windows/registry.h"
+
+#include <windows.h>
+
+const char* ffDetectSecurity(FFSecurityResult* result)
+{
+    ffStrbufInit(&result->tpmStatus);
+    ffStrbufInit(&result->secureBootStatus);
+
+    // Detect TPM
+    FFTPMResult tpm = {
+        .version = ffStrbufCreate(),
+        .description = ffStrbufCreate()
+    };
+    const char* tpmError = ffDetectTPM(&tpm);
+    if (tpmError == NULL)
+    {
+        if (tpm.version.length > 0)
+            ffStrbufSetF(&result->tpmStatus, "TPM %s", tpm.version.chars);
+        else
+            ffStrbufSetStatic(&result->tpmStatus, "TPM OK");
+    }
+    else
+    {
+        ffStrbufSetStatic(&result->tpmStatus, "TPM Not Available");
+    }
+    ffStrbufDestroy(&tpm.version);
+    ffStrbufDestroy(&tpm.description);
+
+    // Detect Secure Boot directly from registry
+    DWORD uefiSecureBootEnabled = 0, bufSize = sizeof(uefiSecureBootEnabled);
+    if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\SecureBoot\\State", L"UEFISecureBootEnabled", RRF_RT_REG_DWORD, NULL, &uefiSecureBootEnabled, &bufSize) == ERROR_SUCCESS)
+    {
+        if (uefiSecureBootEnabled)
+            ffStrbufSetStatic(&result->secureBootStatus, "Secure Boot Enabled");
+        else
+            ffStrbufSetStatic(&result->secureBootStatus, "Secure Boot Disabled");
+    }
+    else
+    {
+        ffStrbufSetStatic(&result->secureBootStatus, "Secure Boot Unknown");
+    }
+
+    return NULL;
+}
diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c
@@ -51,11 +51,13 @@ bool ffPrintBios(FFBiosOptions* options)
     if(options->moduleArgs.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY);
+        if (bios.vendor.length > 0)
+        {
+            ffStrbufWriteTo(&bios.vendor, stdout);
+            putchar(' ');
+        }
         ffStrbufWriteTo(&bios.version, stdout);
-        if (bios.release.length)
-            printf(" (%s)\n", bios.release.chars);
-        else
-            putchar('\n');
+        putchar('\n');
     }
     else
     {

diff --git a/src/modules/board/board.c b/src/modules/board/board.c
@@ -29,9 +29,19 @@ bool ffPrintBoard(FFBoardOptions* options)
     if(options->moduleArgs.outputFormat.length == 0)
     {
         ffPrintLogoAndKey(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
-        ffStrbufWriteTo(&result.name, stdout);
-        if (result.version.length)
-            printf(" (%s)", result.version.chars);
+        if (result.vendor.length > 0)
+        {
+            ffStrbufWriteTo(&result.vendor, stdout);
+            putchar(' ');
+        }
+        if (result.version.length > 0)
+        {
+            ffStrbufWriteTo(&result.version, stdout);
+        }
+        else if (result.name.length > 0)
+        {
+            ffStrbufWriteTo(&result.name, stdout);
+        }
         putchar('\n');
     }
     else

diff --git a/src/modules/modules.h b/src/modules/modules.h
@@ -53,6 +53,7 @@
 #include "modules/processes/processes.h"
 #include "modules/publicip/publicip.h"
 #include "modules/separator/separator.h"
+#include "modules/security/security.h"
 #include "modules/shell/shell.h"
 #include "modules/sound/sound.h"
 #include "modules/swap/swap.h"

diff --git a/src/modules/security/option.h b/src/modules/security/option.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "common/option.h"
+
+typedef struct FFSecurityOptions
+{
+    FFModuleArgs moduleArgs;
+} FFSecurityOptions;
+
+static_assert(sizeof(FFSecurityOptions) <= FF_OPTION_MAX_SIZE, "FFSecurityOptions size exceeds maximum allowed size");
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Title:Separator:OS:Host:Kernel:Uptime:Packages:Shell:Display:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:LocalIp:Battery:PowerAdapter:Locale:Break:Colors
		Title:Separator:OS:Host:Bios:Board:Security:Kernel:Uptime:Packages:Shell:Display:DE:WM:WMTheme:Theme:Icons:Font:Cursor:Terminal:TerminalFont:CPU:GPU:Memory:Swap:Disk:LocalIp:Battery:PowerAdapter:Locale:Break:Colors