Merge branch 'master' of https://gogs.neodarz.ovh/NeodarZ/dotfiles

2 files changed, 28 insertions, 7 deletions

diff --git a/conkyrc.txt b/conky/conkyrc.txt
index a128309..c082053 100755
--- a/conkyrc.txt
+++ b/conky/conkyrc.txt
@@ -9,7 +9,7 @@ conky.config = {
     update_interval = 1.0,														--Update interval in seconds
     total_run_times = 0,														--This is the number of times Conky will update before quitting (0 = infinite)
     own_window = true,															--Create own Window?
-    own_window_type = 'normal',													--Use "normal" to create own window instead of using desktop (required in nautilus)
+    own_window_type = panel,													--Use "normal" to create own window instead of using desktop (required in nautilus)
     own_window_transparent = true,												--Own Window transparent?
 	own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',		--Own Window configuration
     double_buffer = true,														--Use double buffering (reduces flicker, may not work for everyone)
@@ -62,18 +62,19 @@ ${color green}${color green}${loadgraph 30,300 00FF00 00FF00 -l}
 
 ${color}${font AvantGardeLTMedium:style=Bold:pixelsize=10}${color Tan1}CPU USAGE:${color white}
 ${font AvantGardeLTMedium:style=Bold:pixelsize=8}
-${freq}MHz / ${acpitemp}°C (${cpu cpu1}%) ${alignr}${freq}MHz / ${acpitemp}°C (${cpu cpu2}%)
-${color green}${cpubar 5,120 cpu1}  ${alignr}${color green}${cpubar 5,120 cpu2}
-${color green}${cpubar 5,120 cpu3}  ${alignr}${color green}${cpubar 5,120 cpu4}
-${color white}${freq}MHz / ${acpitemp}°C (${cpu cpu3}%) ${alignr}${freq}MHz / ${acpitemp}°C (${cpu cpu4}%)
+#${freq}MHz / ${acpitemp}°C (${cpu cpu1}%) ${alignr}${freq}MHz / ${acpitemp}°C (${cpu cpu2}%)
+#${color green}${cpubar 5,120 cpu1}  ${alignr}${color green}${cpubar 5,120 cpu2}
+#${color green}${cpubar 5,120 cpu3}  ${alignr}${color green}${cpubar 5,120 cpu4}
+#${color white}${freq}MHz / ${acpitemp}°C (${cpu cpu3}%) ${alignr}${freq}MHz / ${acpitemp}°C (${cpu cpu4}%)
+${execpi 3 /home/neodarz/dotfiles/conky/test.sh }
 
 ${color}1st ${color green}${top name 1}${top cpu 1}%${alignr}  ${color}1st ${color green}${top name 2}${top cpu 2}%
 
 
 ${color}${font AvantGardeLTMedium:style=Bold:pixelsize=10}${color Tan1}MEMORY USAGE:${color white}
 ${font AvantGardeLTMedium:size=7}
-$mem / $memmax ($memperc%)
-${color green}${membar 5,120}
+$mem / $memmax ($memperc%) ${alignr}${swap} / ${swapmax}
+${color green}${membar 5,120} ${alignr}${swapbar 5,120}
 
 ${color}1st ${color green}${top_mem name 1}${top_mem mem 1}% ${alignr}${color}6th ${color green}${top_mem name 6}${top_mem mem 6}%
 ${color}2nd ${color green}${top_mem name 2}${top_mem mem 2}% ${alignr}${color}7th ${color green}${top_mem name 7}${top_mem mem 7}%
diff --git a/conky/test.sh b/conky/test.sh
new file mode 100755
index 0000000..9227167
--- /dev/null
+++ b/conky/test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# commend example
+# sudo hddtemp /dev/sda
+if [ $(sensors | grep -P "k10temp-pci-00c3") == "k10temp-pci-00c3" ];then
+    amdtemp=$(sensors | grep temp1 | grep "(high" | awk -F' ' '{print $2}' | cut -d+ -f2)
+    echo "\${color white}\${freq}MHz / $amdtemp (\${cpu cpu1}%) \${alignr}\${freq}MHz / $amdtemp (\${cpu cpu2}%)"
+    echo "\${color green}\${cpubar cpu1 5,120} \${alignr}\${color green}\${cpubar cpu2 5,120}"
+    echo "\${color green}\${cpubar cpu3 5,120} \${alignr}\${color green}\${cpubar cpu4 5,120}"
+    echo "\${color white}\${freq}MHz / $amdtemp (\${cpu cpu3}%) \${alignr}\${freq}MHz / $amdtemp (\${cpu cpu4}%)"
+    echo ""
+    echo "\${color white}\${freq}MHz / $amdtemp (\${cpu cpu5}%) \${alignr}\${freq}MHz / $amdtemp (\${cpu cpu6}%)"
+    echo "\${color green}\${cpubar  cpu5 5,120} \${alignr}\${color green}\${cpubar cpu6 5,120}"
+    echo "\${color green}\${cpubar  cpu7 5,120} \${alignr}\${color green}\${cpubar cpu8 5,120}"
+    echo "\${color white}\${freq}MHz / $amdtemp (\${cpu cpu7}%) \${alignr}\${freq}MHz / $amdtemp (\${cpu cpu8}%)"
+else
+    echo "\${color white}\${freq}MHz / \${acpitemp} (\${cpu cpu1}%) \${alignr}\${freq}MHz / \${acpitemp} (\${cpu cpu2}%)"
+    echo "\${color green}\${cpubar  cpu1 5,120} \${alignr}\${color green}\${cpubar cpu2 5,120}"
+    echo "\${color green}\${cpubar  cpu3 5,120} \${alignr}\${color green}\${cpubar cpu4 5,120}"
+    echo "\${color white}\${freq}MHz / \${acpitemp} (\${cpu cpu3}%) \${alignr}\${freq}MHz / \${acpitemp} (\${cpu cpu4}%)"
+fi