From bcc3e339061385804b09892ddcaa15b552380475 Mon Sep 17 00:00:00 2001 From: Breizh Date: Tue, 27 Mar 2018 17:38:03 +0200 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .conkyrc | 12 +++++------ .i3/config | 3 ++- .i3blocks.conf | 2 -- .i3blocks/cpu_usage | 49 +++++++++++++++++++++--------------------- .i3blocks/load_average | 2 +- .i3blocks/temperature | 2 +- .i3blocks/updates | 5 +++-- .vim/bundle/vimtex | 1 - 8 files changed, 38 insertions(+), 38 deletions(-) delete mode 160000 .vim/bundle/vimtex diff --git a/.conkyrc b/.conkyrc index f92e4b4..38db051 100644 --- a/.conkyrc +++ b/.conkyrc @@ -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 diff --git a/.i3/config b/.i3/config index b9f5dca..7170f36 100644 --- a/.i3/config +++ b/.i3/config @@ -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 diff --git a/.i3blocks.conf b/.i3blocks.conf index 5d2324f..57a9854 100644 --- a/.i3blocks.conf +++ b/.i3blocks.conf @@ -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 diff --git a/.i3blocks/cpu_usage b/.i3blocks/cpu_usage index 2233975..023256d 100755 --- a/.i3blocks/cpu_usage +++ b/.i3blocks/cpu_usage @@ -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 "$pave"; +#printf "%2.0d% $pave", $cpu_usage; +printf "%2.0d%%", $cpu_usage; exit 0; diff --git a/.i3blocks/load_average b/.i3blocks/load_average index 71d6498..58175a9 100755 --- a/.i3blocks/load_average +++ b/.i3blocks/load_average @@ -50,4 +50,4 @@ else color15="#F2777A" fi -echo "███" +echo "$load $load5 $load15" diff --git a/.i3blocks/temperature b/.i3blocks/temperature index 583a18f..fe7acbf 100755 --- a/.i3blocks/temperature +++ b/.i3blocks/temperature @@ -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 "%d°C", $temperature, $temperature; exit 0; diff --git a/.i3blocks/updates b/.i3blocks/updates index 37ac1e6..d7ce7ee 100755 --- a/.i3blocks/updates +++ b/.i3blocks/updates @@ -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 "█" else - echo "█" + echo "█" fi diff --git a/.vim/bundle/vimtex b/.vim/bundle/vimtex deleted file mode 160000 index 2c3b4fb..0000000 --- a/.vim/bundle/vimtex +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2c3b4fbbfd939455d94d80836137d5606eb9547d