Signed-off-by: Jacob Hrbek <kreyren@fsfe.org>
This commit is contained in:
Jacob Hrbek 2021-06-15 17:53:20 +02:00
parent 4977d43526
commit a93a9c3d88
6 changed files with 51 additions and 22 deletions

1
.gitignore vendored Normal file

@ -0,0 +1 @@
data/

@ -43,14 +43,21 @@ conky.config = {
}
conky.text = [[
${font Entopia:bold:size=24}SYSTEM ${font}${hr 2}
${offset 20}Host: ${alignr}${execi 3600 cat /sys/devices/virtual/dmi/id/product_version | sed s/\ *$//g} [${execi 3600 cat /sys/devices/virtual/dmi/id/product_name | sed s/\ //g}]
${offset 20}OS: ${alignr}${execi 3600 lsb_release -ds | sed s/\"//g}
${offset 20}Kernel: ${alignr}${sysname} ${kernel}
${offset 20}Architecture: ${alignr}${machine}
${offset 20}Process scheduler: ${alignr}Unknown
${offset 20}Uptime: ${alignr}${uptime}
${offset 20}Entropy: ${entropy_avail}/${entropy_poolsize} (${entropy_perc}%) ${alignr}${entropy_bar 5,100}
${font Entopia:bold:size=21}NETWORK ${hr 2}${font}
${offset 20}Internet Service Provider: ${alignr}Vodafone CZ
${offset 20}Nameserver: ${alignr}${nameserver}
${offset 20}enp7s0 ${alignr}${addr enp7s0}
${offset 20}${downspeedgraph enp7s0 50,150} ${alignr}${upspeedgraph enp7s0 50,150}
${offset 20}${color green}${font} $color${downspeed enp7s0} ${alignr}${color green} $color${upspeed enp7s0}
${execigraph 5 "cat /home/kreyren/.config/conky/data/ping.log | sed '2q;d' | sed -E "s#\w+\s+bytes\s+from\s+[a-z\.-]+\s+\([0-9.]+\):\s[a-z_=]+\w\s\w+=[0-9]+\stime=([0-9]+\.[0-9])\s+ms#\1#g"" -t 80 -l 8}
PING: ${execi 5 cat /home/kreyren/.config/conky/data/ping.log | sed '2q;d' | sed -E "s#\w+\s+bytes\s+from\s+[a-z\.-]+\s+\([0-9.]+\):\s[a-z_=]+\w\s\w+=[0-9]+\stime=([0-9]+\.[0-9])\s+ms#\1#g"} ms
${execigraph 5 "bc <<< $(echo $(cat /home/kreyren/.config/conky/data/speedtest.json | jq --raw-output '"\(.upload)"') / 1000000)"}
DOWN: ${execi 5 bc <<< $(echo $(cat /home/kreyren/.config/conky/data/speedtest.json | jq --raw-output '"\(.download)"') / 8000000)} MB/s (${execi 5 bc <<< $(echo $(cat /home/kreyren/.config/conky/data/speedtest.json | jq --raw-output '"\(.download)"') / 1000000)} Mb/s)
${execigraph 5 "bc <<< $(echo $(cat /home/kreyren/.config/conky/data/speedtest.json | jq --raw-output '"\(.upload)"') / 1000000)"}
UP: ${execi 5 bc <<< $(echo $(cat /home/kreyren/.config/conky/data/speedtest.json | jq --raw-output '"\(.upload)"') / 8000000)} MB/s (${execi 5 bc <<< $(echo $(cat /home/kreyren/.config/conky/data/speedtest.json | jq --raw-output '"\(.upload)"') / 1000000)} Mb/s)
${font Entopia:bold:size=24}SERVICES ${font}${hr 2}
${offset 20}Tor relay: ${alignr}[UNKNOWN]

@ -43,6 +43,7 @@ conky.config = {
}
conky.text = [[
${voffset 10}
${alignc}${font :bold:size=32}${execi 3600 date -u +"%d/%m/%Y"}${font}
${alignc}-- ${exec date -u +"%H:%M:%S %Z"} --
]]

@ -48,6 +48,14 @@ conky.text = [[
${alignc}${font :bold:size=42}${execi 3600 hostname | tr [:lower:] [:upper:]}${font}
${alignc}-- ${execi 3600 "hostname --domain"} --
${font Entopia:bold:size=24}SYSTEM ${font}${hr 2}
${offset 20}Host: ${alignr}${execi 3600 cat /sys/devices/virtual/dmi/id/product_version | sed s/\ *$//g} [${execi 3600 cat /sys/devices/virtual/dmi/id/product_name | sed s/\ //g}]
${offset 20}OS: ${alignr}${execi 3600 lsb_release -ds | sed s/\"//g}
${offset 20}Kernel: ${alignr}${sysname} ${kernel}
${offset 20}Architecture: ${alignr}${machine}
${offset 20}Process scheduler: ${alignr}Unknown
${offset 20}Uptime: ${alignr}${uptime}
${font Entopia:bold:size=24}PERFORMANCE ${font}${hr 2}
${offset 20}${font :bold}CPU:${font} i7-2620M ${freq_g} Ghz (${running_threads}/${threads}) ${cpubar cpu0 8}
${offset 30}0: (${execi 5 sensors | grep "Core 0" | cut -c 17-20} C): [${execi 3600 cat /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor | sed -n '1p'}] ${cpubar cpu1 10}
@ -59,6 +67,7 @@ ${offset 30}RAM: ${mem} / ${memmax} (${memperc}%) ${membar 8}
${offset 30}${memgraph 25}
${offset 20}iGPU: ${alignr}Intel HD Graphics 3000
${offset 20}dGPU: ${alignr}AMD Radeon HD 6650M (${execi 3 env DRI_PRIME=1 sensors | grep radeon-pci-0100 -A 3 | grep temp1 | sed -E "s/(temp1:\s+)(\+|)(\w+.\w+|N\/A).*/\3/g"} C)
${offset 20}Entropy: ${entropy_avail}/${entropy_poolsize} (${entropy_perc}%) ${alignr}${entropy_bar 5,100}
${font Entopia:bold:size=21}TASKS ${hr 2}${font}
${offset 20}Name ${alignr}PID CPU% MEM%
@ -71,12 +80,6 @@ ${offset 20}${top name 6} ${alignr}${top pid 6} ${top cpu 6} ${top mem 6}
${offset 20}${top name 7} ${alignr}${top pid 7} ${top cpu 7} ${top mem 7}
${offset 20} ${alignc}Procs: $processes Run: $running_processes
${font Entopia:bold:size=21}NETWORK ${hr 2}${font}
${offset 20}Nameserver: ${alignr}${nameserver}
${offset 20}enp7s0 ${alignr}${addr enp7s0}
${offset 20}${downspeedgraph enp7s0 50,150} ${alignr}${upspeedgraph enp7s0 50,150}
${offset 20}${color green}${font} $color${downspeed enp7s0} ${alignr}${color green} $color${upspeed enp7s0}
${font Entopia:bold:size=21}DISKS ${hr 2}${font}
${offset 20}${font :bold}/dev/sda:${font} [${ioscheduler sda}]
${offset 30}${fs_used /}/${fs_size /} ${fs_bar 8 /}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 118 KiB

@ -6,11 +6,28 @@
conky_conkyDir="${conky_conkyDir:-"${HOME}/.config/conky"}"
while [ "$#" -ge 0 ]; do case "$1" in
kill) pkill ${CONKY:-"conky"} ;;
*)
${CONKY:-"conky"} --config="$conky_conkyDir/daemons/top_right.lua" &
${CONKY:-"conky"} --config="$conky_conkyDir/daemons/top_middle.lua" &
${CONKY:-"conky"} --config="$conky_conkyDir/daemons/top_left.lua" &
${CONKY:-"conky"} --config="$conky_conkyDir/daemons/bottom_right.lua"
exit 0
esac; shift 1; done
kill) pkill ${CONKY:-"conky"} ;;
*)
[ -d "$conky_conkyDir/data" ] || mkdir "$conky_conkyDir/data"
# NOTE(Krey): I have to do the fucking renaming, bcs pipelines!
# Capture data from a speedtest
while true; do
sleep 300; speedtest --single --server 1363 --json > "$conky_conkyDir/data/speedtest.json.temp"
mv "$conky_conkyDir/data/speedtest.json.temp" "$conky_conkyDir/data/speedtest.json"
done &
# Capture data from a ping
while true; do
# | sed '2q;d' | sed -E "s#\w+\s+bytes\s+from\s+[a-z\.-]+\s+\([0-9.]+\):\s[a-z_=]+\w\s\w+=[0-9]+\stime=([0-9]+\.[0-9])\s+ms#\1#g"
sleep 60; ping -c 1 upc.cz > "$conky_conkyDir/data/ping.log.temp"
mv "$conky_conkyDir/data/ping.log.temp" "$conky_conkyDir/data/ping.log"
done &
${CONKY:-"conky"} --config="$conky_conkyDir/daemons/top_right.lua" &
${CONKY:-"conky"} --config="$conky_conkyDir/daemons/top_middle.lua" &
${CONKY:-"conky"} --config="$conky_conkyDir/daemons/top_left.lua" &
${CONKY:-"conky"} --config="$conky_conkyDir/daemons/bottom_right.lua"
exit 0
esac; shift 1; done