diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index bf56543e0..ad239b3a0 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,7 +12,12 @@ Output of `fastfetch --version`: //paste here ``` -Output of `fastfetch --show-errors --multithreading false`: +Output of `fastfetch --load-config devinfo`: +```bash +//paste here +``` + +Output of `fastfetch --load-config devinfo-verbose`: ```bash //paste here ``` diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f7cda864..5cf93f2e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,13 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") +set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-O3") + +if(BUILD_TESTS) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -mtune=native -pipe -fno-plt -Wconversion") +endif(BUILD_TESTS) + execute_process( COMMAND git rev-list --count HEAD WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" @@ -30,13 +37,6 @@ execute_process ( set(PROJECT_VERSION "r${GIT_REV_LIST}.${GIT_REV_PARSE}") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") -set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-O3") - -if(BUILD_TESTS) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native -mtune=native -pipe -fno-plt -Wconversion -Wpedantic") -endif(BUILD_TESTS) - function(fastfetch_load_text FILENAME OUTVAR) file(READ "${FILENAME}" TEMP) string(REPLACE "\n" "\\n" TEMP "${TEMP}") diff --git a/presets/devinfo b/presets/devinfo new file mode 100644 index 000000000..475c503bb --- /dev/null +++ b/presets/devinfo @@ -0,0 +1,3 @@ +--disable-linewrap false +--multithreading false +--show-errors true diff --git a/presets/devinfo-verbose b/presets/devinfo-verbose new file mode 100644 index 000000000..d9f28e1f3 --- /dev/null +++ b/presets/devinfo-verbose @@ -0,0 +1,2 @@ +--load-config verbose +--load-config devinfo diff --git a/presets/verbose b/presets/verbose new file mode 100644 index 000000000..2624667aa --- /dev/null +++ b/presets/verbose @@ -0,0 +1,24 @@ +--load-config all + +--os-format "System: {}; Name: {}; Pretty name: {}; ID: {}; ID like: {}; Variant: {}; Variant ID: {}; Version: {}; Version ID: {}; Version codename: {}; Build ID: {}; Architecture: {}" +--host-format "Family: {}; Name: {}; Version: {}" +--kernel-format "Sysname: {}; Release: {}; Version: {}" +--uptime-format "Days: {}; Hours: {}; Minutes: {}; Seconds: {}" +--processes-format "Count: {}" +--packages-format "All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; xbps: {}; flatpak: {}; snap: {}" +--shell-format "Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}" +--resolution-format "Width: {}; Height: {}; Refresh rate: {}" +--de-format "Session desktop: {}; Process name: {}; Pretty name: {}; Version: {}" +--wm-format "Session desktop: {}; Process name: {}; Pretty name: {}; Protocol: {}" +--wm-theme-format "Name: {}" +--theme-format "Plasma: {}; Plasma colors: {}; Plasma colors pretty: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}" +--icons-format "Plasma: {}; GTK2: {}; GTK3: {}; GTK4: {}; GTK: {}" +--font-format "Plasma raw: {}; Plasma name: {}; Plasma size: {}; Plasma styles: {}; Plasma pretty: {}; GTK2 raw: {}; GTK2 name: {}; GTK2 size: {}; GTK2 styles: {}; GTK2 pretty: {}; GTK3 raw: {}; GTK3 name: {}; GTK3 size: {}; GTK3 styles: {}; GTK3 pretty: {}; GTK4 raw: {}; GTK4 name: {}; GTK4 size: {}; GTK4 styles: {}; GTK4 pretty: {}; GTK: {}" +--cursor-format "Theme: {}; Size: {}" +--terminal-format "Process: {}; Path: {}; Exe: {}" +--terminal-font-format "Raw: {}; Name: {}; Size: {}; Styles: {}; Pretty: {}" +--cpu-format "Name: {}; Pretty: {}; Vendor: {}; Logical online: {}; Logical configured: {}; Physical: {}; Cores: {}; bios: {}; scaling max: {}; scaling min: {}; info max: {}; info min: {}; cpuinfo: {}; frequency: {}" +--gpu-format "Vendor: {}; Vendor pretty: {}; Name: {}; Name pretty: {}" +--memory-format "Used: {}; Total: {}; Percentage: {}" +--disk-format "Used: {}; Total: {}; Files: {}; Percentage: {}" +--battery-format "Manufactor: {}; Model: {}; Technology: {}; Capacaty: {}; Status: {}" diff --git a/src/modules/shell.c b/src/modules/shell.c index 77da31062..7e340165d 100644 --- a/src/modules/shell.c +++ b/src/modules/shell.c @@ -37,7 +37,7 @@ void ffPrintShell(FFinstance* instance) {FF_FORMAT_ARG_TYPE_STRING, result->shellExeName}, {FF_FORMAT_ARG_TYPE_STRBUF, &result->shellVersion}, {FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellExe}, - {FF_FORMAT_ARG_TYPE_STRING, &result->userShellExeName}, + {FF_FORMAT_ARG_TYPE_STRING, result->userShellExeName}, {FF_FORMAT_ARG_TYPE_STRBUF, &result->userShellVersion} }); }