Merge 6db49a5608 into d1680735d9

core22 attempt

.github/workflows/test-snap-can-build.yml

@@ -1,5 +1,4 @@
 name: 🧪 Test snap can be built on x86_64
-
 on:
   workflow_dispatch:
   push:
@@ -28,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
         
     steps:
       - uses: actions/checkout@v2

Makefile

@@ -124,11 +124,9 @@ endif
 #? Pull in platform specific source files and get thread count
 ifeq ($(PLATFORM_LC),linux)
 	PLATFORM_DIR := linux
-	THREADS	:= $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
 	SU_GROUP := root
 else ifeq ($(PLATFORM_LC),freebsd)
 	PLATFORM_DIR := freebsd
-	THREADS	:= $(shell getconf NPROCESSORS_ONLN 2>/dev/null || echo 1)
 	SU_GROUP := wheel
 	override ADDFLAGS += -lm -lkvm -ldevstat -Wl,-rpath=/usr/local/lib/gcc$(CXX_VERSION_MAJOR)
 	ifneq ($(STATIC),true)
@@ -137,12 +135,10 @@ else ifeq ($(PLATFORM_LC),freebsd)
 	export MAKE = gmake
 else ifeq ($(PLATFORM_LC),macos)
 	PLATFORM_DIR := osx
-	THREADS	:= $(shell sysctl -n hw.ncpu || echo 1)
 	override ADDFLAGS += -framework IOKit -framework CoreFoundation -Wno-format-truncation
 	SU_GROUP := wheel
 else ifeq ($(PLATFORM_LC),openbsd)
 	PLATFORM_DIR := openbsd
-	THREADS	:= $(shell sysctl -n hw.ncpu || echo 1)
 	override ADDFLAGS += -lkvm -static-libstdc++
 	export MAKE = gmake
 	SU_GROUP := wheel
@@ -150,17 +146,11 @@ else
 $(error $(shell printf "\033[1;91mERROR: \033[97mUnsupported platform ($(PLATFORM))\033[0m"))
 endif
 
-#? Use all CPU cores (will only be set if using Make 4.3+)
-MAKEFLAGS := --jobs=$(THREADS)
-ifeq ($(THREADS),1)
-	override THREADS := auto
-endif
-
 #? LTO command line
 ifeq ($(CLANG_WORKS),true)
 	LTO := thin
 else
-	LTO := $(THREADS)
+	LTO := auto
 endif
 
 GIT_COMMIT := $(shell git rev-parse --short HEAD 2> /dev/null || true)
@@ -237,7 +227,6 @@ info:
 	@printf "\033[1;96mARCH         \033[1;93m?| \033[0m$(ARCH)\n"
 	@printf "\033[1;95mGPU_SUPPORT  \033[1;94m:| \033[0m$(GPU_SUPPORT)\n"
 	@printf "\033[1;93mCXX          \033[1;93m?| \033[0m$(CXX) \033[1;93m(\033[97m$(CXX_VERSION)\033[93m)\n"
-	@printf "\033[1;94mTHREADS      \033[1;94m:| \033[0m$(THREADS)\n"
 	@printf "\033[1;92mREQFLAGS     \033[1;91m!| \033[0m$(REQFLAGS)\n"
 	@printf "\033[1;91mWARNFLAGS    \033[1;94m:| \033[0m$(WARNFLAGS)\n"
 	@printf "\033[1;94mOPTFLAGS     \033[1;94m:| \033[0m$(OPTFLAGS)\n"

snap/snapcraft.yaml

@@ -6,7 +6,7 @@ description: |
   C++ version and continuation of bashtop and bpytop.
 license: Apache-2.0
 
-base: core20
+base: core22
 grade: stable
 confinement: strict
 compression: lzo

src/linux/btop_collect.cpp

@@ -160,6 +160,7 @@ namespace Gpu {
 	namespace Rsmi {
 	#if !defined(RSMI_STATIC)
 		//? RSMI defines, structs & typedefs
+        #define RSMI_DEVICE_NAME_BUFFER_SIZE 128
 		#define RSMI_MAX_NUM_FREQUENCIES_V5  32
 		#define RSMI_MAX_NUM_FREQUENCIES_V6  33
 		#define RSMI_STATUS_SUCCESS           0
@@ -1396,8 +1397,8 @@ namespace Gpu {
 			for (uint32_t i = 0; i < device_count; ++i) {
 				if constexpr(is_init) {
 					//? Device name
-					char name[NVML_DEVICE_NAME_BUFFER_SIZE]; // ROCm SMI does not provide a constant for this as far as I can tell, this should be good enough
-    				result = rsmi_dev_name_get(i, name, NVML_DEVICE_NAME_BUFFER_SIZE);
+					char name[RSMI_DEVICE_NAME_BUFFER_SIZE];
+    				result = rsmi_dev_name_get(i, name, RSMI_DEVICE_NAME_BUFFER_SIZE);
         			if (result != RSMI_STATUS_SUCCESS)
     					Logger::warning("ROCm SMI: Failed to get device name");
         			else gpu_names[Nvml::device_count + i] = string(name);

themes/gruvbox_light.theme

@@ -0,0 +1,89 @@
+# Btop gruvbox_light theme
+# by kk9uk
+
+# Main background, empty for terminal default, need to be empty if you want transparent background
+theme[main_bg]="#fbf1c7"
+
+# Main text color
+theme[main_fg]="#3c3836"
+
+# Title color for boxes
+theme[title]="#3c3836"
+
+# Highlight color for keyboard shortcuts
+theme[hi_fg]="#cc241d"
+
+# Background color of selected items
+theme[selected_bg]="#f2e5bc"
+
+# Foreground color of selected items
+theme[selected_fg]="#8f3f71"
+
+# Color of inactive/disabled text
+theme[inactive_fg]="#ebdbb2"  
+
+# Color of text appearing on top of graphs, i.e uptime and current network graph scaling
+theme[graph_text]="#a89984"
+
+# Misc colors for processes box including mini cpu graphs, details memory graph and details status text
+theme[proc_misc]="#98971a"
+
+# Cpu box outline color
+theme[cpu_box]="#a89984"
+
+# Memory/disks box outline color
+theme[mem_box]="#a89984"
+
+# Net up/down box outline color
+theme[net_box]="#a89984"
+
+# Processes box outline color
+theme[proc_box]="#a89984"
+
+# Box divider line and small boxes line color
+theme[div_line]="#a89984"
+
+# Temperature graph colors
+theme[temp_start]="#98971a"
+theme[temp_mid]=""
+theme[temp_end]="#cc241d"
+
+# CPU graph colors
+theme[cpu_start]="#427b58"
+theme[cpu_mid]="#d79921"
+theme[cpu_end]="#cc241d"
+
+# Mem/Disk free meter
+theme[free_start]="#cc241d"
+theme[free_mid]="#d79921"
+theme[free_end]="#427b58"
+
+# Mem/Disk cached meter
+theme[cached_start]="#458588"
+theme[cached_mid]="#076678"
+theme[cached_end]="#427b58"
+
+# Mem/Disk available meter
+theme[available_start]="#cc241d"
+theme[available_mid]="#d65d0e"
+theme[available_end]="#b57614"
+
+# Mem/Disk used meter
+theme[used_start]="#427b58"
+theme[used_mid]="#d65d0e"
+theme[used_end]="#cc241d"
+
+# Download graph colors
+theme[download_start]="#98971a"
+theme[download_mid]="#689d6a"
+theme[download_end]="#79740e"
+
+# Upload graph colors
+theme[upload_start]="#cc241d"
+theme[upload_mid]="#d65d0e"
+theme[upload_end]="#b57614"
+
+# Process box color gradient for threads, mem and cpu usage
+theme[process_start]="#427b58"
+theme[process_mid]="#af3a03"
+theme[process_end]="#cc241d"