From 3196f5efaa2305dcf3a0799b4bebc2f058417fea Mon Sep 17 00:00:00 2001 From: Carter Li Date: Fri, 31 Jul 2026 10:56:13 +0800 Subject: [PATCH] chore: adds `defaultOrder` to every module's definition --- src/common/option.h | 1 + src/modules/battery/battery.c | 3 ++- src/modules/bios/bios.c | 3 ++- src/modules/bluetooth/bluetooth.c | 3 ++- src/modules/bluetoothradio/bluetoothradio.c | 3 ++- src/modules/board/board.c | 3 ++- src/modules/bootmgr/bootmgr.c | 3 ++- src/modules/break/break.c | 1 + src/modules/brightness/brightness.c | 3 ++- src/modules/btrfs/btrfs.c | 3 ++- src/modules/camera/camera.c | 3 ++- src/modules/chassis/chassis.c | 1 + src/modules/codec/codec.c | 3 ++- src/modules/colors/colors.c | 1 + src/modules/command/command.c | 2 +- src/modules/cpu/cpu.c | 3 ++- src/modules/cpucache/cpucache.c | 3 ++- src/modules/cpuusage/cpuusage.c | 3 ++- src/modules/cursor/cursor.c | 1 + src/modules/datetime/datetime.c | 3 ++- src/modules/de/de.c | 3 ++- src/modules/disk/disk.c | 3 ++- src/modules/diskio/diskio.c | 3 ++- src/modules/display/display.c | 3 ++- src/modules/dns/dns.c | 3 ++- src/modules/editor/editor.c | 3 ++- src/modules/font/font.c | 3 ++- src/modules/gamepad/gamepad.c | 3 ++- src/modules/gpu/gpu.c | 1 + src/modules/host/host.c | 3 ++- src/modules/icons/icons.c | 3 ++- src/modules/initsystem/initsystem.c | 3 ++- src/modules/kernel/kernel.c | 3 ++- src/modules/keyboard/keyboard.c | 3 ++- src/modules/lm/lm.c | 3 ++- src/modules/loadavg/loadavg.c | 3 ++- src/modules/locale/locale.c | 3 ++- src/modules/localip/localip.c | 3 ++- src/modules/media/media.c | 3 ++- src/modules/memory/memory.c | 3 ++- src/modules/monitor/monitor.c | 3 ++- src/modules/mouse/mouse.c | 3 ++- src/modules/netio/netio.c | 3 ++- src/modules/opencl/opencl.c | 3 ++- src/modules/opengl/opengl.c | 3 ++- src/modules/os/os.c | 3 ++- src/modules/packages/packages.c | 3 ++- src/modules/physicaldisk/physicaldisk.c | 3 ++- src/modules/physicalmemory/physicalmemory.c | 3 ++- src/modules/player/player.c | 3 ++- src/modules/poweradapter/poweradapter.c | 3 ++- src/modules/processes/processes.c | 4 +++- src/modules/publicip/publicip.c | 3 ++- src/modules/separator/separator.c | 1 + src/modules/shell/shell.c | 3 ++- src/modules/sound/sound.c | 3 ++- src/modules/swap/swap.c | 3 ++- src/modules/terminal/terminal.c | 3 ++- src/modules/terminalfont/terminalfont.c | 1 + src/modules/terminalsize/terminalsize.c | 1 + src/modules/terminaltheme/terminaltheme.c | 3 ++- src/modules/theme/theme.c | 3 ++- src/modules/title/title.c | 3 ++- src/modules/tpm/tpm.c | 3 ++- src/modules/uptime/uptime.c | 3 ++- src/modules/users/users.c | 3 ++- src/modules/version/version.c | 3 ++- src/modules/vulkan/vulkan.c | 3 ++- src/modules/wallpaper/wallpaper.c | 3 ++- src/modules/weather/weather.c | 3 ++- src/modules/wifi/wifi.c | 3 ++- src/modules/wm/wm.c | 3 ++- src/modules/wmtheme/wmtheme.c | 3 ++- src/modules/zpool/zpool.c | 3 ++- 74 files changed, 139 insertions(+), 65 deletions(-) diff --git a/src/common/option.h b/src/common/option.h index 9f54d3c1a..e2697042c 100644 --- a/src/common/option.h +++ b/src/common/option.h @@ -34,6 +34,7 @@ typedef struct FFModuleBaseInfo { bool (*generateJsonResult)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* module); // true on success void (*generateJsonConfig)(void* options, struct yyjson_mut_doc* doc, struct yyjson_mut_val* obj); FFModuleFormatArgList formatArgs; + const uint8_t defaultOrder; } FFModuleBaseInfo; typedef enum FFModuleKeyType: uint8_t { diff --git a/src/modules/battery/battery.c b/src/modules/battery/battery.c index d1bff71e2..7b8405e71 100644 --- a/src/modules/battery/battery.c +++ b/src/modules/battery/battery.c @@ -321,5 +321,6 @@ FFModuleBaseInfo ffBatteryModuleInfo = { { "Battery time remaining minutes", "time-minutes" }, { "Battery time remaining seconds", "time-seconds" }, { "Battery time remaining (formatted)", "time-formatted" }, - })) + })), + .defaultOrder = 44, }; diff --git a/src/modules/bios/bios.c b/src/modules/bios/bios.c index 6113b0929..c000080f4 100644 --- a/src/modules/bios/bios.c +++ b/src/modules/bios/bios.c @@ -144,5 +144,6 @@ FFModuleBaseInfo ffBiosModuleInfo = { { "BIOS vendor", "vendor" }, { "BIOS version", "version" }, { "Firmware type", "type" }, - })) + })), + .defaultOrder = 5, }; diff --git a/src/modules/bluetooth/bluetooth.c b/src/modules/bluetooth/bluetooth.c index 6721c336d..42a251886 100644 --- a/src/modules/bluetooth/bluetooth.c +++ b/src/modules/bluetooth/bluetooth.c @@ -166,5 +166,6 @@ FFModuleBaseInfo ffBluetoothModuleInfo = { { "Battery percentage number", "battery-percentage" }, { "Is connected", "connected" }, { "Battery percentage bar", "battery-percentage-bar" }, - })) + })), + .defaultOrder = 58, }; diff --git a/src/modules/bluetoothradio/bluetoothradio.c b/src/modules/bluetoothradio/bluetoothradio.c index 9efc0a057..fc113fc83 100644 --- a/src/modules/bluetoothradio/bluetoothradio.c +++ b/src/modules/bluetoothradio/bluetoothradio.c @@ -207,5 +207,6 @@ FFModuleBaseInfo ffBluetoothRadioModuleInfo = { { "Vendor", "vendor" }, { "Discoverable", "discoverable" }, { "Connectable / Pairable", "connectable" }, - })) + })), + .defaultOrder = 59, }; diff --git a/src/modules/board/board.c b/src/modules/board/board.c index bc8f37cae..1a85ea393 100644 --- a/src/modules/board/board.c +++ b/src/modules/board/board.c @@ -121,5 +121,6 @@ FFModuleBaseInfo ffBoardModuleInfo = { { "Board vendor", "vendor" }, { "Board version", "version" }, { "Board serial number", "serial" }, - })) + })), + .defaultOrder = 7, }; diff --git a/src/modules/bootmgr/bootmgr.c b/src/modules/bootmgr/bootmgr.c index 05cb46713..494885fd6 100644 --- a/src/modules/bootmgr/bootmgr.c +++ b/src/modules/bootmgr/bootmgr.c @@ -117,5 +117,6 @@ FFModuleBaseInfo ffBootmgrModuleInfo = { { "Firmware file name", "firmware-name" }, { "Is secure boot enabled", "secure-boot" }, { "Boot order", "order" }, - })) + })), + .defaultOrder = 6, }; diff --git a/src/modules/break/break.c b/src/modules/break/break.c index 7bca2b61c..011458a28 100644 --- a/src/modules/break/break.c +++ b/src/modules/break/break.c @@ -33,4 +33,5 @@ FFModuleBaseInfo ffBreakModuleInfo = { .destroyOptions = (void*) ffDestroyBreakOptions, .parseJsonObject = (void*) ffParseBreakJsonObject, .printModule = (void*) ffPrintBreak, + .defaultOrder = 71, }; diff --git a/src/modules/brightness/brightness.c b/src/modules/brightness/brightness.c index 1d4971fcb..479a2ccb9 100644 --- a/src/modules/brightness/brightness.c +++ b/src/modules/brightness/brightness.c @@ -206,5 +206,6 @@ FFModuleBaseInfo ffBrightnessModuleInfo = { { "Current brightness value", "current" }, { "Screen brightness (percentage bar)", "percentage-bar" }, { "Is built-in screen", "is-builtin" }, - })) + })), + .defaultOrder = 18, }; diff --git a/src/modules/btrfs/btrfs.c b/src/modules/btrfs/btrfs.c index d9661c2e3..21068e85d 100644 --- a/src/modules/btrfs/btrfs.c +++ b/src/modules/btrfs/btrfs.c @@ -220,5 +220,6 @@ FFModuleBaseInfo ffBtrfsModuleInfo = { { "Allocated percentage bar", "allocated-percentage-bar" }, { "Node size", "node-size" }, { "Sector size", "sector-size" }, - })) + })), + .defaultOrder = 42, }; diff --git a/src/modules/camera/camera.c b/src/modules/camera/camera.c index 1e601f196..02c454bbb 100644 --- a/src/modules/camera/camera.c +++ b/src/modules/camera/camera.c @@ -130,5 +130,6 @@ FFModuleBaseInfo ffCameraModuleInfo = { { "Identifier", "id" }, { "Width (in px)", "width" }, { "Height (in px)", "height" }, - })) + })), + .defaultOrder = 61, }; diff --git a/src/modules/chassis/chassis.c b/src/modules/chassis/chassis.c index 1cd308909..9b5b21e7a 100644 --- a/src/modules/chassis/chassis.c +++ b/src/modules/chassis/chassis.c @@ -124,4 +124,5 @@ FFModuleBaseInfo ffChassisModuleInfo = { { "Chassis version", "version" }, { "Chassis serial number", "serial" }, })), + .defaultOrder = 8, }; diff --git a/src/modules/codec/codec.c b/src/modules/codec/codec.c index 5d3cbac90..a9a465bf8 100644 --- a/src/modules/codec/codec.c +++ b/src/modules/codec/codec.c @@ -264,5 +264,6 @@ FFModuleBaseInfo ffCodecModuleInfo = { { "Decoder / Encoder", "direction" }, { "Compatibility alias of codec types", "types" }, { "Platform API used for detection", "platform-api" }, - })) + })), + .defaultOrder = 37, }; diff --git a/src/modules/colors/colors.c b/src/modules/colors/colors.c index 43cdffb31..8d225d4bf 100644 --- a/src/modules/colors/colors.c +++ b/src/modules/colors/colors.c @@ -302,4 +302,5 @@ FFModuleBaseInfo ffColorsModuleInfo = { .parseJsonObject = (void*) ffParseColorsJsonObject, .printModule = (void*) ffPrintColors, .generateJsonConfig = (void*) ffGenerateColorsJsonConfig, + .defaultOrder = 72, }; diff --git a/src/modules/command/command.c b/src/modules/command/command.c index 751b97139..4de947a79 100644 --- a/src/modules/command/command.c +++ b/src/modules/command/command.c @@ -163,5 +163,5 @@ FFModuleBaseInfo ffCommandModuleInfo = { .generateJsonConfig = (void*) ffGenerateCommandJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Command result", "result" }, - })) + })), }; diff --git a/src/modules/cpu/cpu.c b/src/modules/cpu/cpu.c index 51f84c9f8..2716b2e03 100644 --- a/src/modules/cpu/cpu.c +++ b/src/modules/cpu/cpu.c @@ -276,5 +276,6 @@ FFModuleBaseInfo ffCPUModuleInfo = { { "CPU code name", "code-name" }, { "CPU technology", "technology" }, #endif - })) + })), + .defaultOrder = 33, }; diff --git a/src/modules/cpucache/cpucache.c b/src/modules/cpucache/cpucache.c index 9753e4127..7dd39d1cb 100644 --- a/src/modules/cpucache/cpucache.c +++ b/src/modules/cpucache/cpucache.c @@ -234,5 +234,6 @@ FFModuleBaseInfo ffCPUCacheModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Separate result", "result" }, { "Sum result", "sum" }, - })) + })), + .defaultOrder = 34, }; diff --git a/src/modules/cpuusage/cpuusage.c b/src/modules/cpuusage/cpuusage.c index 5c01e914a..ea592a273 100644 --- a/src/modules/cpuusage/cpuusage.c +++ b/src/modules/cpuusage/cpuusage.c @@ -198,5 +198,6 @@ FFModuleBaseInfo ffCPUUsageModuleInfo = { { "CPU usage (percentage bar, average)", "avg-bar" }, { "CPU usage (percentage bar, maximum)", "max-bar" }, { "CPU usage (percentage bar, minimum)", "min-bar" }, - })) + })), + .defaultOrder = 35, }; diff --git a/src/modules/cursor/cursor.c b/src/modules/cursor/cursor.c index 748f78cc7..1be3ac6e3 100644 --- a/src/modules/cursor/cursor.c +++ b/src/modules/cursor/cursor.c @@ -112,4 +112,5 @@ FFModuleBaseInfo ffCursorModuleInfo = { { "Cursor theme", "theme" }, { "Cursor size", "size" }, })), + .defaultOrder = 27, }; diff --git a/src/modules/datetime/datetime.c b/src/modules/datetime/datetime.c index 8e47e147c..14e3b8251 100644 --- a/src/modules/datetime/datetime.c +++ b/src/modules/datetime/datetime.c @@ -185,5 +185,6 @@ FFModuleBaseInfo ffDateTimeModuleInfo = { { "Locale-dependent timezone name or abbreviation", "timezone-name" }, { "Day in month with leading zero", "day-pretty" }, { "AM or PM", "am-pm" }, - })) + })), + .defaultOrder = 52, }; diff --git a/src/modules/de/de.c b/src/modules/de/de.c index ad714d6f5..8e301fa32 100644 --- a/src/modules/de/de.c +++ b/src/modules/de/de.c @@ -94,5 +94,6 @@ FFModuleBaseInfo ffDEModuleInfo = { { "DE process name", "process-name" }, { "DE pretty name", "pretty-name" }, { "DE version", "version" }, - })) + })), + .defaultOrder = 21, }; diff --git a/src/modules/disk/disk.c b/src/modules/disk/disk.c index 72192e260..74b648855 100644 --- a/src/modules/disk/disk.c +++ b/src/modules/disk/disk.c @@ -486,5 +486,6 @@ FFModuleBaseInfo ffDiskModuleInfo = { { "Years fraction after creation", "years-fraction" }, { "Size free", "size-free" }, { "Size available", "size-available" }, - })) + })), + .defaultOrder = 41, }; diff --git a/src/modules/diskio/diskio.c b/src/modules/diskio/diskio.c index 3ff31fad4..372910d10 100644 --- a/src/modules/diskio/diskio.c +++ b/src/modules/diskio/diskio.c @@ -189,5 +189,6 @@ FFModuleBaseInfo ffDiskIOModuleInfo = { { "Size of data written [per second] (in bytes)", "bytes-written" }, { "Number of reads", "read-count" }, { "Number of writes", "write-count" }, - })) + })), + .defaultOrder = 67, }; diff --git a/src/modules/display/display.c b/src/modules/display/display.c index bdcec58ea..eceb9a2d1 100644 --- a/src/modules/display/display.c +++ b/src/modules/display/display.c @@ -445,5 +445,6 @@ FFModuleBaseInfo ffDisplayModuleInfo = { { "Screen preferred height (in pixels)", "preferred-height" }, { "Screen preferred refresh rate (in Hz)", "preferred-refresh-rate" }, { "DPI", "dpi" }, - })) + })), + .defaultOrder = 17, }; diff --git a/src/modules/dns/dns.c b/src/modules/dns/dns.c index 79df55bac..396c3bd43 100644 --- a/src/modules/dns/dns.c +++ b/src/modules/dns/dns.c @@ -144,5 +144,6 @@ FFModuleBaseInfo ffDNSModuleInfo = { .generateJsonConfig = (void*) ffGenerateDNSJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "DNS result", "result" }, - })) + })), + .defaultOrder = 50, }; diff --git a/src/modules/editor/editor.c b/src/modules/editor/editor.c index 352661ecb..342b31812 100644 --- a/src/modules/editor/editor.c +++ b/src/modules/editor/editor.c @@ -117,5 +117,6 @@ FFModuleBaseInfo ffEditorModuleInfo = { { "Exe name of real path", "exe-name" }, { "Full path of real path", "path" }, { "Version", "version" }, - })) + })), + .defaultOrder = 16, }; diff --git a/src/modules/font/font.c b/src/modules/font/font.c index 14cfa8fb1..be940b32d 100644 --- a/src/modules/font/font.c +++ b/src/modules/font/font.c @@ -109,5 +109,6 @@ FFModuleBaseInfo ffFontModuleInfo = { { "Font 3", "font3" }, { "Font 4", "font4" }, { "Combined fonts for display", "combined" }, - })) + })), + .defaultOrder = 26, }; diff --git a/src/modules/gamepad/gamepad.c b/src/modules/gamepad/gamepad.c index 5404cb8c2..f3c3bdfe4 100644 --- a/src/modules/gamepad/gamepad.c +++ b/src/modules/gamepad/gamepad.c @@ -202,5 +202,6 @@ FFModuleBaseInfo ffGamepadModuleInfo = { { "Serial number", "serial" }, { "Battery percentage num", "battery-percentage" }, { "Battery percentage bar", "battery-percentage-bar" }, - })) + })), + .defaultOrder = 62, }; diff --git a/src/modules/gpu/gpu.c b/src/modules/gpu/gpu.c index 163fca8fb..19ba8c868 100644 --- a/src/modules/gpu/gpu.c +++ b/src/modules/gpu/gpu.c @@ -511,4 +511,5 @@ FFModuleBaseInfo ffGPUModuleInfo = { { "PCIe maximum speed in gen and lanes", "pcie-max-speed" }, { "PCIe current speed in gen and lanes", "pcie-curr-speed" }, })), + .defaultOrder = 36, }; diff --git a/src/modules/host/host.c b/src/modules/host/host.c index 680ba8849..041ab712e 100644 --- a/src/modules/host/host.c +++ b/src/modules/host/host.c @@ -152,5 +152,6 @@ FFModuleBaseInfo ffHostModuleInfo = { { "Product vendor", "vendor" }, { "Product serial number", "serial" }, { "Product uuid", "uuid" }, - })) + })), + .defaultOrder = 4, }; diff --git a/src/modules/icons/icons.c b/src/modules/icons/icons.c index d52ddc24b..15dea0928 100644 --- a/src/modules/icons/icons.c +++ b/src/modules/icons/icons.c @@ -105,5 +105,6 @@ FFModuleBaseInfo ffIconsModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Icons part 1", "icons1" }, { "Icons part 2", "icons2" }, - })) + })), + .defaultOrder = 25, }; diff --git a/src/modules/initsystem/initsystem.c b/src/modules/initsystem/initsystem.c index faab272a3..7a02e0309 100644 --- a/src/modules/initsystem/initsystem.c +++ b/src/modules/initsystem/initsystem.c @@ -116,5 +116,6 @@ FFModuleBaseInfo ffInitSystemModuleInfo = { { "Init system exe path", "exe" }, { "Init system version path", "version" }, { "Init system pid", "pid" }, - })) + })), + .defaultOrder = 10, }; diff --git a/src/modules/kernel/kernel.c b/src/modules/kernel/kernel.c index 0c40d39f6..9ae5878df 100644 --- a/src/modules/kernel/kernel.c +++ b/src/modules/kernel/kernel.c @@ -77,5 +77,6 @@ FFModuleBaseInfo ffKernelModuleInfo = { { "Architecture", "arch" }, { "Display version", "display-version" }, { "Page size", "page-size" }, - })) + })), + .defaultOrder = 9, }; diff --git a/src/modules/keyboard/keyboard.c b/src/modules/keyboard/keyboard.c index 5e3f5cbfe..76e6c36f9 100644 --- a/src/modules/keyboard/keyboard.c +++ b/src/modules/keyboard/keyboard.c @@ -160,5 +160,6 @@ FFModuleBaseInfo ffKeyboardModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Name", "name" }, { "Serial number", "serial" }, - })) + })), + .defaultOrder = 64, }; diff --git a/src/modules/lm/lm.c b/src/modules/lm/lm.c index b8e7c1fc3..ed945bad4 100644 --- a/src/modules/lm/lm.c +++ b/src/modules/lm/lm.c @@ -118,5 +118,6 @@ FFModuleBaseInfo ffLMModuleInfo = { { "LM service", "service" }, { "LM type", "type" }, { "LM version", "version" }, - })) + })), + .defaultOrder = 20, }; diff --git a/src/modules/loadavg/loadavg.c b/src/modules/loadavg/loadavg.c index 61939f515..a6fb6f800 100644 --- a/src/modules/loadavg/loadavg.c +++ b/src/modules/loadavg/loadavg.c @@ -160,5 +160,6 @@ FFModuleBaseInfo ffLoadavgModuleInfo = { { "Load average over 1min", "loadavg1" }, { "Load average over 5min", "loadavg2" }, { "Load average over 15min", "loadavg3" }, - })) + })), + .defaultOrder = 12, }; diff --git a/src/modules/locale/locale.c b/src/modules/locale/locale.c index 9c25341aa..cb9c8e7ec 100644 --- a/src/modules/locale/locale.c +++ b/src/modules/locale/locale.c @@ -77,5 +77,6 @@ FFModuleBaseInfo ffLocaleModuleInfo = { .generateJsonConfig = (void*) ffGenerateLocaleJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Locale code", "result" }, - })) + })), + .defaultOrder = 53, }; diff --git a/src/modules/localip/localip.c b/src/modules/localip/localip.c index 952d72ef6..eeb304e28 100644 --- a/src/modules/localip/localip.c +++ b/src/modules/localip/localip.c @@ -439,5 +439,6 @@ FFModuleBaseInfo ffLocalIPModuleInfo = { { "MTU size in bytes", "mtu" }, { "Link speed (formatted)", "speed" }, { "Interface flags", "flags" }, - })) + })), + .defaultOrder = 49, }; diff --git a/src/modules/media/media.c b/src/modules/media/media.c index 884d8e452..5f926d115 100644 --- a/src/modules/media/media.c +++ b/src/modules/media/media.c @@ -273,5 +273,6 @@ FFModuleBaseInfo ffMediaModuleInfo = { { "Player name", "player-name" }, { "Player ID", "player-id" }, { "URL", "url" }, - })) + })), + .defaultOrder = 47, }; diff --git a/src/modules/memory/memory.c b/src/modules/memory/memory.c index efdf65643..73a8fc173 100644 --- a/src/modules/memory/memory.c +++ b/src/modules/memory/memory.c @@ -131,5 +131,6 @@ FFModuleBaseInfo ffMemoryModuleInfo = { { "Total size", "total" }, { "Percentage used (num)", "percentage" }, { "Percentage used (bar)", "percentage-bar" }, - })) + })), + .defaultOrder = 38, }; diff --git a/src/modules/monitor/monitor.c b/src/modules/monitor/monitor.c index 41beeaba2..6c8bed170 100644 --- a/src/modules/monitor/monitor.c +++ b/src/modules/monitor/monitor.c @@ -125,5 +125,6 @@ FFModuleBaseInfo ffMonitorModuleInfo = { { "Serial number", "serial" }, { "Maximum refresh rate in Hz", "refresh-rate" }, { "True if the display is HDR compatible", "hdr-compatible" }, - })) + })), + .defaultOrder = 19, }; diff --git a/src/modules/mouse/mouse.c b/src/modules/mouse/mouse.c index 37e78be9a..82dd6b053 100644 --- a/src/modules/mouse/mouse.c +++ b/src/modules/mouse/mouse.c @@ -163,5 +163,6 @@ FFModuleBaseInfo ffMouseModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Mouse name", "name" }, { "Mouse serial number", "serial" }, - })) + })), + .defaultOrder = 63, }; diff --git a/src/modules/netio/netio.c b/src/modules/netio/netio.c index 17047fffd..8607a21af 100644 --- a/src/modules/netio/netio.c +++ b/src/modules/netio/netio.c @@ -220,5 +220,6 @@ FFModuleBaseInfo ffNetIOModuleInfo = { { "Number of errors sent [per second]", "tx-errors" }, { "Number of packets dropped when receiving [per second]", "rx-drops" }, { "Number of packets dropped when sending [per second]", "tx-drops" }, - })) + })), + .defaultOrder = 66, }; diff --git a/src/modules/opencl/opencl.c b/src/modules/opencl/opencl.c index acfe861cb..0a80d9d16 100644 --- a/src/modules/opencl/opencl.c +++ b/src/modules/opencl/opencl.c @@ -132,5 +132,6 @@ FFModuleBaseInfo ffOpenCLModuleInfo = { { "Platform version", "version" }, { "Platform name", "name" }, { "Platform vendor", "vendor" }, - })) + })), + .defaultOrder = 56, }; diff --git a/src/modules/opengl/opengl.c b/src/modules/opengl/opengl.c index 1ecce858a..29adcf0f0 100644 --- a/src/modules/opengl/opengl.c +++ b/src/modules/opengl/opengl.c @@ -141,5 +141,6 @@ FFModuleBaseInfo ffOpenGLModuleInfo = { { "OpenGL vendor", "vendor" }, { "OpenGL shading language version", "slv" }, { "OpenGL library used", "library" }, - })) + })), + .defaultOrder = 55, }; diff --git a/src/modules/os/os.c b/src/modules/os/os.c index ea08a567c..d0dc5600b 100644 --- a/src/modules/os/os.c +++ b/src/modules/os/os.c @@ -193,5 +193,6 @@ FFModuleBaseInfo ffOSModuleInfo = { { "Version codename of the OS", "codename" }, { "Build ID of the OS", "build-id" }, { "Architecture of the OS", "arch" }, - })) + })), + .defaultOrder = 3, }; diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 8cb4027bd..1553893f1 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -573,5 +573,6 @@ FFModuleBaseInfo ffPackagesModuleInfo = { { "Total number of all hpkg packages", "hpkg-all" }, { "Total number of all nix packages", "nix-all" }, { "Number of all packages", "all" }, - })) + })), + .defaultOrder = 14, }; diff --git a/src/modules/physicaldisk/physicaldisk.c b/src/modules/physicaldisk/physicaldisk.c index b0b7c5860..893543884 100644 --- a/src/modules/physicaldisk/physicaldisk.c +++ b/src/modules/physicaldisk/physicaldisk.c @@ -284,5 +284,6 @@ FFModuleBaseInfo ffPhysicalDiskModuleInfo = { { "Device kind (Read-only or Read-write)", "readonly-type" }, { "Product revision", "revision" }, { "Device temperature (formatted)", "temperature" }, - })) + })), + .defaultOrder = 68, }; diff --git a/src/modules/physicalmemory/physicalmemory.c b/src/modules/physicalmemory/physicalmemory.c index d4bee7db5..f044e5907 100644 --- a/src/modules/physicalmemory/physicalmemory.c +++ b/src/modules/physicalmemory/physicalmemory.c @@ -180,5 +180,6 @@ FFModuleBaseInfo ffPhysicalMemoryModuleInfo = { { "Part number", "part-number" }, { "True if ECC enabled", "is-ecc-enabled" }, { "True if a memory module is installed in the slot", "is-installed" }, - })) + })), + .defaultOrder = 39, }; diff --git a/src/modules/player/player.c b/src/modules/player/player.c index 7d2248093..0d1fd03b8 100644 --- a/src/modules/player/player.c +++ b/src/modules/player/player.c @@ -122,5 +122,6 @@ FFModuleBaseInfo ffPlayerModuleInfo = { { "Player name", "name" }, { "Player Identifier", "id" }, { "URL name", "url" }, - })) + })), + .defaultOrder = 46, }; diff --git a/src/modules/poweradapter/poweradapter.c b/src/modules/poweradapter/poweradapter.c index 12086c9b2..be20d2a6d 100644 --- a/src/modules/poweradapter/poweradapter.c +++ b/src/modules/poweradapter/poweradapter.c @@ -125,5 +125,6 @@ FFModuleBaseInfo ffPowerAdapterModuleInfo = { { "Power adapter model", "model" }, { "Power adapter description", "description" }, { "Power adapter serial number", "serial" }, - })) + })), + .defaultOrder = 45, }; diff --git a/src/modules/processes/processes.c b/src/modules/processes/processes.c index d5542bac4..daf7a23ed 100644 --- a/src/modules/processes/processes.c +++ b/src/modules/processes/processes.c @@ -72,5 +72,7 @@ FFModuleBaseInfo ffProcessesModuleInfo = { .generateJsonResult = (void*) ffGenerateProcessesJsonResult, .generateJsonConfig = (void*) ffGenerateProcessesJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { - { "Process count", "result" } })) + { "Process count", "result" }, + })), + .defaultOrder = 13, }; diff --git a/src/modules/publicip/publicip.c b/src/modules/publicip/publicip.c index 552173395..5d52e74a7 100644 --- a/src/modules/publicip/publicip.c +++ b/src/modules/publicip/publicip.c @@ -121,5 +121,6 @@ FFModuleBaseInfo ffPublicIPModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Public IP address", "ip" }, { "Location", "location" }, - })) + })), + .defaultOrder = 48, }; diff --git a/src/modules/separator/separator.c b/src/modules/separator/separator.c index 733bd38e1..bd84d7a40 100644 --- a/src/modules/separator/separator.c +++ b/src/modules/separator/separator.c @@ -128,4 +128,5 @@ FFModuleBaseInfo ffSeparatorModuleInfo = { .parseJsonObject = (void*) ffParseSeparatorJsonObject, .printModule = (void*) ffPrintSeparator, .generateJsonConfig = (void*) ffGenerateSeparatorJsonConfig, + .defaultOrder = 2, }; diff --git a/src/modules/shell/shell.c b/src/modules/shell/shell.c index d840135dd..84db1baca 100644 --- a/src/modules/shell/shell.c +++ b/src/modules/shell/shell.c @@ -106,5 +106,6 @@ FFModuleBaseInfo ffShellModuleInfo = { { "Shell pretty name", "pretty-name" }, { "Shell full exe path", "exe-path" }, { "Shell tty used", "tty" }, - })) + })), + .defaultOrder = 15, }; diff --git a/src/modules/sound/sound.c b/src/modules/sound/sound.c index bf37c1f1b..6bc73cbe7 100644 --- a/src/modules/sound/sound.c +++ b/src/modules/sound/sound.c @@ -215,5 +215,6 @@ FFModuleBaseInfo ffSoundModuleInfo = { { "Identifier", "identifier" }, { "Volume (in percentage bar)", "volume-percentage-bar" }, { "Platform API used", "platform-api" }, - })) + })), + .defaultOrder = 60, }; diff --git a/src/modules/swap/swap.c b/src/modules/swap/swap.c index 78568e717..cf9d107c6 100644 --- a/src/modules/swap/swap.c +++ b/src/modules/swap/swap.c @@ -196,5 +196,6 @@ FFModuleBaseInfo ffSwapModuleInfo = { { "Percentage used (num)", "percentage" }, { "Percentage used (bar)", "percentage-bar" }, { "Name", "name" }, - })) + })), + .defaultOrder = 40, }; diff --git a/src/modules/terminal/terminal.c b/src/modules/terminal/terminal.c index 979f3303b..5b2e9305f 100644 --- a/src/modules/terminal/terminal.c +++ b/src/modules/terminal/terminal.c @@ -100,5 +100,6 @@ FFModuleBaseInfo ffTerminalModuleInfo = { { "Terminal version", "version" }, { "Terminal full exe path", "exe-path" }, { "Terminal tty / pts used", "tty" }, - })) + })), + .defaultOrder = 29, }; diff --git a/src/modules/terminalfont/terminalfont.c b/src/modules/terminalfont/terminalfont.c index 6285b2877..87a083718 100644 --- a/src/modules/terminalfont/terminalfont.c +++ b/src/modules/terminalfont/terminalfont.c @@ -119,4 +119,5 @@ FFModuleBaseInfo ffTerminalFontModuleInfo = { { "Terminal font size", "size" }, { "Terminal font styles", "styles" }, })), + .defaultOrder = 30, }; diff --git a/src/modules/terminalsize/terminalsize.c b/src/modules/terminalsize/terminalsize.c index 81a9761b3..088b97fce 100644 --- a/src/modules/terminalsize/terminalsize.c +++ b/src/modules/terminalsize/terminalsize.c @@ -90,4 +90,5 @@ FFModuleBaseInfo ffTerminalSizeModuleInfo = { { "Terminal width (in pixels)", "width" }, { "Terminal height (in pixels)", "height" }, })), + .defaultOrder = 31, }; diff --git a/src/modules/terminaltheme/terminaltheme.c b/src/modules/terminaltheme/terminaltheme.c index 6e7967b35..3d5239b2f 100644 --- a/src/modules/terminaltheme/terminaltheme.c +++ b/src/modules/terminaltheme/terminaltheme.c @@ -106,5 +106,6 @@ FFModuleBaseInfo ffTerminalThemeModuleInfo = { { "Terminal foreground type (Dark / Light)", "fg-type" }, { "Terminal background color", "bg-color" }, { "Terminal background type (Dark / Light)", "bg-type" }, - })) + })), + .defaultOrder = 32, }; diff --git a/src/modules/theme/theme.c b/src/modules/theme/theme.c index 4c88b68f7..f51a4aac6 100644 --- a/src/modules/theme/theme.c +++ b/src/modules/theme/theme.c @@ -98,5 +98,6 @@ FFModuleBaseInfo ffThemeModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Theme part 1", "theme1" }, { "Theme part 2", "theme2" }, - })) + })), + .defaultOrder = 24, }; diff --git a/src/modules/title/title.c b/src/modules/title/title.c index ca7343a92..ce877caed 100644 --- a/src/modules/title/title.c +++ b/src/modules/title/title.c @@ -197,5 +197,6 @@ FFModuleBaseInfo ffTitleModuleInfo = { { "UID (*nix) / SID (Windows)", "user-id" }, { "PID of current process", "pid" }, { "CWD with home dir replaced by `~`", "cwd" }, - })) + })), + .defaultOrder = 1, }; diff --git a/src/modules/tpm/tpm.c b/src/modules/tpm/tpm.c index b6dd62dd8..6596d6261 100644 --- a/src/modules/tpm/tpm.c +++ b/src/modules/tpm/tpm.c @@ -94,5 +94,6 @@ FFModuleBaseInfo ffTPMModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "TPM device version", "version" }, { "TPM general description", "description" }, - })) + })), + .defaultOrder = 69, }; diff --git a/src/modules/uptime/uptime.c b/src/modules/uptime/uptime.c index dd0d90d2b..41ac4526a 100644 --- a/src/modules/uptime/uptime.c +++ b/src/modules/uptime/uptime.c @@ -102,5 +102,6 @@ FFModuleBaseInfo ffUptimeModuleInfo = { { "Days of year after boot", "days-of-year" }, { "Years fraction after boot", "years-fraction" }, { "Formatted uptime", "formatted" }, - })) + })), + .defaultOrder = 11, }; diff --git a/src/modules/users/users.c b/src/modules/users/users.c index 5575bbeaa..fbf1ffaa8 100644 --- a/src/modules/users/users.c +++ b/src/modules/users/users.c @@ -202,5 +202,6 @@ FFModuleBaseInfo ffUsersModuleInfo = { { "Years integer after login", "years" }, { "Days of year after login", "days-of-year" }, { "Years fraction after login", "years-fraction" }, - })) + })), + .defaultOrder = 57, }; diff --git a/src/modules/version/version.c b/src/modules/version/version.c index 211eece8d..fa3b59fe7 100644 --- a/src/modules/version/version.c +++ b/src/modules/version/version.c @@ -113,5 +113,6 @@ FFModuleBaseInfo ffVersionModuleInfo = { { "Date time when compiling", "compile-time" }, { "Compiler used when compiling", "compiler" }, { "Libc used when compiling", "libc" }, - })) + })), + .defaultOrder = 70, }; diff --git a/src/modules/vulkan/vulkan.c b/src/modules/vulkan/vulkan.c index abfd3612d..03123b7ae 100644 --- a/src/modules/vulkan/vulkan.c +++ b/src/modules/vulkan/vulkan.c @@ -145,5 +145,6 @@ FFModuleBaseInfo ffVulkanModuleInfo = { { "API version", "api-version" }, { "Conformance version", "conformance-version" }, { "Instance version", "instance-version" }, - })) + })), + .defaultOrder = 54, }; diff --git a/src/modules/wallpaper/wallpaper.c b/src/modules/wallpaper/wallpaper.c index 6d1102953..b5fab48f5 100644 --- a/src/modules/wallpaper/wallpaper.c +++ b/src/modules/wallpaper/wallpaper.c @@ -86,5 +86,6 @@ FFModuleBaseInfo ffWallpaperModuleInfo = { .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "File name", "file-name" }, { "Full path", "full-path" }, - })) + })), + .defaultOrder = 28, }; diff --git a/src/modules/weather/weather.c b/src/modules/weather/weather.c index 414a18e7e..152cb057b 100644 --- a/src/modules/weather/weather.c +++ b/src/modules/weather/weather.c @@ -102,5 +102,6 @@ FFModuleBaseInfo ffWeatherModuleInfo = { .generateJsonConfig = (void*) ffGenerateWeatherJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "Weather result", "result" }, - })) + })), + .defaultOrder = 65, }; diff --git a/src/modules/wifi/wifi.c b/src/modules/wifi/wifi.c index 0a23cc2d7..0e9df22c9 100644 --- a/src/modules/wifi/wifi.c +++ b/src/modules/wifi/wifi.c @@ -235,5 +235,6 @@ FFModuleBaseInfo ffWifiModuleInfo = { { "Connection signal quality (percentage bar)", "signal-quality-bar" }, { "Connection channel number", "channel" }, { "Connection channel band in GHz", "band" }, - })) + })), + .defaultOrder = 51, }; diff --git a/src/modules/wm/wm.c b/src/modules/wm/wm.c index da492d3de..5e23826e1 100644 --- a/src/modules/wm/wm.c +++ b/src/modules/wm/wm.c @@ -134,5 +134,6 @@ FFModuleBaseInfo ffWMModuleInfo = { { "WM protocol name", "protocol-name" }, { "WM plugin name", "plugin-name" }, { "WM version", "version" }, - })) + })), + .defaultOrder = 22, }; diff --git a/src/modules/wmtheme/wmtheme.c b/src/modules/wmtheme/wmtheme.c index a45c9baa3..f1ab4105f 100644 --- a/src/modules/wmtheme/wmtheme.c +++ b/src/modules/wmtheme/wmtheme.c @@ -71,5 +71,6 @@ FFModuleBaseInfo ffWMThemeModuleInfo = { .generateJsonConfig = (void*) ffGenerateWMThemeJsonConfig, .formatArgs = FF_FORMAT_ARG_LIST(((FFModuleFormatArg[]) { { "WM theme", "result" }, - })) + })), + .defaultOrder = 23, }; diff --git a/src/modules/zpool/zpool.c b/src/modules/zpool/zpool.c index cddd1c705..7e5f03a52 100644 --- a/src/modules/zpool/zpool.c +++ b/src/modules/zpool/zpool.c @@ -214,5 +214,6 @@ FFModuleBaseInfo ffZpoolModuleInfo = { { "Size allocated percentage bar", "allocated-percentage-bar" }, { "Fragmentation percentage bar", "frag-percentage-bar" }, { "Is read-only", "is-readonly" }, - })) + })), + .defaultOrder = 43, };