Mise à jour

This commit is contained in:
Breizh 2018-03-27 17:38:03 +02:00
parent e306c0cdce
commit acf96ce920
9 changed files with 38 additions and 38 deletions

View file

@ -32,7 +32,7 @@ conky.config = {
};
conky.text = [[
${voffset 8}
#${voffset 8}
${color 6699CC}$alignc${font xos4 Terminus:pixelsize=18}${time %A %d %B %Y}$font$color
${color2}${font xos4 Terminus:pixelsize=14}Processeur${alignr}${font}${if_match ${exec sensors -u | grep "temp1_input" | cut -d" " -f4 | cut -d. -f1 | head -n 1}>=60}${color F2777A}$endif${exec sensors -u | grep "temp1_input" | cut -d" " -f4 | cut -d. -f1 | head -n 1}°C${color}
@ -70,12 +70,12 @@ ${downspeedgraph wlp1s0 25,128 FFCC66 99CC99}$alignr${upspeedgraph wlp1s0 25,128
${color2}${font xos4 Terminus:pixelsize=14}Ethernet${font}${alignr}${addr enp0s31f6}${color}
Descendant ${totaldown enp0s31f6}${alignr}${totalup enp0s31f6} Montant
${downspeed enp0s31f6}${alignr}${upspeed enp0s31f6}
${downspeedgraph enp0s31f6 25,128 FFCC66 99CC99}$alignr${upspeedgraph enp0s31f6 25,128 FFCC66 99CC99}${voffset -10}${endif}${if_up enp0s20f0u2}
${downspeedgraph enp0s31f6 25,128 FFCC66 99CC99}$alignr${upspeedgraph enp0s31f6 25,128 FFCC66 99CC99}${voffset -10}${endif}${if_up tun0}
${color2}${font xos4 Terminus:pixelsize=14}USB${font}${alignr}${addr enp0s20f0u2}${color}
Descendant ${totaldown enp0s20f0u2}${alignr}${totalup enp0s20f0u2} Montant
${downspeed enp0s20f0u2}${alignr}${upspeed enp0s20f0u2}
${downspeedgraph enp0s20f0u2 25,128 FFCC66 99CC99}$alignr${upspeedgraph enp0s20f0u2 25,128 FFCC66 99CC99}${voffset -10}${endif}
${color2}${font xos4 Terminus:pixelsize=14}VPN${font}${alignr}${addr tun0}${color}
Descendant ${totaldown tun0}${alignr}${totalup tun0} Montant
${downspeed tun0}${alignr}${upspeed tun0}
${downspeedgraph tun0 25,128 FFCC66 99CC99}$alignr${upspeedgraph tun0 25,128 FFCC66 99CC99}${voffset -10}${endif}
${color2}${font xos4 Terminus:pixelsize=14}Disque${font}${alignr}${if_match $hddtemp>=50}${color F2777A}$endif${hddtemp}°C${color}
Lecture ${diskio_read sda}${alignr}${diskio_write sda} Écriture

View file

@ -117,7 +117,8 @@ bindsym $mod+Shift+F3 exec gksu pcmanfm
bindsym $mod+F5 exec i3-sensible-terminal +sb -e fish -c mocp
bindsym $mod+t exec --no-startup-id pkill compton
bindsym $mod+Ctrl+t exec --no-startup-id compton -b
bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart dunst'"
#bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart dunst'"
bindsym $mod+Shift+d --release exec "systemctl --user restart dunst; exec notify-send 'Dunst restarted'"
bindsym Print exec --no-startup-id i3-scrot
bindsym $mod+Print --release exec --no-startup-id i3-scrot -w
bindsym $mod+Shift+Print --release exec --no-startup-id i3-scrot -s

View file

@ -56,14 +56,12 @@ interval=5
[temperature]
#label=
label=cpu
markup=none
instance=coretemp-isa-0000
interval=3
separator=false
[temperature]
label=gpu
markup=none
instance=radeon-pci-0300
interval=3
# Memory usage

View file

@ -46,14 +46,14 @@ $cpu_usage eq -1 and die 'Can\'t find CPU information';
my $color = "";
# Print color, if needed
if ($cpu_usage >= 80) {
if ($cpu_usage >= 90) {
$color = "#f2777a";
#exit 33;
} elsif ($cpu_usage >= 60) {
} elsif ($cpu_usage >= 70) {
$color = "#f99157";
} elsif ($cpu_usage >= 40) {
} elsif ($cpu_usage >= 50) {
$color = "#ffcc66";
} elsif ($cpu_usage >= 20) {
} elsif ($cpu_usage >= 10) {
$color = "#99cc99";
} else {
$color = "#66cccc";
@ -61,26 +61,27 @@ if ($cpu_usage >= 80) {
my $pave = " ";
if ($cpu_usage <= 11) {
$pave = " ";
} elsif ($cpu_usage <= 22 ){
$pave = "▁";
} elsif ($cpu_usage <= 33){
$pave = "▂";
} elsif ($cpu_usage <= 44){
$pave = "▃";
} elsif ($cpu_usage <= 56){
$pave = "▄";
} elsif ($cpu_usage <= 67){
$pave = "▅";
} elsif ($cpu_usage <= 78){
$pave = "▆";
} elsif ($cpu_usage <= 89){
$pave = "▇";
} else {
$pave = "█";
}
#if ($cpu_usage <= 11) {
# $pave = " ";
#} elsif ($cpu_usage <= 22 ){
# $pave = "▁";
#} elsif ($cpu_usage <= 33){
# $pave = "▂";
#} elsif ($cpu_usage <= 44){
# $pave = "▃";
#} elsif ($cpu_usage <= 56){
# $pave = "▄";
#} elsif ($cpu_usage <= 67){
# $pave = "▅";
#} elsif ($cpu_usage <= 78){
# $pave = "▆";
#} elsif ($cpu_usage <= 89){
# $pave = "▇";
#} else {
# $pave = "█";
#}
printf "<span foreground=\"$color\" background=\"#515151\">$pave</span>";
#printf "<span foreground=\"$color\">%2.0d%</span> <span foreground=\"$color\" background=\"#515151\">$pave</span>", $cpu_usage;
printf "<span foreground=\"$color\">%2.0d%%</span>", $cpu_usage;
exit 0;

View file

@ -50,4 +50,4 @@ else
color15="#F2777A"
fi
echo "<span foreground=\"$color\">█</span><span foreground=\"$color5\">█</span><span foreground=\"$color15\">█</span>"
echo "<span foreground=\"$color\">$load</span> <span foreground=\"$color5\">$load5</span> <span foreground=\"$color15\">$load15</span>"

View file

@ -77,6 +77,6 @@ if ($temperature >= $t_crit) {
}
#printf "$status %d°C\n%d°C\n$color\n", $temperature, $temperature;
printf "%d°C\n%d°C\n$color\n", $temperature, $temperature;
printf "<span foreground=\"$color\">%d°C</span>", $temperature, $temperature;
exit 0;

View file

@ -7,10 +7,11 @@ then
fi
avail=$(checkupdates | wc -l)
aur=$(yaourt -Qua | grep 'aur/' | wc -l)
if [[ $avail -eq 0 ]]
if [[ $(($avail + $aur)) -eq 0 ]]
then
echo "<span foreground=\"#99CC99\">█</span>"
else
echo "<span foreground=\"#FFCC66\">█</span>"
echo "<span foreground=\"#FFCC66\">█</span>"
fi

@ -1 +0,0 @@
Subproject commit 2c3b4fbbfd939455d94d80836137d5606eb9547d

Binary file not shown.