Mises à jour

This commit is contained in:
Breizh 2019-01-21 08:16:41 +01:00
parent cd198fb3cf
commit c97a7cb542
22 changed files with 97 additions and 75 deletions

View File

@ -56,7 +56,8 @@ Xautolock.locker: i3lock-wrapper -e
XTerm*reverseVideo: on
XTerm*selectToClipboard: true
URxvt.font: xft:xos4 Terminus,xft:DejaVu Sans Mono,xft:Noto Sans
URxvt.font: xft:IBM Plex Mono:size=10,DejaVu Sans Mono
!URxvt.font: xft:xos4 Terminus,xft:DejaVu Sans Mono,xft:Noto Sans
!URxvt.font: xft:Fira Mono,xft:DejaVu Sans Mono,xft:Noto Sans
!URxvt.font: xft:Latin Modern Mono:size=12, xft:xos4 Terminus, xft:DejaVu Sans Mono
!URxvt.letterSpace: 1.5

View File

@ -17,7 +17,7 @@ export HASTE_SERVER="https://haste.breizh.me"
eval $(ssh-agent -s)
#~/.local/bin/vconsole
~/.local/bin/vconsole
if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then
export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
@ -30,5 +30,6 @@ if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then
else
play -q "$HOME/Musique/WELCOME BACK.wav" &
export BROWSER=elinks
exec fish
fish
logout
fi

14
.bashrc
View File

@ -92,13 +92,13 @@ On_White='\e[47m' # White
# On_IWhite='\e[0;107m' # White
# Less colors
export LESS_TERMCAP_mb=$'\E[01;31m'
export LESS_TERMCAP_md=$'\E[01;31m'
export LESS_TERMCAP_me=$'\E[0m'
export LESS_TERMCAP_so=$'\E[01;44;33m'
export LESS_TERMCAP_se=$'\E[0m'
export LESS_TERMCAP_us=$'\E[01;32m'
export LESS_TERMCAP_ue=$'\E[0m'
#export LESS_TERMCAP_mb=$'\E[01;31m'
#export LESS_TERMCAP_md=$'\E[01;31m'
#export LESS_TERMCAP_me=$'\E[0m'
#export LESS_TERMCAP_so=$'\E[01;44;33m'
#export LESS_TERMCAP_se=$'\E[0m'
#export LESS_TERMCAP_us=$'\E[01;32m'
#export LESS_TERMCAP_ue=$'\E[0m'
export LESS="-RI"
use_color=true

View File

@ -86,7 +86,8 @@
### Text ###
# font = xos4 Terminus 10
font = Linux Libertine 10
# font = Linux Libertine 10
font = IBM Plex Sans 10
# The spacing between lines. If the height is smaller than the
# font height, it will get raised to the font height.

View File

@ -2,8 +2,8 @@
LocationMode=path-bar
ShowHidden=false
ShowSizeColumn=true
GeometryX=516
GeometryY=246
GeometryX=1668
GeometryY=542
GeometryWidth=887
GeometryHeight=585
SortColumn=name

View File

@ -2,7 +2,7 @@
gtk-application-prefer-dark-theme=false
gtk-theme-name=Vertex-Dark
gtk-icon-theme-name=Vertex-Icons
gtk-font-name=Linux Biolinum 10
gtk-font-name=IBM Plex Sans 10
gtk-button-images=1
gtk-menu-images=1
gtk-enable-event-sounds=1

View File

@ -1,8 +1,8 @@
[Settings]
gtk-application-prefer-dark-theme=false
gtk-theme-name=Adapta-Nokto
gtk-theme-name=Vertex-Dark
gtk-icon-theme-name=Vertex-Icons
gtk-font-name=Linux Biolinum 10
gtk-font-name=IBM Plex Sans 11
gtk-button-images=1
gtk-menu-images=1
gtk-enable-event-sounds=1

View File

@ -50,8 +50,9 @@ bindsym $mod+n border normal 1
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below.
font xft:xos4 Terminus
# font xft:xos4 Terminus
# font xft:Linux Biolinum 11
font xft:IBM Plex Sans 10
# Use Mouse+$mod to drag floating windows
floating_modifier $mod
@ -59,7 +60,7 @@ floating_modifier $mod
# start a i3-sensible-terminal
bindsym $mod+Return exec i3-sensible-terminal -sl 65535 -e fish
bindsym $mod+Ctrl+Return exec i3-sensible-terminal -sl 65535
bindsym $mod+Shift+Return exec i3-sensible-terminal -sl 65535 -fn -xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso10646-1 -e fish
#bindsym $mod+Shift+Return exec i3-sensible-terminal -sl 65535 -fn -xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso10646-1 -e fish
# kill focused window
@ -389,7 +390,7 @@ bar {
bindsym button4 nop
bindsym button5 nop
# font -xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
# font xft:Latin Modern Mono
font xft:IBM Plex Mono 10
strip_workspace_numbers yes
colors {

View File

@ -12,3 +12,4 @@ alang=fr,fre,fra
slang=fr,fre,fra
cache=262144
demuxer-readahead-secs=20
ytdl-format="((bestvideo[container=webm][height=1080]/bestvideo[ext=webm][height=1080]/bestvideo[height=1080]/bestvideo[height>=?720]/bestvideo)+(bestaudio[container=webm]/bestaudio[ext=webm]/bestaudio))/best"

View File

@ -5,4 +5,4 @@
#--hls-prefer-ffmpeg
#--external-downloader axel
#--external-downloader-args "-x 4 -c"
-f "((bestvideo[container=webm][height=1080]/bestvideo[ext=webm][height=1080]/bestvideo[height=1080]/bestvideo[height>=?720]/bestvideo)+(bestaudio[container=webm]/bestaudio[ext=webm]/bestaudio))/best"
-f "((bestvideo[container=webm][height=1080][fps<=30]/bestvideo[ext=webm][height=1080][fps<=30]/bestvideo[height=1080][fps<=30]/bestvideo[container=webm][height>=?720]/bestvideo[ext=webm][height>=?720]/bestvideop[height>=?720]/bestvideo)+(bestaudio[container=webm]/bestaudio[ext=webm]/bestaudio))/best"

View File

@ -31,8 +31,8 @@ conky.config = {
template0 = [[${cpubar cpu\1 6,107}${goto 127}${top name \1}$alignr${top cpu \1}%]],
template1 = [[${top_mem name \1}$alignr${top_mem mem_res \1}\ \ \ ${top_mem mem \1}%]],
template2 = [[$color${goto 127}${top name \1}$alignr${top cpu \1}%${goto 115}$alignr${offset -150}${if_match ${freq \2}<1000}${freq \2} MHz$else${freq_G \2} GHz$endif]],
template3 = [[\1$alignr${fs_free \1} ${if_match ${fs_used_perc \1}>=90}${color CC99CC}$else${if_match ${fs_used_perc \1}>=80}${color 6699CC}$else${color 66CCCC}$endif$endif${fs_bar 6,125 \1}$color]],
template4 = [[\2$alignr${fs_free \1} ${if_match ${fs_used_perc \1}>=90}${color CC99CC}$else${if_match ${fs_used_perc \1}>=80}${color 6699CC}$else${color 66CCCC}$endif$endif${fs_bar 6,125 \1}$color]]
template3 = [[\1$alignr${fs_free \1} ${if_match ${fs_used_perc \1}>=90}${color F2777A}$else${if_match ${fs_used_perc \1}>=80}${color FFCC66}$else${color 99CC99}$endif$endif${fs_bar 6,125 \1}$color]],
template4 = [[\2$alignr${fs_free \1} ${if_match ${fs_used_perc \1}>=90}${color F2777A}$else${if_match ${fs_used_perc \1}>=80}${color FFCC66}$else${color 99CC99}$endif$endif${fs_bar 6,125 \1}$color]]
};
conky.text = [[
@ -40,8 +40,8 @@ conky.text = [[
${color 6699CC}$alignc${font xos4 Terminus:pixelsize=18}${time %A %d %B %Y}$font$color
${color2}${font xos4 Terminus:pixelsize=14}Processeur${color}${font}
#${alignr}${font}${if_match ${exec sensors -u | grep "temp1_input" | cut -d" " -f4 | cut -d. -f1 | head -n 1}>=60}${color CC99CC}$endif${exec sensors -u | grep "temp1_input" | cut -d" " -f4 | cut -d. -f1 | head -n 1}°C${color}
${cpugraph 66CCCC CC99CC -t}${color2}${voffset 10}${goto 100}$alignc$cpu%$color
#${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}
${cpugraph 99CC99 F2777A -t}${color2}${voffset 10}${goto 100}$alignc$cpu%$color
${voffset -10}${template0 1}
${template0 2}
${template0 3}
@ -53,7 +53,7 @@ ${template2 8 4}
${color2}${font xos4 Terminus:pixelsize=14}RAM${font}${alignr}$mem / $memeasyfree${color}
${memmax}${alignr}$cached / $memfree${color}
${memgraph 66CCCC CC99CC -t}${color2}${voffset 10}${goto 95}$alignc$memperc%$color
${memgraph 99CC99 F2777A -t}${color2}${voffset 10}${goto 95}$alignc$memperc%$color
${voffset -10}${template1 1}
${template1 2}
${template1 3}
@ -64,28 +64,28 @@ ${template1 7}
${template1 8}
${color2}${font xos4 Terminus:pixelsize=14}Swap${font}${alignr}$swap / $swapfree / $swapmax${color}
$swapperc% ${if_match $swapperc>80}${color CC99CC}$else${if_match $swapperc>40}${color 6699CC}$else${color 66CCCC}$endif$endif${swapbar}$color${if_up wlp1s0}
$swapperc% ${if_match $swapperc>80}${color F2777A}$else${if_match $swapperc>40}${color FFCC66}$else${color 99CC99}$endif$endif${swapbar}$color${if_up wlp1s0}
${color2}${font xos4 Terminus:pixelsize=14}Wi-Fi${font}${alignr}${addr wlp1s0}${color}
${wireless_essid wlp1s0} ${wireless_link_qual_perc wlp1s0}%$alignr${wireless_freq wlp1s0}
Canal ${wireless_channel wlp1s0}$alignr${wireless_bitrate wlp1s0}
Descendant ${totaldown wlp1s0}${alignr}${totalup wlp1s0} Montant
${downspeed wlp1s0}${alignr}${upspeed wlp1s0}
${downspeedgraph wlp1s0 25,128 6699CC 66CCCC}$alignr${upspeedgraph wlp1s0 25,128 6699CC 66CCCC}${voffset -10}${endif}${if_up enp0s31f6}
${downspeedgraph wlp1s0 25,128 FFCC66 99CC99}$alignr${upspeedgraph wlp1s0 25,128 FFCC66 99CC99}${voffset -10}${endif}${if_up enp0s31f6}
${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 6699CC 66CCCC}$alignr${upspeedgraph enp0s31f6 25,128 6699CC 66CCCC}${voffset -10}${endif}${if_up tun0}
${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}VPN${font}${alignr}${addr tun0}${color}
Descendant ${totaldown tun0}${alignr}${totalup tun0} Montant
${downspeed tun0}${alignr}${upspeed tun0}
${downspeedgraph tun0 25,128 6699CC 66CCCC}$alignr${upspeedgraph tun0 25,128 6699CC 66CCCC}${voffset -10}${endif}
${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 CC99CC}$endif${hddtemp}°C${color}
${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
${diskiograph_read sda 25,128 6699CC 66CCCC}$alignr${diskiograph_write sda 25,128 6699CC 66CCCC}
${diskiograph_read sda 25,128 FFCC66 99CC99}$alignr${diskiograph_write sda 25,128 FFCC66 99CC99}
${voffset -10}
${template3 /}
${template3 /home}
@ -94,15 +94,15 @@ ${execpi 15 ~/.local/bin/conky_mount}
${voffset -5}
${color2}${font xos4 Terminus:pixelsize=14}Système${font}${alignr}${execi 900 lsb_release -ds | tr -d '"'}${color}
Noyau$alignr${no_update $kernel}
Charge moyenne$alignr${if_match ${exec uptime | cut -d',' -f3 | cut -d' ' -f5}>=4}${color CC99CC}$endif$loadavg$color
Charge moyenne$alignr${if_match ${exec uptime | cut -d',' -f3 | cut -d' ' -f5}>=4}${color F2777A}$endif$loadavg$color
Uptime$alignr$uptime
Ventilateur$alignr${if_match $ibm_fan>=3000}${color CC99CC}$endif$ibm_fan RPM$color
Ventilateur$alignr${if_match $ibm_fan>=3000}${color F2777A}$endif$ibm_fan RPM$color
Entropie$alignr$entropy_avail - $entropy_perc%
IP publique$alignr${scroll wait 24 1 4 ${execi 300 curl --connect-timeout 5 ifconfig.co}}
#breizh.me$alignr${execi 300 host breizh.me | grep 'has address' | cut -d' ' -f4}
${if_match $battery_percent<10}${color CC99CC}${blink Batterie $battery}${else}Batterie $battery$endif
${if_match $battery_percent<20}${color CC99CC}$else${if_match $battery_percent<60}${color 6699CC}$else${color 66CCCC}$endif$endif$battery_bar$color
${if_match $battery_percent<10}${color F2777A}${blink Batterie $battery}${else}Batterie $battery$endif
${if_match $battery_percent<20}${color F2777A}$else${if_match $battery_percent<60}${color FFCC66}$else${color 99CC99}$endif$endif$battery_bar$color
Rétro-éclairage ${exec echo $((( $(cat /sys/class/backlight/intel_backlight/actual_brightness) * 100 / $(cat /sys/class/backlight/intel_backlight/max_brightness) )))}%$alignr${exec redshift -p | head -n 3 | tail -n 1 | cut -d':' -f2}
${execbar echo $((( $(cat /sys/class/backlight/intel_backlight/actual_brightness) * 100 / $(cat /sys/class/backlight/intel_backlight/max_brightness) )))}
@ -124,7 +124,7 @@ ${execbar echo $((( $(cat /sys/class/backlight/intel_backlight/actual_brightness
${execpi 30 cat ~/notes}
#foncé 386587
#clair 6699CC
#clair FFCC66
# own_window_argb_visual = true,
# own_window_argb_value = 150,
]]

View File

@ -162,7 +162,7 @@ interval=600
#[battery]
#label=bat
interval=10
#min_width="bat █████"
#min_width="bat █████"
# Generic media player support
#

View File

@ -72,6 +72,8 @@ while getopts 1:2:3:4:5:6:7:8:c:f:a:h opt; do
esac
done
squares=""
end=$(($battery_count - 1))
for i in $(seq 0 $end);
do
@ -96,31 +98,38 @@ do
if [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 7 ]]
then
squares+="▉"
#squares+="▉"
squares+="▇"
shortsquares+="▇"
elif [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 6 ]]
then
squares+="▊"
#squares+="▊"
squares+="▆"
shortsquares+="▆"
elif [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 5 ]]
then
squares+="▋"
#squares+="▋"
squares+="▅"
shortsquares+="▅"
elif [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 4 ]]
then
squares+="▌"
#squares+="▌"
squares+="▄"
shortsquares+="▄"
elif [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 3 ]]
then
squares+="▍"
#squares+="▍"
squares+="▃"
shortsquares+="▃"
elif [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 2 ]]
then
squares+="▎"
#squares+="▎"
squares+="▂"
shortsquares+="▂"
elif [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 1 ]]
then
squares+="▏"
#squares+="▏"
squares+="▁"
shortsquares+="▁"
fi
@ -166,7 +175,7 @@ do
_blanks=$(( 6 - ${#squares} ))
for t in $(seq 1 $_blanks)
do
squares+=" "
squares+="</span><span foreground=\"#515151\" background=\"#515151\">█"
done
# Print Battery number if there is more than one
if (( $end > 0 )) ; then

View File

@ -78,7 +78,7 @@ my $pave = " ";
#} elsif ($cpu_usage <= 89){
# $pave = "▇";
#} else {
# $pave = "";
# $pave = "";
#}
#printf "<span foreground=\"$color\">%2.0d%</span> <span foreground=\"$color\" background=\"#515151\">$pave</span>", $cpu_usage;

View File

@ -28,4 +28,4 @@ else
fi
fi
echo "<span foreground=\"$color\"></span>"
echo "<span foreground=\"$color\"></span>"

View File

@ -63,8 +63,8 @@ my $indi = "N";
# Output
if (($indicators{$indicator} || 0) & $mask) {
printf "<span foreground=\"%s\"></span>", $color_on;
printf "<span foreground=\"%s\"></span>", $color_on;
} else {
printf "<span foreground=\"%s\"></span>", $color_off;
printf "<span foreground=\"%s\"></span>", $color_off;
}
exit 0

View File

@ -20,30 +20,30 @@ load15="$(cut -d ' ' -f3 /proc/loadavg)"
cpus="$(nproc)"
# color if load is too high
if [[ "$(echo "$load < 0.75 * $cpus" | bc)" = "1" ]]
if [[ "$(echo "$load < 1 * $cpus" | bc)" = "1" ]]
then
color="#99CC99"
elif [[ "$(echo "$load < $cpus" | bc)" = "1" ]]
elif [[ "$(echo "$load < 1.25 * $cpus" | bc)" = "1" ]]
then
color="#FFCC66"
else
color="#F2777A"
fi
if [[ "$(echo "$load5 < 0.75 * $cpus" | bc)" = "1" ]]
if [[ "$(echo "$load5 < 1 * $cpus" | bc)" = "1" ]]
then
color5="#99CC99"
elif [[ "$(echo "$load5 < $cpus" | bc)" = "1" ]]
elif [[ "$(echo "$load5 < 1.25 * $cpus" | bc)" = "1" ]]
then
color5="#FFCC66"
else
color5="#F2777A"
fi
if [[ "$(echo "$load15 < 0.75 * $cpus" | bc)" = "1" ]]
if [[ "$(echo "$load15 < 1 * $cpus" | bc)" = "1" ]]
then
color15="#99CC99"
elif [[ "$(echo "$load15 < $cpus" | bc)" = "1" ]]
elif [[ "$(echo "$load15 < 1.25 $cpus" | bc)" = "1" ]]
then
color15="#FFCC66"
else

View File

@ -17,11 +17,11 @@ case $BLOCK_BUTTON in
5) mocp -j $(($(mocp -Q "%cs") + 5))s ;;
esac
status="<span foreground=\"#6699CC\">?</span>"
status="<span foreground=\"#6699CC\"> ?</span>"
case $origstatus in
STOP ) status="<span foreground=\"#F2777A\"></span>" ;;
PAUSE ) status="<span foreground=\"#FFCC66\"></span>" ;;
PLAY ) status="<span foreground=\"#99CC99\"></span>" ;;
STOP ) status="<span foreground=\"#F2777A\"></span>" ;;
PAUSE ) status="<span foreground=\"#FFCC66\"></span>" ;;
PLAY ) status="<span foreground=\"#99CC99\"></span>" ;;
esac
if [[ "$origstatus" != "STOP" ]]

View File

@ -2,7 +2,7 @@
if [[ -f /dev/shm/claws_offline ]]
then
echo "<span foreground=\"#F2777A\"></span>"
echo "<span foreground=\"#F2777A\"></span>"
exit
fi
@ -17,9 +17,9 @@ total=$((${#avail[@]} + ${#aur[@]}))
if [[ $total -eq 0 ]]
then
echo "<span foreground=\"#99CC99\"></span>"
echo "<span foreground=\"#99CC99\"></span>"
else
echo "<span foreground=\"#FFCC66\"></span>"
echo "<span foreground=\"#FFCC66\"></span>"
if [[ $(cat /dev/shm/updates) -ne $total ]] || [[ -n "$BLOCK_BUTTON" ]]
then
[[ $total -eq 1 ]] && notify-send "1 mise à jour disponible" "$(for item in ${avail[@]} ${aur[@]}; do echo $item; done)"

View File

@ -2,7 +2,7 @@
if nmcli dev | grep tun0 | cut -f3 | grep " connecté" &>/dev/null
then
echo "<span foreground=\"#99CC99\"></span>"
echo "<span foreground=\"#99CC99\"></span>"
else
echo "<span foreground=\"#515151\"></span>"
echo "<span foreground=\"#515151\"></span>"
fi

View File

@ -1,14 +1,20 @@
#!/bin/bash
youtube-dl -F "$1"
printf "Choose the audio format: "
read afmt
printf "Choose the video format: "
read vfmt
actualpwd="$PWD"
audio=$(youtube-dl -f "${afmt}" -g "$1")
video=$(youtube-dl -f "${vfmt}" -g "$1")
title=$(youtube-dl -e "$1")
temp=$(mktemp -d)
ffmpeg -i "${audio}" -i "${video}" -f matroska -c:a copy -c:v copy "$title.mkv"
exit 0
cd "$temp"
for file in "${actualpwd}/"*
do
ln -s "$file" ./
done
youtube-dl "$@" --exec "mv -n {} \"${actualpwd}/\""
status="$?"
rm -rf "$temp"
exit $status

View File

@ -1,6 +1,8 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =4
let g:netrw_dirhist_cnt =6
let g:netrw_dirhist_1='/home/breizh/.config/cava'
let g:netrw_dirhist_2='/home/breizh/.vim/bundle/base16-vim/colors'
let g:netrw_dirhist_3='/sys/class/net'
let g:netrw_dirhist_4='/home/breizh/Documents/Serveur/dovecot/conf.d'
let g:netrw_dirhist_5='/home/breizh/.cache/dmenu-recent'
let g:netrw_dirhist_6='/home/breizh/aur'