Merge branch 'conky-cli-colors'

conky.conf

@@ -7,7 +7,7 @@
 
 -- Please see LICENSE for details
 
--- Copyright (c) 2020-10-23 Trey Blancher
+-- Copyright (c) 2021 Trey Blancher
 
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -32,13 +32,12 @@ conky.config = {
 	no_buffers = true,
 	update_interval = 1.0,
 	uppercase = false,
-	use_spacer = false,
+	use_spacer = "none",
     pad_percents = 3,
     short_units = false,
 };
 
-conky.text = 
-[[\
+conky.text = [[\
 ${lua_parse printf %-20s ${nodename_short}} \
 RAM:${lua_parse printf %3.0f%% ${memperc}} \
 Swap:${lua_parse printf %3.0f%% ${swapperc}} \
@@ -47,7 +46,10 @@ CPU:${lua_parse printf %3.0f%% ${cpu cpu0}} \
 ${loadavg} \
 ${lua_parse printf %-20s ${top name 1}} \
 ${lua_parse printf %8d ${top pid 1}} \
-${lua_parse printf %3.2f ${top cpu 1}} \
-${lua_parse printf %3.2f ${top mem 1}} \
+${lua_parse printf %6.2f ${top cpu 1}} \
+${lua_parse printf %6.2f ${top mem 1}} \
 Net: ${lua_parse printf %10s▲%10s▼ ${upspeed wlp4s0} ${downspeed wlp4s0}} \
+${exec ~/bin/core_temp.sh}${lua_parse printf %9s ${exec ~/bin/core_temp.sh -t}}^fg(\#ebdbb2) \
+${exec ~/bin/nvme_temp.sh}${lua_parse printf %9s ${exec ~/bin/nvme_temp.sh -t}}^fg(\#ebdbb2) \
+${exec ~/bin/virt_temp.sh}${lua_parse printf %9s ${exec ~/bin/virt_temp.sh -t}}^fg(\#ebdbb2) \
 ]];