Compare commits

..

No commits in common. "759956fd32948c6abc343f56d6afb6de9c1d6056" and "983665a6deb646341e6dd99a20c4c802df176af8" have entirely different histories.

3 changed files with 20 additions and 393 deletions

View file

@ -4,7 +4,7 @@ cursor_shape block
cursor_stop_blinking_after 10 cursor_stop_blinking_after 10
shell_integration enabled no-cursor shell_integration enabled no-cursor
enable_audio_bell no enable_audio_bell no
background_opacity 0.95 #background_opacity 0.7
window_padding_width 20 window_padding_width 20
#background #202020 #background #202020
include everforest-dark.conf include everforest-dark.conf

View file

@ -20,10 +20,10 @@ end_color = #ffffff 0
# Backgrounds # Backgrounds
# Background 1: Panel # Background 1: Panel
rounded = 8 rounded = 0
border_width = 0 border_width = 0
border_sides = TBLR border_sides = TBLR
background_color = #323d43 88 background_color = #323d43 100
border_color = #323d43 30 border_color = #323d43 30
background_color_hover = #323d43 70 background_color_hover = #323d43 70
border_color_hover = #323d43 30 border_color_hover = #323d43 30
@ -76,10 +76,10 @@ border_color_pressed = #000000 100
#------------------------------------- #-------------------------------------
# Panel # Panel
panel_items = TE:B:SCP panel_items = TEEB:SCP
panel_size = 99% 48 panel_size = 100% 48
scale_relative_to_dpi = 216 scale_relative_to_dpi = 216
panel_margin = 0 8 panel_margin = 0 0
panel_padding = 2 0 2 panel_padding = 2 0 2
panel_background_id = 1 panel_background_id = 1
wm_menu = 1 wm_menu = 1
@ -94,7 +94,7 @@ autohide_hide_timeout = 0.5
autohide_height = 2 autohide_height = 2
strut_policy = follow_size strut_policy = follow_size
panel_window_name = tint2 panel_window_name = tint2
disable_transparency = 0 disable_transparency = 1
mouse_effects = 1 mouse_effects = 1
font_shadow = 0 font_shadow = 0
mouse_hover_icon_asb = 100 0 10 mouse_hover_icon_asb = 100 0 10
@ -198,7 +198,7 @@ battery_low_cmd = notify-send "Low battery: 10%"
battery_full_cmd = notify-send "Battery done charging" battery_full_cmd = notify-send "Battery done charging"
bat1_font = Hack 14 bat1_font = Hack 14
battery_font_color = #d8caac 100 battery_font_color = #d8caac 100
bat1_format = | BAT: %s %p %t bat1_format = | Bat: %s %p %t
bat2_format = bat2_format =
battery_padding = 1 0 battery_padding = 1 0
battery_background_id = 0 battery_background_id = 0
@ -227,19 +227,11 @@ tooltip_font = Hack 14
separator = new separator = new
separator_background_id = 0 separator_background_id = 0
separator_color = #7fbbb3 separator_color = #7fbbb3
separator_style = empty
separator_size = 4
separator_padding = 0 0
# Separator2
separator = new
separator_background_id = 0
separator_color = #7fbbb3
separator_style = dots separator_style = dots
separator_size = 4 separator_size = 4
separator_padding = 12 0 separator_padding = 12 0
# Separator3 # Separator2
separator = new separator = new
separator_background_id = 0 separator_background_id = 0
separator_color = #7fbbb3 80 separator_color = #7fbbb3 80
@ -247,7 +239,7 @@ separator_style = line
separator_size = 2 separator_size = 2
separator_padding = 12 0 separator_padding = 12 0
# Separator4 # Separator3
separator = new separator = new
separator_background_id = 0 separator_background_id = 0
separator_color = #7fbbb3 separator_color = #7fbbb3
@ -260,36 +252,20 @@ separator_padding = 12 0
# Exec1 # Exec1
# Note the use of "stdbuf -oL" to force the program to flush the output line by line. # Note the use of "stdbuf -oL" to force the program to flush the output line by line.
#execp = new execp = new
#execp_command = free -b -s10| stdbuf -oL awk '/^Mem:/ { printf "Mem: %s / \n", $3 }' | stdbuf -oL numfmt --to=iec-i --field=2 -d' ' execp_command = free -b -s10| stdbuf -oL awk '/^Mem:/ { printf "Mem: %s / \n", $3 }' | stdbuf -oL numfmt --to=iec-i --field=2 -d' '
#execp_interval = 30 execp_interval = 10
#execp_continuous = 1 execp_continuous = 1
#execp_font = Hack 14 execp_font = Hack 14
#execp_font_color = #d8caac 100 execp_font_color = #d8caac 100
# Exec2 # Exec2
#execp = new
#execp_command = free -b -s10| stdbuf -oL awk '/^Mem:/ { printf "%s %.0f%%\n", $2, 100 * ($2 - $7) / $2 }' | stdbuf -oL numfmt --to=iec-i --field=1 -d' '
#execp_interval = 30
#execp_continuous = 1
#execp_font = Hack 14
#execp_font_color = #d8caac 100
# Exec3
execp = new execp = new
execp_command = sys-mon.py -CatMu -N execp_command = free -b -s10| stdbuf -oL awk '/^Mem:/ { printf "%s %.0f%%\n", $2, 100 * ($2 - $7) / $2 }' | stdbuf -oL numfmt --to=iec-i --field=1 -d' '
execp_interval = 30 execp_interval = 10
execp_has_icon = 0 execp_continuous = 1
execp_cache_icon = 0
execp_continuous = 0
execp_markup = 0
execp_font_color = #d8caac 100
execp_padding = 0 0
execp_font = Hack 14 execp_font = Hack 14
execp_background_id = 0 execp_font_color = #d8caac 100
execp_centered = 1
execp_icon_w = 0
execp_icon_h = 0
#------------------------------------- #-------------------------------------
# Buttons # Buttons

View file

@ -1,349 +0,0 @@
#!/usr/bin/env python
# _*_ coding: utf-8 _*_
"""
This script uses the `python-psutil` module to display the CPU average load, frequency (current/max),
the temperature sensor reading, the fan speed and memory usage (used/total).
Author: Piotr Miller
e-mail: nwg.piotr@gmail.com
Website: http://nwg.pl
Project: https://github.com/nwg-piotr/tint2-executors
The script is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License
as published by the Free Software Foundation, either version 3 of the License, or any later version.
The script is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
Inspired by tknomanzr's cpu.py at https://forums.bunsenlabs.org/viewtopic.php?id=4276
Command: python ~/tint2-executors/cpu-fan-mem.py [-C{components}] [-F] [-N] [-T] [-ALL] [-h] [--help]
-C stands for Components:
g - (g)raphical CPU load bar
p - (p)ercentage for each core (text)
a - (a)verage CPU load (text)
q - fre(q)ency for each thread
Q - fre(Q)ency for each thread/max frequency
s - current CPU (s)peed
S - current/max CPU (S)peed
t - CPU (t)emperature
f - (f)an speed
m - (m)emory in use
M - (M)emory in use/total
w - s(w)ap memory in use
W - s(W)ap memory in use/total
d - (d)rives as names usage in %
D - (D)rives as names used/total
n - drives as mou(n)tpoints usage in %
N - drives as mou(N)tpoints used/total
u - (u)ptime HH:MM
U - (U)ptime HH:MM:SS
-F - use Fahrenheit instead of
-N - display field names (except for (g)raphical CPU load bar)
-T - test execution time
-ALL - display all possible data (for use in terminal)
"""
import sys
import psutil
import re
import time
def main():
fahrenheit = False
names = False
testing = False
time_start = None
components = "gStfM"
for i in range(1, len(sys.argv)):
if sys.argv[i] == "-h" or sys.argv[i] == "--help":
print_help()
exit(0)
if sys.argv[i] == "-F":
fahrenheit = True
if sys.argv[i] == "-N":
names = True
if sys.argv[i] == "-T":
testing = True
if sys.argv[i].startswith("-C"):
components = sys.argv[i][2::]
if sys.argv[i] == "-ALL":
components = "gpaQStfMWDU"
names = True
testing = True
if testing:
time_start = int(round(time.time() * 1000))
pcpu, avg, speed, freqs, temp, fans, b_time, \
memory, swap, disks_usage = None, None, None, None, None, None, None, None, None, None
output = ""
# Prepare ONLY requested data, ONLY once
if "g" in components or "p" in components:
try:
pcpu = psutil.cpu_percent(interval=1, percpu=True)
except:
pass
if "a" in components:
try:
avg = str(psutil.cpu_percent(interval=1))
if len(avg) < 4:
avg = "~" + avg
except:
pass
if "s" in components or "S" in components:
try:
speed = psutil.cpu_freq(False)
except:
pass
if "q" in components or "Q" in components:
try:
freqs = psutil.cpu_freq(True)
if len(freqs) == 0:
freqs = None
except:
pass
if "t" in components:
try:
temp = psutil.sensors_temperatures(fahrenheit)
except:
pass
if "f" in components:
try:
fans = psutil.sensors_fans()
except:
pass
if "m" in components or "M" in components:
try:
memory = psutil.virtual_memory()
except:
pass
if "w" in components or "W" in components:
try:
s = psutil.swap_memory()
swap = s[1], s[0]
except:
pass
drives = []
# Find drive names, mountpoints
if "d" in components or "D" in components or "n" in components or "N" in components:
try:
d = psutil.disk_partitions()
# This will store name, mountpoint
for entry in d:
n = entry[0].split("/")
name = n[len(n) - 1]
# name, mountpoint
drive = name, entry[1]
drives.append(drive)
except:
pass
if "d" in components or "D" in components:
try:
disks_usage = []
for drive in drives:
# Search drives by path
data = psutil.disk_usage(drive[1])
# Store name, used, total, percent
essential = drive[0].upper(), data[1], data[0], data[3]
disks_usage.append(essential)
except:
pass
if "n" in components or "N" in components:
try:
disks_usage = []
for drive in drives:
# Search drives by path
data = psutil.disk_usage(drive[1])
# Store mountpoint, used, total, percent
essential = drive[1], data[1], data[0], data[3]
disks_usage.append(essential)
except:
pass
if "u" in components or "U" in components:
try:
b_time = psutil.boot_time()
except:
pass
# Build output component after component
for char in components:
if char == "g" and pcpu is not None:
output += " " + graph_per_cpu(pcpu) + " "
if char == "p" and pcpu is not None:
output += " CPU:" if names else " "
output += per_cpu(pcpu) + " "
if char == "a" and avg is not None:
output += " avCPU:" if names else " "
output += avg + "% "
if char == "q" and freqs is not None:
output += " CPU:" if names else " "
output += freq_per_cpu(freqs)[0][:-1] + "GHz "
if char == "Q" and freqs is not None:
output += " CPU:" if names else " "
result = freq_per_cpu(freqs)
output += result[0][:-1] + "/" + str(result[1]) + "GHz "
if char == "s" and speed is not None:
output += " SPD:" if names else " "
output += str(round(speed[0] / 1000, 1)) + "GHz "
if char == "S" and speed is not None:
output += " avSPD:" if names else " "
output += str(round(speed[0] / 1000, 1)) + "/" + str(round(speed[2] / 1000, 1)) + "GHz "
if char == "t" and temp is not None and len(temp) > 0:
output += " CORE:" if names else " "
# "acpitz" for ACPI Thermal Zone
output += str(temp["acpitz"][0][1])
output += "" if fahrenheit else ""
if char == "f" and fans is not None and len(fans) > 0:
output += " FAN:" if names else " "
fan0 = next(iter(fans.values()))
output += str(fan0[0][1]) + "/m "
if char == 'm' and memory is not None:
output += " MEM:" if names else " "
output += str(round((memory[0] - memory[1]) / 1073741824, 1)) + "GB "
if char == 'M' and memory is not None:
output += " MEM:" if names else " "
output += str(round((memory[3]) / 1073741824, 1)) + "/" + str(
round(memory[0] / 1073741824, 1)) + "GB "
if char == 'u' and b_time is not None:
up_time = int(time.time()) - b_time
m, s = divmod(up_time, 60)
h, m = divmod(m, 60)
output += " UP:" if names else " "
output += "%d:%02d " % (h, m)
if char == 'U' and b_time is not None:
up_time = int(time.time()) - b_time
m, s = divmod(up_time, 60)
h, m = divmod(m, 60)
output += " UP:" if names else " "
output += "%d:%02d:%02d " % (h, m, s)
if char == "w" and swap is not None:
output += " SWAP:" if names else " "
output += str(round(swap[0] / 1073741824, 1)) + "GB "
if char == "W" and swap is not None:
output += " SWAP:" if names else " "
output += str(round(swap[0] / 1073741824, 1)) + "/"
output += str(round(swap[1] / 1073741824, 1)) + "GB "
if char == "d" or char == "n" and disks_usage is not None:
for entry in disks_usage:
output += " " + entry[0] + ":"
output += str(entry[3]) + "% "
if char == "D" or char == "N" and disks_usage is not None:
for entry in disks_usage:
output += " " + entry[0] + ":"
output += str(round(entry[1] / 1073741824, 1)) + "/"
output += str(round(entry[2] / 1073741824, 1)) + "GB "
if testing:
output += " [" + str(int((round(time.time() * 1000)) - time_start) / 1000) + "s]"
# remove double, leading and trailing spaces before printing
print(re.sub(' +', ' ', output).strip())
def per_cpu(result):
string = ""
for val in result:
proc = str(int(round(val, 1)))
if len(proc) < 2:
proc = "~" + proc
string += proc + "% "
return string
def freq_per_cpu(result):
string = ""
max_freq = 0
for val in result:
freq = str(round(val[0] / 1000, 1))
string += freq + "|"
max_freq = str(round(val[2] / 1000, 1))
return string, max_freq
def graph_per_cpu(result):
graph = "_▁▂▃▄▅▆▇███"
string = ""
for val in result:
proc = int(round(val / 10, 0))
string += graph[proc]
return string
def print_help():
print("\nArguments: [-C{components}] [-F] [-N] [-T] [-ALL] [-h] [--help]")
print("\n-C defines Components. If none given, -CgStfM will be used by default\n")
print(" g - (g)raphical CPU load bar")
print(" p - (p)ercentage for each core (text)")
print(" a - (a)verage CPU load (text)")
print(" q - fre(q)ency for each thread")
print(" Q - fre(Q)ency for each thread/max frequency")
print(" s - current CPU (s)peed")
print(" S - current/max CPU (S)peed")
print(" t - CPU (t)emperature")
print(" f - (f)an speed")
print(" m - (m)emory in use")
print(" M - (M)emory in use/total")
print(" w - s(w)ap memory in use")
print(" W - s(W)ap memory in use/total")
print(" d - (d)rives as names usage in %")
print(" D - (D)rives as names used/total")
print(" n - drives as mou(n)tpoints usage in %")
print(" N - drives as mou(N)tpoints used/total")
print(" u - (u)ptime HH:MM")
print(" U - (U)ptime HH:MM:SS")
print("\n-F - use Fahrenheit instead of ℃")
print("-N - display field names (except for (g)raphical CPU load bar)")
print("-T - test execution time")
print("-ALL - display all possible data (for use in terminal)\n")
if __name__ == "__main__":
main()