From 730c0d1c92c40fc3abae56a8c8c68bfbf8d708ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 17 Nov 2023 14:12:17 +0800 Subject: [PATCH] Fastfetch: print module description for `--list-modules` --- completions/fish | 13 +++++++++---- doc/json_schema.json | 8 ++++---- src/common/option.h | 3 +++ src/fastfetch.c | 4 ++-- src/modules/battery/battery.c | 1 + src/modules/bios/bios.c | 1 + src/modules/bluetooth/bluetooth.c | 1 + src/modules/board/board.c | 1 + src/modules/break/break.c | 1 + src/modules/brightness/brightness.c | 1 + src/modules/chassis/chassis.c | 1 + src/modules/colors/colors.c | 1 + src/modules/command/command.c | 1 + src/modules/cpu/cpu.c | 1 + src/modules/cpuusage/cpuusage.c | 1 + src/modules/cursor/cursor.c | 1 + src/modules/custom/custom.c | 1 + src/modules/datetime/datetime.c | 1 + src/modules/de/de.c | 1 + src/modules/disk/disk.c | 1 + src/modules/diskio/diskio.c | 1 + src/modules/display/display.c | 1 + src/modules/font/font.c | 1 + src/modules/gamepad/gamepad.c | 1 + src/modules/gpu/gpu.c | 1 + src/modules/host/host.c | 1 + src/modules/icons/icons.c | 1 + src/modules/kernel/kernel.c | 1 + src/modules/lm/lm.c | 1 + src/modules/locale/locale.c | 1 + src/modules/localip/localip.c | 1 + src/modules/media/media.c | 1 + src/modules/memory/memory.c | 1 + src/modules/monitor/monitor.c | 1 + src/modules/netio/netio.c | 1 + src/modules/opencl/opencl.c | 1 + src/modules/opengl/opengl.c | 1 + src/modules/os/os.c | 1 + src/modules/packages/packages.c | 1 + src/modules/player/player.c | 1 + src/modules/poweradapter/poweradapter.c | 1 + src/modules/processes/processes.c | 1 + src/modules/publicip/publicip.c | 1 + src/modules/separator/separator.c | 1 + src/modules/shell/shell.c | 1 + src/modules/sound/sound.c | 1 + src/modules/swap/swap.c | 1 + src/modules/terminal/terminal.c | 1 + src/modules/terminalfont/terminalfont.c | 1 + src/modules/terminalsize/terminalsize.c | 1 + src/modules/theme/theme.c | 1 + src/modules/title/title.c | 1 + src/modules/uptime/uptime.c | 1 + src/modules/users/users.c | 1 + src/modules/version/version.c | 1 + src/modules/vulkan/vulkan.c | 1 + src/modules/wallpaper/wallpaper.c | 1 + src/modules/weather/weather.c | 1 + src/modules/wifi/wifi.c | 1 + src/modules/wm/wm.c | 1 + src/modules/wmtheme/wmtheme.c | 1 + 61 files changed, 75 insertions(+), 10 deletions(-) diff --git a/completions/fish b/completions/fish index d3177fa40..79350e9a9 100755 --- a/completions/fish +++ b/completions/fish @@ -5,7 +5,7 @@ if not test -x fastfetch end set -l whole_text (fastfetch --pipe --help) -set -l modules (fastfetch --list-modules autocompletion) +set modules_complex (fastfetch --list-modules autocompletion) complete -c fastfetch -f @@ -23,7 +23,7 @@ for line in (string match -- ' -*' $whole_text) switch (string match -r -- $regexp $args) case '<\?command>' - set -l temp (string lower $modules) + set -l temp (string match -r "\\w+" $modules_complex | string lower) set -l temp $temp-format"\tModule\\ format" set res $res -x -a "color\tSupported\\ colors format\tCustom\\ format config\tConfiguration $temp" case '<\?bool>' @@ -38,8 +38,13 @@ for line in (string match -- ' -*' $whole_text) case '<\?num>' set res $res -x -a "0\tNumber 1\tNumber 2\tNumber 3\tNumber 4\tNumber 5\tNumber 6\tNumber 7\tNumber 8\tNumber 9\tNumber" case '' - set temp $modules"\tModule" - set res $res -x -a "$temp" + function __fastfetch_complete_structure + for line in $modules_complex + set -l pair (string split -m 2 : $line) + echo -e "$pair[1]\t$pair[2]" + end + end + set res $res -x -a "(__fish_complete_list : __fastfetch_complete_structure)" case '' set -l temp (fastfetch --list-logos autocompletion) set -l temp (string replace -- ' ' '\\ ' $temp) diff --git a/doc/json_schema.json b/doc/json_schema.json index 886823d5a..2e65be88c 100644 --- a/doc/json_schema.json +++ b/doc/json_schema.json @@ -729,15 +729,15 @@ }, { "const": "theme", - "description": "Print current theme information" + "description": "Print current theme of desktop environment" }, { "const": "uptime", - "description": "Print system uptime" + "description": "Print how long system has been running" }, { "const": "users", - "description": "List users currently logged in" + "description": "Print users currently logged in" }, { "const": "version", @@ -844,7 +844,7 @@ "properties": { "type": { "const": "brightness", - "description": "Print current brightness / luminance of your monitors" + "description": "Print current brightness level of your monitors" }, "ddcciSleep": { "type": "integer", diff --git a/src/common/option.h b/src/common/option.h index 401f7a33b..a76c9e623 100644 --- a/src/common/option.h +++ b/src/common/option.h @@ -10,6 +10,7 @@ struct yyjson_mut_val; typedef struct FFModuleBaseInfo { const char* name; + const char* description; // A dirty polymorphic implementation in C. // This is UB, because `void*` is not compatible with `FF*Options*`. // However we can't do it better unless we move to C++, so that `option` becomes a `this` pointer @@ -25,6 +26,7 @@ typedef struct FFModuleBaseInfo static inline void ffOptionInitModuleBaseInfo( FFModuleBaseInfo* baseInfo, const char* name, + const char* description, void* parseCommandOptions, // bool (*const parseCommandOptions)(void* options, const char* key, const char* value) void* parseJsonObject, // void (*const parseJsonObject)(void* options, yyjson_val *module) void* printModule, // void (*const printModule)(void* options) @@ -34,6 +36,7 @@ static inline void ffOptionInitModuleBaseInfo( ) { baseInfo->name = name; + baseInfo->description = description; baseInfo->parseCommandOptions = (__typeof__(baseInfo->parseCommandOptions)) parseCommandOptions; baseInfo->parseJsonObject = (__typeof__(baseInfo->parseJsonObject)) parseJsonObject; baseInfo->printModule = (__typeof__(baseInfo->printModule)) printModule; diff --git a/src/fastfetch.c b/src/fastfetch.c index cdecc87e3..f0fc0b574 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -192,9 +192,9 @@ static void listModules(bool pretty) { ++count; if (pretty) - printf("%d)%s%s\n", count, count > 9 ? " " : " ", (*modules)->name); + printf("%d)%s%-13s: %s\n", count, count > 9 ? " " : " ", (*modules)->name, (*modules)->description); else - puts((*modules)->name); + printf("%s:%s\n", (*modules)->name, (*modules)->description); } } } diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index 1ad586f79..c73897491 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -246,6 +246,7 @@ void ffInitBatteryOptions(FFBatteryOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_BATTERY_MODULE_NAME, + "Print battery capacity, status, etc", ffParseBatteryCommandOptions, ffParseBatteryJsonObject, ffPrintBattery, diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index bc7d9bec1..eb901f726 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -165,6 +165,7 @@ void ffInitBiosOptions(FFBiosOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_BIOS_MODULE_NAME, + "Print BIOS name, version, release date, etc", ffParseBiosCommandOptions, ffParseBiosJsonObject, ffPrintBios, diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index 344d8e181..91fb46724 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -171,6 +171,7 @@ void ffInitBluetoothOptions(FFBluetoothOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_BLUETOOTH_MODULE_NAME, + "List bluetooth devices", ffParseBluetoothCommandOptions, ffParseBluetoothJsonObject, ffPrintBluetooth, diff --git a/src/modules/board/board.c b/src/modules/board/board.c index 414793abf..0cb3bcfaa 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -130,6 +130,7 @@ void ffInitBoardOptions(FFBoardOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_BOARD_MODULE_NAME, + "Print mather board name and other info", ffParseBoardCommandOptions, ffParseBoardJsonObject, ffPrintBoard, diff --git a/src/modules/break/break.c b/src/modules/break/break.c index a9588dffc..9b02d181a 100644 --- a/src/modules/break/break.c +++ b/src/modules/break/break.c @@ -21,6 +21,7 @@ void ffInitBreakOptions(FF_MAYBE_UNUSED FFBreakOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_BREAK_MODULE_NAME, + "Print a empty line", ffParseBreakCommandOptions, ffParseBreakJsonObject, ffPrintBreak, diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index a97c5676f..48519af6a 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -186,6 +186,7 @@ void ffInitBrightnessOptions(FFBrightnessOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_BRIGHTNESS_MODULE_NAME, + "Print current brightness level of your monitors", ffParseBrightnessCommandOptions, ffParseBrightnessJsonObject, ffPrintBrightness, diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index f4ca8af96..ad0b19570 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -152,6 +152,7 @@ void ffInitChassisOptions(FFChassisOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_CHASSIS_MODULE_NAME, + "Print chassis type (desktop, laptop, etc)", ffParseChassisCommandOptions, ffParseChassisJsonObject, ffPrintChassis, diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index 8692c2cac..32d6f73d9 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -156,6 +156,7 @@ void ffInitColorsOptions(FFColorsOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_COLORS_MODULE_NAME, + "Print some colored blocks", ffParseColorsCommandOptions, ffParseColorsJsonObject, ffPrintColors, diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 7f25c6ff8..9970455ad 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -151,6 +151,7 @@ void ffInitCommandOptions(FFCommandOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_COMMAND_MODULE_NAME, + "Running custom shell scripts", ffParseCommandCommandOptions, ffParseCommandJsonObject, ffPrintCommand, diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 4d41d4e0c..f1ee0e84f 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -202,6 +202,7 @@ void ffInitCPUOptions(FFCPUOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_CPU_MODULE_NAME, + "Print CPU name, frequency, etc", ffParseCPUCPUOptions, ffParseCPUJsonObject, ffPrintCPU, diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 398536261..93de287d3 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -172,6 +172,7 @@ void ffInitCPUUsageOptions(FFCPUUsageOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_CPUUSAGE_MODULE_NAME, + "Print CPU usage. Costs some time to collect data", ffParseCPUUsageCommandOptions, ffParseCPUUsageJsonObject, ffPrintCPUUsage, diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index 5e10f2bcd..e9d03f6e6 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -122,6 +122,7 @@ void ffInitCursorOptions(FFCursorOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_CURSOR_MODULE_NAME, + "Print cursor style name", ffParseCursorCommandOptions, ffParseCursorJsonObject, ffPrintCursor, diff --git a/src/modules/custom/custom.c b/src/modules/custom/custom.c index 4aed00daf..01eaaa3f5 100644 --- a/src/modules/custom/custom.c +++ b/src/modules/custom/custom.c @@ -57,6 +57,7 @@ void ffInitCustomOptions(FFCustomOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_CUSTOM_MODULE_NAME, + "Print a custom string, with or without key", ffParseCustomCommandOptions, ffParseCustomJsonObject, ffPrintCustom, diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index 05d1991e8..77926b27e 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -214,6 +214,7 @@ void ffInitDateTimeOptions(FFDateTimeOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_DATETIME_MODULE_NAME, + "Print current date and time", ffParseDateTimeCommandOptions, ffParseDateTimeJsonObject, ffPrintDateTime, diff --git a/src/modules/de/de.c b/src/modules/de/de.c index f80c059d3..e71b3334b 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -127,6 +127,7 @@ void ffInitDEOptions(FFDEOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_DE_MODULE_NAME, + "Print desktop environment name", ffParseDECommandOptions, ffParseDEJsonObject, ffPrintDE, diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index b465d4845..a13d1e432 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -463,6 +463,7 @@ void ffInitDiskOptions(FFDiskOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_DISK_MODULE_NAME, + "Print partitions, space usage, disk type, etc", ffParseDiskCommandOptions, ffParseDiskJsonObject, ffPrintDisk, diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index 585819b5a..b7b77c2d9 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -229,6 +229,7 @@ void ffInitDiskIOOptions(FFDiskIOOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_DISKIO_MODULE_NAME, + "Print physical disk I/O throughput", ffParseDiskIOCommandOptions, ffParseDiskIOJsonObject, ffPrintDiskIO, diff --git a/src/modules/display/display.c b/src/modules/display/display.c index 472ff01af..78d196885 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -258,6 +258,7 @@ void ffInitDisplayOptions(FFDisplayOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_DISPLAY_MODULE_NAME, + "Print resolutions, refresh rates, etc", ffParseDisplayCommandOptions, ffParseDisplayJsonObject, ffPrintDisplay, diff --git a/src/modules/font/font.c b/src/modules/font/font.c index 98c8646e6..3b1f1029a 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -120,6 +120,7 @@ void ffInitFontOptions(FFFontOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_FONT_MODULE_NAME, + "Print system font name", ffParseFontCommandOptions, ffParseFontJsonObject, ffPrintFont, diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index 05c02c6ba..f48be7bf9 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -130,6 +130,7 @@ void ffInitGamepadOptions(FFGamepadOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_GAMEPAD_MODULE_NAME, + "List connected gamepads", ffParseGamepadCommandOptions, ffParseGamepadJsonObject, ffPrintGamepad, diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index 63efe5e80..0e4c5de7c 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -336,6 +336,7 @@ void ffInitGPUOptions(FFGPUOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_GPU_MODULE_NAME, + "Print GPU names, graphic memory size, type, etc", ffParseGPUCommandOptions, ffParseGPUJsonObject, ffPrintGPU, diff --git a/src/modules/host/host.c b/src/modules/host/host.c index d758edddb..aeafd7118 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -151,6 +151,7 @@ void ffInitHostOptions(FFHostOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_HOST_MODULE_NAME, + "Print product name of your computer", ffParseHostCommandOptions, ffParseHostJsonObject, ffPrintHost, diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index adfd336f9..8da7ebc28 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -91,6 +91,7 @@ void ffInitIconsOptions(FFIconsOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_ICONS_MODULE_NAME, + "Print icon style name", ffParseIconsCommandOptions, ffParseIconsJsonObject, ffPrintIcons, diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index 24600576f..c25d75fe4 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -89,6 +89,7 @@ void ffInitKernelOptions(FFKernelOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_KERNEL_MODULE_NAME, + "Print system kernel version", ffParseKernelCommandOptions, ffParseKernelJsonObject, ffPrintKernel, diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index 082591f3d..f3652a465 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -129,6 +129,7 @@ void ffInitLMOptions(FFLMOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_LM_MODULE_NAME, + "Print login manager (desktop manager) name and version", ffParseLMCommandOptions, ffParseLMJsonObject, ffPrintLM, diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index 8d6980434..4baeb3d26 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -91,6 +91,7 @@ void ffInitLocaleOptions(FFLocaleOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_LOCALE_MODULE_NAME, + "Print system locale name", ffParseLocaleCommandOptions, ffParseLocaleJsonObject, ffPrintLocale, diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index f9a2d475c..2b0e25dc4 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -359,6 +359,7 @@ void ffInitLocalIpOptions(FFLocalIpOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_LOCALIP_MODULE_NAME, + "List local IP addresses (v4 or v6), MAC addresses, etc", ffParseLocalIpCommandOptions, ffParseLocalIpJsonObject, ffPrintLocalIp, diff --git a/src/modules/media/media.c b/src/modules/media/media.c index ebdc43e2f..d816d44f2 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -173,6 +173,7 @@ void ffInitMediaOptions(FFMediaOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_MEDIA_MODULE_NAME, + "Print playing song name", ffParseMediaCommandOptions, ffParseMediaJsonObject, ffPrintMedia, diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index c3c00cbe6..b0e2830a1 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -131,6 +131,7 @@ void ffInitMemoryOptions(FFMemoryOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_MEMORY_MODULE_NAME, + "Print system memory usage info", ffParseMemoryCommandOptions, ffParseMemoryJsonObject, ffPrintMemory, diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index a53d4a029..35ad8a6c4 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -163,6 +163,7 @@ void ffInitMonitorOptions(FFMonitorOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_MONITOR_MODULE_NAME, + "Print connected physical monitor information", ffParseMonitorCommandOptions, ffParseMonitorJsonObject, ffPrintMonitor, diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index df76fde5f..be3db91a1 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -220,6 +220,7 @@ void ffInitNetIOOptions(FFNetIOOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_NETIO_MODULE_NAME, + "Print network I/O throughput", ffParseNetIOCommandOptions, ffParseNetIOJsonObject, ffPrintNetIO, diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index dcd0b7e84..f5c563129 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -114,6 +114,7 @@ void ffInitOpenCLOptions(FFOpenCLOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_OPENCL_MODULE_NAME, + "Print highest OpenCL version supported by the GPU", ffParseOpenCLCommandOptions, ffParseOpenCLJsonObject, ffPrintOpenCL, diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 5f159cbc5..2925a42e4 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -173,6 +173,7 @@ void ffInitOpenGLOptions(FFOpenGLOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_OPENGL_MODULE_NAME, + "Print highest OpenGL version supported by the GPU", ffParseOpenGLCommandOptions, ffParseOpenGLJsonObject, ffPrintOpenGL, diff --git a/src/modules/os/os.c b/src/modules/os/os.c index a88be7e39..c7dad4b38 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -217,6 +217,7 @@ void ffInitOSOptions(FFOSOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_OS_MODULE_NAME, + "Print operating system name and version", ffParseOSCommandOptions, ffParseOSJsonObject, ffPrintOS, diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 915707244..a70e15b1d 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -238,6 +238,7 @@ void ffInitPackagesOptions(FFPackagesOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_PACKAGES_MODULE_NAME, + "List installed package managers and count of installed packages", ffParsePackagesCommandOptions, ffParsePackagesJsonObject, ffPrintPackages, diff --git a/src/modules/player/player.c b/src/modules/player/player.c index 7f8dd8fdc..8eae59705 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -139,6 +139,7 @@ void ffInitPlayerOptions(FFPlayerOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_PLAYER_MODULE_NAME, + "Print music player name", ffParsePlayerCommandOptions, ffParsePlayerJsonObject, ffPrintPlayer, diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index 64a58d2bb..3ce00a771 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -140,6 +140,7 @@ void ffInitPowerAdapterOptions(FFPowerAdapterOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_POWERADAPTER_MODULE_NAME, + "Print power adapter name and charging watts", ffParsePowerAdapterCommandOptions, ffParsePowerAdapterJsonObject, ffPrintPowerAdapter, diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index 7fe18163b..d255c0863 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -92,6 +92,7 @@ void ffInitProcessesOptions(FFProcessesOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_PROCESSES_MODULE_NAME, + "Count running processes", ffParseProcessesCommandOptions, ffParseProcessesJsonObject, ffPrintProcesses, diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index 3e00a5929..da7c4fc9a 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -136,6 +136,7 @@ void ffInitPublicIpOptions(FFPublicIpOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_PUBLICIP_MODULE_NAME, + "Print your public IP address, etc", ffParsePublicIpCommandOptions, ffParsePublicIpJsonObject, ffPrintPublicIp, diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c index 56a245fac..fc675438d 100644 --- a/src/modules/separator/separator.c +++ b/src/modules/separator/separator.c @@ -123,6 +123,7 @@ void ffInitSeparatorOptions(FFSeparatorOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_SEPARATOR_MODULE_NAME, + "Print a separator line", ffParseSeparatorCommandOptions, ffParseSeparatorJsonObject, ffPrintSeparator, diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index 9094cc889..cc8cb6170 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -112,6 +112,7 @@ void ffInitShellOptions(FFShellOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_SHELL_MODULE_NAME, + "Print current shell name and version", ffParseShellCommandOptions, ffParseShellJsonObject, ffPrintShell, diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index 78b77ef67..39411b5d4 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -215,6 +215,7 @@ void ffInitSoundOptions(FFSoundOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_SOUND_MODULE_NAME, + "Print sound devices, volume, etc", ffParseSoundCommandOptions, ffParseSoundJsonObject, ffPrintSound, diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index 25f9cf6a3..19bc4deca 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -138,6 +138,7 @@ void ffInitSwapOptions(FFSwapOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_SWAP_MODULE_NAME, + "Print swap (paging file) space usage", ffParseSwapCommandOptions, ffParseSwapJsonObject, ffPrintSwap, diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index ac32c7901..02347593f 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -111,6 +111,7 @@ void ffInitTerminalOptions(FFTerminalOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_TERMINAL_MODULE_NAME, + "Print current terminal name and version", ffParseTerminalCommandOptions, ffParseTerminalJsonObject, ffPrintTerminal, diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index 5ee332f29..191df08f4 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -136,6 +136,7 @@ void ffInitTerminalFontOptions(FFTerminalFontOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_TERMINALFONT_MODULE_NAME, + "Print font name and size used by current terminal", ffParseTerminalFontCommandOptions, ffParseTerminalFontJsonObject, ffPrintTerminalFont, diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index 120c908dc..bc2bfa9ca 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -106,6 +106,7 @@ void ffInitTerminalSizeOptions(FFTerminalSizeOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_TERMINALSIZE_MODULE_NAME, + "Print current terminal size", ffParseTerminalSizeCommandOptions, ffParseTerminalSizeJsonObject, ffPrintTerminalSize, diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index 888fa552c..1380283bf 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -91,6 +91,7 @@ void ffInitThemeOptions(FFThemeOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_THEME_MODULE_NAME, + "Print current theme of desktop environment", ffParseThemeCommandOptions, ffParseThemeJsonObject, ffPrintTheme, diff --git a/src/modules/title/title.c b/src/modules/title/title.c index 3e9f7cece..073bed344 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -198,6 +198,7 @@ void ffInitTitleOptions(FFTitleOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_TITLE_MODULE_NAME, + "Print title, which contains your user name, hostname", ffParseTitleCommandOptions, ffParseTitleJsonObject, ffPrintTitle, diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index cd7fd0f5e..02d9a9ae5 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -155,6 +155,7 @@ void ffInitUptimeOptions(FFUptimeOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_UPTIME_MODULE_NAME, + "Print how long system has been running", ffParseUptimeCommandOptions, ffParseUptimeJsonObject, ffPrintUptime, diff --git a/src/modules/users/users.c b/src/modules/users/users.c index b4265ee98..0f7a2b189 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -192,6 +192,7 @@ void ffInitUsersOptions(FFUsersOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_USERS_MODULE_NAME, + "Print users currently logged in", ffParseUsersCommandOptions, ffParseUsersJsonObject, ffPrintUsers, diff --git a/src/modules/version/version.c b/src/modules/version/version.c index 9b50b6e95..6d27d94cf 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -132,6 +132,7 @@ void ffInitVersionOptions(FFVersionOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_VERSION_MODULE_NAME, + "Print Fastfetch version", ffParseVersionCommandOptions, ffParseVersionJsonObject, ffPrintVersion, diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index eb47e0f5a..3af0fbe8e 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -148,6 +148,7 @@ void ffInitVulkanOptions(FFVulkanOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_VULKAN_MODULE_NAME, + "Print highest Vulkan version supported by the GPU", ffParseVulkanCommandOptions, ffParseVulkanJsonObject, ffPrintVulkan, diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index 7fe1a9a5c..6559929fb 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -101,6 +101,7 @@ void ffInitWallpaperOptions(FFWallpaperOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_WALLPAPER_MODULE_NAME, + "Print image file path of current wallpaper", ffParseWallpaperCommandOptions, ffParseWallpaperJsonObject, ffPrintWallpaper, diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index f4135c80b..3bb8d5e02 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -137,6 +137,7 @@ void ffInitWeatherOptions(FFWeatherOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_WEATHER_MODULE_NAME, + "Print weather information", ffParseWeatherCommandOptions, ffParseWeatherJsonObject, ffPrintWeather, diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 25617d677..0f4a58ae5 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -173,6 +173,7 @@ void ffInitWifiOptions(FFWifiOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_WIFI_MODULE_NAME, + "Print connected Wi-Fi info (SSID, connection and security protocol)", ffParseWifiCommandOptions, ffParseWifiJsonObject, ffPrintWifi, diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index 442875590..b8cdd04c3 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -140,6 +140,7 @@ void ffInitWMOptions(FFWMOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_WM_MODULE_NAME, + "Print window manager name and version", ffParseWMCommandOptions, ffParseWMJsonObject, ffPrintWM, diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index 1cedd28e5..a7ca585ce 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -89,6 +89,7 @@ void ffInitWMThemeOptions(FFWMThemeOptions* options) ffOptionInitModuleBaseInfo( &options->moduleInfo, FF_WMTHEME_MODULE_NAME, + "Print current theme of window manager", ffParseWMThemeCommandOptions, ffParseWMThemeJsonObject, ffPrintWMTheme,