[sway] cleanup and enable cpu temperatur in conkyrc

1 files changed, 24 insertions, 27 deletions

diff --git a/config/sway/conkyrc.json b/config/sway/conkyrc.json
index 1c45da2..2d4983c 100644
--- a/config/sway/conkyrc.json
+++ b/config/sway/conkyrc.json
@@ -11,65 +11,62 @@ conky.config = {
 
 conky.text = [[
 [
-    #{"name": "uptime", "color":"\#ffffff", "full_text":"${uptime_short}"},
-    
     ################## cpu #################
 
-    #{"name": "cpuTemperature", "full_text": "${exec sensors | grep -A 1 'temp1' | cut -c13-16 | sed '/^$/d'}C"},
+    {"name": "cpuTemperature1", "full_text": "${exec sensors | grep 'temp1' | cut -d" " -f9}",
+    "separator": false},
+    {"name": "cpuTemperature2", "full_text": "${exec sensors | grep 'temp2' | cut -d" " -f9}"},
 
-    {"name": "cpuStart", "color" : "\#ffffff", "full_text": "CPU: [", "separator": false},
+    {"name": "cpuStart", "color" : "\#ffffff", "full_text": "CPU:", "separator": false},
 
     {"name": "cpu1", "color": ${if_match ${cpu cpu1}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu1}%,", "separator": false},  
+    "full_text": "${cpu cpu1}%,", "separator": false},
 
     {"name": "cpu2", "color": ${if_match ${cpu cpu2}<89}"\#ffffff"${else}"\#ff0000"${endif},
 
-    "full_text": "${cpu cpu2}%,", "separator": false},  
+    "full_text": "${cpu cpu2}%,", "separator": false},
 
     {"name": "cpu3", "color": ${if_match ${cpu cpu3}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu3}%,", "separator": false},  
+    "full_text": "${cpu cpu3}%,", "separator": false},
 
     {"name": "cpu4", "color": ${if_match ${cpu cpu4}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu4}%", "separator": false},  
-
-    {"name": "cpuEnd", "color": "\#ffffff", "full_text": "]"},
-
+    "full_text": "${cpu cpu4}%"},
 
     ################ memory #########################
 
     {"name": "memory", "color": ${if_match ${memperc}<80}"\#ffffff"${else}"\#ff0000"${endif},
         "full_text": "RAM: ${memperc}%"},  
 
-    #{"name": "disk", "color": "\#ffffff", "full_text": " ${fs_used_perc /}%"},  
+    #{"name": "disk", "color": "\#ffffff", "full_text": " ${fs_used_perc /}%"},
 
 
     ############### music/ spotify/ mpd ###################
 
     ${if_match "${nodename_short}"!="fishbowl"}
-	    {"name":"music", "color": "\#ffffff", "full_text": "${exec $DOTFILES_LOCATION/scripts/media_status.sh}"},
+        {"name":"music", "color": "\#ffffff", "full_text": "${exec $DOTFILES_LOCATION/scripts/media_status.sh}"},
     ${endif}
 
 
     ########### networking ########################
 
     ${if_up wlp2s0} 
-	    {"name":"wifi", "color": ${if_match ${wireless_link_qual_perc wlp2s0}>60}"\#339966"${else}"\#FF9200"${endif},
+        {"name":"wifi", "color": ${if_match ${wireless_link_qual_perc wlp2s0}>60}"\#339966"${else}"\#FF9200"${endif},
         "full_text": "${addr wlp2s0} ${wireless_link_qual_perc wlp2s0}%"}, 
-        {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed wlp2s0}"}, 
+        {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed wlp2s0}"},
 
     ${else} ${if_up enp0s20u1}
-	            {"name":"ethernet", "color": "\#339966", "full_text": "IP: ${addr enp0s20u1} "}, 
-                {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed enp0s20u1}"}, 
+                {"name":"ethernet", "color": "\#339966", "full_text": "IP: ${addr enp0s20u1} "},
+                {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed enp0s20u1}"},
 
             ${else} ${if_up eth0}
-	                    {"name":"ethernet", "color": "\#339966", "full_text": "IP: ${addr eth0} "}, 
-                        {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed eth0}"}, 
+                        {"name":"ethernet", "color": "\#339966", "full_text": "IP: ${addr eth0} "},
+                        {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed eth0}"},
 
-	                ${else}
-	                    {"name":"nonet", "full_text": "no connection" }, 
-                    ${endif}  
-            ${endif}  
-    ${endif}  
+                    ${else}
+                        {"name":"nonet", "full_text": "no connection" },
+                    ${endif}
+            ${endif}
+    ${endif}
 
 
     ################ Volume ########################
@@ -86,15 +83,15 @@ conky.text = [[
             ${else}"\#ff9200"
             ${endif}
         ${else}"\#ffffff"
-        ${endif}, "full_text": "${battery BAT0}"},  
-    
+        ${endif}, "full_text": "${battery BAT0}"},
+
     {"name": "battery","color":
         ${if_match ${battery_percent BAT1}<50}
             ${if_match ${battery_percent BAT1}<25}"\#ff0000"
             ${else}"\#ff9200"
             ${endif}
         ${else}"\#ffffff"
-        ${endif}, "full_text": "${battery BAT1}"},  
+        ${endif}, "full_text": "${battery BAT1}"},
 
 
     ############### Time ##################