Diverses màj

.Xresources

@@ -43,9 +43,10 @@
 Xft.antialias: true
 Xft.hinting: true
 Xft.rgba: rgb
-Xft.autohint: true
+Xft.autohint: false
-Xft.hintstyle: hintfull
+Xft.hintstyle: hintmedium
-Xft.lcdfilter: lcddefault
+Xft.lcdfilter: lcdlegacy
+Xft.dpi: 93.54
 Xcursor.theme: Adwaita
 Xcursor.size:  0
 
@@ -56,10 +57,8 @@ Xautolock.locker: i3lock-wrapper -e
 XTerm*reverseVideo: on
 XTerm*selectToClipboard: true
 
-URxvt.font: xft:IBM Plex Mono:size=10,xft:DejaVu Sans Mono:size=10
+!URxvt.font: xft:IBM Plex Mono:size=10,xft:DejaVu Sans Mono:size=10
-!URxvt.font: xft:xos4 Terminus,xft:DejaVu Sans Mono,xft:Noto Sans
+URxvt.font: xft:xos4 Terminus:pixsize=16,xft:DejaVu Sans Mono:pixsize=16
-!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
 URxvt.depth: 32
 !URxvt.background: [100]#000000
@@ -186,7 +185,7 @@ URxvt*iso14755_52:                    false
 ! URxvt*background.border:              boolean
 ! URxvt*background.expr:                string
 ! URxvt*background.interval:            seconds
-URxvt*bell-command:			play /usr/share/sounds/freedesktop/stereo/bell.oga
+! URxvt*bell-command:			play /usr/share/sounds/freedesktop/stereo/bell.oga
 ! URxvt*kuake.hotkey:                   string
 ! URxvt*matcher.button:                 string
 ! URxvt*matcher.launcher:               string

.bash_profile

@@ -11,13 +11,12 @@ export EDITOR=vim
 export PAGER=less
 export PATH=~/.gem/ruby/2.5.0/bin:~/.local/bin:$PATH
 
-export LANG=fr_FR.UTF-8
+#export LANG=fr_CA.UTF-8
-export LANGUAGE=fr_FR:fr:en
+#export LANGUAGE=fr_CA:fr_FR:fr:en
 export HASTE_SERVER="https://haste.breizh.me"
 
 eval $(ssh-agent -s)
 
-~/.local/bin/vconsole
 
 if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then
 	export GTK2_RC_FILES="$HOME/.gtkrc-2.0"
@@ -27,7 +26,8 @@ if [ -z "$DISPLAY" ] && [ -n "$XDG_VTNR" ] && [ "$XDG_VTNR" -eq 1 ]; then
 	export DMENU_OPTIONS="-nb #2d2d2d -nf #747369 -sb #6699cc -sf #2d2d2d"
 	startx
 	logout
-else
+elif [ "$XDG_VTNR" -ne 6 ]; then
+	~/.local/bin/vconsole
 	play -q "$HOME/Musique/WELCOME BACK.wav" & 
 	export BROWSER=elinks
 	fish

.config/conky/conkyrc1

@@ -60,11 +60,11 @@ ${template1 2}
 ${template1 3}
 ${template1 4}
 ${template1 5}
-${template1 6}
+#${template1 6}
-${template1 7}
+#${template1 7}
-${template1 8}
+#${template1 8}
-${template1 9}
+#${template1 9}
-${template1 10}
+#${template1 10}
 
 ${color2}${font2}Disque E/S $hr${font}${color}
 ${voffset 2}Lecture ${diskio_read sda}${goto 140}Écriture ${diskio_write sda}
@@ -75,6 +75,10 @@ ${template2 3}
 ${template2 4}
 ${template2 5}
 
+${color2}${font2}Carte graphique $hr${font}${color}
+${voffset 2}GPU : ${exec conky_radeon}${goto 140}${execbar conky_radeon}
+VRAM: ${exec conky_radeon vram mb}${goto 140}${execbar conky_radeon vram}
+
 ${color2}${font2}Espace disque $hr${font}${color}
 ${voffset 2}${template3 / /}
 
@@ -82,5 +86,5 @@ ${template3 /home /home}
 
 ${template3 /tmp /tmp}
 
-${execpi 5 /home/breizh/.config/conky/conky_mount}${color2}${font2}$hr${font}${color}
+${execpi 5 /home/breizh/.config/conky/conky_mount}#${color2}${font2}$hr${font}${color}
 ]]

.config/conky/conkyrc2

@@ -50,11 +50,11 @@ ${template0 2}
 ${template0 3}
 ${template0 4}
 ${template0 5}
-${template0 6}
+#${template0 6}
-${template0 7}
+#${template0 7}
-${template0 8}
+#${template0 8}
-${template0 9}
+#${template0 9}
-${template0 10}
+#${template0 10}
 
 ${color2}${font2}Réseau $hr$font$color
 ${voffset 2}Téléchargement ${downspeed enp6s0}${goto 140}Téléversement ${upspeed enp6s0}
@@ -63,9 +63,19 @@ Téléchargé ${totaldown enp6s0}${goto 140}Téléversé ${totalup enp6s0}
 
 $alignc${addrs enp6s0}
 $alignc${scroll left 39 2 1 ${v6addrs enp6s0 -n -s}}
-$alignc${curl ifconfig.co/ip}
+$alignc${curl ifconfig.co/ip}${if_up tun0}
+${color2}${font2}VPN $hr$font$color
+${voffset 2}Téléchargement ${downspeed tun0}${goto 140}Téléversement ${upspeed tun0}
+${downspeedgraph tun0 25,125}${alignr}${upspeedgraph tun0 25,125}
+Téléchargé ${totaldown tun0}${goto 140}Téléversé ${totalup tun0}
+
+$alignc${addrs tun0}
+$alignc${scroll left 39 2 1 ${v6addrs tun0 -n -s}}
+${endif}
 ${color2}${font2}Températures $hr$font$color${voffset 2}
 Disque dur${goto 140}${if_match ${hddtemp /dev/sda}>50}${color F2777A}$endif${hddtemp /dev/sda}°C$color
+CPU${goto 140}${if_match ${execi 5 sensors -j | jq '."k10temp-pci-00c3"."Tdie"."temp1_input"'}>70}${color F2777A}$endif${execi 5 sensors -j | jq '."k10temp-pci-00c3"."Tdie"."temp1_input"' | cut -d. -f1}°C${color}
+GPU${goto 140}${if_match ${execi 5 sensors -j | jq '."amdgpu-pci-0900"."temp1"."temp1_input"'}>70}${color F2777A}$endif${execi 5 sensors -j | jq '."amdgpu-pci-0900"."temp1"."temp1_input"' | cut -d. -f1}°C${color}
 
 ${color2}${font2}Système $hr$font$color${voffset 2}
 Kernel${goto 140}$kernel
@@ -74,5 +84,5 @@ Uptime${goto 140}$uptime
 ${color2}${font2}Notes $hr$font$color${voffset 2}
 ${catp /home/breizh/notes}
 
-${color2}${font2}$hr${font}${color}
+#${color2}${font2}$hr${font}${color}
 ]]

.config/dunst/dunstrc

@@ -80,13 +80,12 @@
     # Don't remove messages, if the user is idle (no mouse or keyboard input)
     # for longer than idle_threshold seconds.
     # Set to 0 to disable.
-    # Transient notifications ignore this setting.
+    # A client can set the 'transient' hint to bypass this. See the rules
+    # section for how to disable this if necessary
     idle_threshold = 120
 
     ### Text ###
 
-    # font = xos4 Terminus 10
-    # font = Linux Libertine 10
     font = IBM Plex Sans 10
 
     # The spacing between lines.  If the height is smaller than the
@@ -142,17 +141,17 @@
     # geometry.
     word_wrap = yes
 
-    # When word_wrap is set to no, specify where to ellipsize long lines.
+    # When word_wrap is set to no, specify where to make an ellipsis in long lines.
     # Possible values are "start", "middle" and "end".
     ellipsize = end
 
     # Ignore newlines '\n' in notifications.
     ignore_newline = no
 
-    # Merge multiple notifications with the same content
+    # Stack together notifications with the same content
     stack_duplicates = true
 
-    # Hide the count of merged notifications with the same content
+    # Hide the count of stacked notifications with the same content
     hide_duplicate_count = false
 
     # Display indicators for URLs (U) and actions (A).
@@ -164,7 +163,7 @@
     icon_position = left
 
     # Scale larger icons down to this size, set to 0 to disable
-    max_icon_size = 48
+    max_icon_size = 32
 
     # Paths to default icons.
     icon_path = /usr/share/icons/Vertex-Icons/status/16:/usr/share/icons/Vertex-Icons/devices/16
@@ -200,6 +199,22 @@
     # automatically after a crash.
     startup_notification = false
 
+    # Manage dunst's desire for talking
+    # Can be one of the following values:
+    #  crit: Critical features. Dunst aborts
+    #  warn: Only non-fatal warnings
+    #  mesg: Important Messages
+    #  info: all unimportant stuff
+    # debug: all less than unimportant stuff
+    verbosity = mesg
+
+    # Define the corner radius of the notification window
+    # in pixel size. If the radius is 0, you have no rounded
+    # corners.
+    # The radius will be automatically lowered if it exceeds half of the
+    # notification height to avoid clipping text and/or icons.
+    corner_radius = 0
+
     ### Legacy
 
     # Use the Xinerama extension instead of RandR for multi-monitor support.
@@ -212,6 +227,19 @@
     # layout changes.
     force_xinerama = false
 
+    ### mouse
+
+    # Defines action of mouse event
+    # Possible values are:
+    # * none: Don't do anything.
+    # * do_action: If the notification has exactly one action, or one is marked as default,
+    #              invoke it. If there are multiple and no default, open the context menu.
+    # * close_current: Close current notification.
+    # * close_all: Close all notifications.
+    mouse_left_click = close_current
+    mouse_middle_click = do_action
+    mouse_right_click = close_all
+
 # Experimental features that may or may not work correctly. Do not expect them
 # to have a consistent behaviour across releases.
 [experimental]
@@ -272,11 +300,36 @@
 
 # Every section that isn't one of the above is interpreted as a rules to
 # override settings for certain messages.
-# Messages can be matched by "appname", "summary", "body", "icon", "category",
+#
-# "msg_urgency" and you can override the "timeout", "urgency", "foreground",
+# Messages can be matched by
-# "background", "new_icon" and "format".
+#    appname (discouraged, see desktop_entry)
+#    body
+#    category
+#    desktop_entry
+#    icon
+#    match_transient
+#    msg_urgency
+#    stack_tag
+#    summary
+#
+# and you can override the
+#    background
+#    foreground
+#    format
+#    frame_color
+#    fullscreen
+#    new_icon
+#    set_stack_tag
+#    set_transient
+#    timeout
+#    urgency
+#
 # Shell-like globbing will get expanded.
 #
+# Instead of the appname filter, it's recommended to use the desktop_entry filter.
+# GLib based applications export their desktop-entry name. In comparison to the appname,
+# the desktop-entry won't get localized.
+#
 # SCRIPTING
 # You can specify a script that gets run when the rule matches by
 # setting the "script" option.
@@ -289,6 +342,30 @@
 # NOTE: It might be helpful to run dunst -print in a terminal in order
 # to find fitting options for rules.
 
+# Disable the transient hint so that idle_threshold cannot be bypassed from the
+# client
+#[transient_disable]
+#    match_transient = yes
+#    set_transient = no
+#
+# Make the handling of transient notifications more strict by making them not
+# be placed in history.
+#[transient_history_ignore]
+#    match_transient = yes
+#    history_ignore = yes
+
+# fullscreen values
+# show: show the notifications, regardless if there is a fullscreen window opened
+# delay: displays the new notification, if there is no fullscreen window active
+#        If the notification is already drawn, it won't get undrawn.
+# pushback: same as delay, but when switching into fullscreen, the notification will get
+#           withdrawn from screen again and will get delayed like a new notification
+#[fullscreen_delay_everything]
+#    fullscreen = delay
+#[fullscreen_show_critical]
+#    msg_urgency = critical
+#    fullscreen = show
+
 #[espeak]
 #    summary = "*"
 #    script = dunst_espeak.sh
@@ -307,6 +384,11 @@
 #    summary = "foobar"
 #    history_ignore = yes
 
+#[skip-display]
+#    # This notification will not be displayed, but will be included in the history
+#    summary = "foobar"
+#    skip_display = yes
+
 #[signed_on]
 #    appname = Pidgin
 #    summary = "*signed on*"
@@ -327,4 +409,8 @@
 #    summary = *twitter.com*
 #    urgency = normal
 #
+#[stack-volumes]
+#    appname = "some_volume_notifiers"
+#    set_stack_tag = "volume"
+#
 # vim: ft=cfg

.config/fish/functions/l.fish

@@ -1,3 +1,3 @@
 function l --description 'alias l=ls -lAh'
-    exa -lahb $argv
+    exa -lgHahb@ --git --time-style long-iso $argv
 end

.config/gtk-2.0/gtkfilechooser.ini

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

.config/gtk-3.0/bookmarks

@@ -3,3 +3,4 @@ file:///home/breizh/Images Images
 file:///home/breizh/Musique Musique
 file:///home/breizh/Vid%C3%A9os Vidéos
 file:///home/breizh/T%C3%A9l%C3%A9chargements Téléchargements
+file:///tmp tmp

.config/htop/htoprc

@@ -1,7 +1,7 @@
 # Beware! This file is rewritten by htop when settings are changed in the interface.
 # The parser is also very primitive, and not human-friendly.
 fields=0 17 18 48 49 38 39 113 111 46 47 2 1
-sort_key=113
+sort_key=47
 sort_direction=1
 hide_threads=0
 hide_kernel_threads=1

.config/i3/config

@@ -50,9 +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 16px
 # font xft:Linux Biolinum 11
-font xft:IBM Plex Sans, DejaVu Sans 10
+# font xft:IBM Plex Sans, DejaVu Sans 10
 
 # Use Mouse+$mod to drag floating windows
 floating_modifier $mod
@@ -98,7 +98,7 @@ bindsym XF86MonBrightnessUp exec --no-startup-id echo $((( $(cat /sys/class/back
 bindsym XF86MonBrightnessDown exec --no-startup-id echo $((( $(cat /sys/class/backlight/intel_backlight/actual_brightness) - 10 ))) > /sys/class/backlight/intel_backlight/brightness || echo 0 > /sys/class/backlight/intel_backlight/brightness
 #bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 5%
 #bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5%
-bindsym XF86HomePage exec --no-startup-id pkill -x -USR1 redshift
+bindsym $mod+Home exec --no-startup-id pkill -x -USR1 redshift
 
 # Volume controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id BLOCK_BUTTON=4 ${HOME}/.i3blocks/volume && pkill -RTMIN+10 i3blocks
@@ -353,8 +353,9 @@ exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 #exec --no-startup-id xfce4-power-manager
 # exec --no-startup-id clipit
 # exec_always --no-startup-id sbxkb
-exec --no-startup-id conky
+exec --no-startup-id conky --config "$HOME/.config/conky/conkyrc1"
-# exec --no-startup-id start_conky_green
+exec --no-startup-id conky --config "$HOME/.config/conky/conkyrc2"
+exec --no-startup-id conky --config "$HOME/.config/conky/conkyrc3"
 exec --no-startup-id xscreensaver -no-splash
 exec_always --no-startup-id setcursor
 exec claws-mail --online
@@ -365,17 +366,20 @@ exec --no-startup-id sleep 5 && i3-msg '[title="newsboat"] move scratchpad'
 exec --no-startup-id variety
 #exec --no-startup-id while true; do feh --bg-center $HOME/Images/wallpapers/396396-blackangel.jpg; sleep 5m; feh --bg-max $HOME/Images/wallpapers/other-clock-tower-time-brick-gears-steampunk-high-quality-picture.jpg; sleep 5m; done
 exec --no-startup-id xinput --disable "AlpsPS/2 ALPS DualPoint TouchPad"
-exec --no-startup-id redshift
+exec --no-startup-id redshift-gtk
+exec --no-startup-id sudo radeontop -d /dev/shm/radeontop
 #exec --no-startup-id ${HOME}/.screenlayout/home.sh
 #exec --no-startup-id sleep 5 && mocp -S
 #exec --no-startup-id mpv ~/Vidéos/wallpapers/pirate_flag.mp4 --wid 0 --loop-file -quiet
 #exec --no-startup-id setxkbmap fr oss
 exec --no-startup-id nm-applet
-exec --no-startup-id env DRI_PRIME=1 steam-native -silent
+exec --no-startup-id steam -silent
-exec --no-startup-id sleep 5 && qbittorrent 
+#exec --no-startup-id sleep 5 && qbittorrent 
 #exec --no-startup-id gdfs $HOME/.google_drive $HOME/Google_Drive/
 #exec --no-startup-id transmission-gtk -m
 exec --no-startup-id play -q "$HOME/Musique/WELCOME BACK.wav"
+exec --no-startup-id syncthing-gtk
+exec --no-startup-id check-kimsufi
 
 # Start i3bar to display a workspace bar (plus the system information i3status if available)
 bar {
@@ -390,7 +394,7 @@ bar {
 	bindsym button4 nop
 	bindsym button5 nop
 	# font -xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
-	font xft:IBM Plex Mono, DejaVu Sans Mono 10
+	# font xft:IBM Plex Mono, DejaVu Sans Mono 10
 	strip_workspace_numbers yes
 
 	colors {

.config/mpv/mpv.conf

@@ -5,11 +5,11 @@ sub-back-color=0.0/0.0/0.0/0.5
 sub-use-margins
 hwdec=auto-copy
 hwdec-codecs=all
-#hwdec=no
+hr-seek-framedrop=yes
-hr-seek-framedrop=no
+audio-channels=stereo
-#no-resume-playback
 alang=fr,fre,fra
 slang=fr,fre,fra
 cache=262144
+sub-file-paths=~/Sous-titres/
 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"

.config/youtube-dl/config

@@ -1,8 +1,8 @@
--o %(title)s.%(ext)s
+-o %(upload_date)s_%(title)s.%(ext)s
 --sub-lang fr,en
 --embed-subs
 --write-sub
 #--hls-prefer-ffmpeg
 #--external-downloader axel
 #--external-downloader-args "-x 4 -c"
--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"
+-f "((bestvideo[container=webm][height=1080]/bestvideo[ext=webm][height=1080]/bestvideo[height=1080]/bestvideo[container=webm][height>=?720]/bestvideo[ext=webm][height>=?720]/bestvideop[height>=?720]/bestvideo)+(bestaudio[container=webm]/bestaudio[ext=webm]/bestaudio))/best"

.conkyrc

@@ -1,130 +0,0 @@
-conky.config = {
-	alignment = 'top_right',
-	xinerama_head = 1,
-	background = true,
-	cpu_avg_samples = 2,
-	double_buffer = true,
-	font = 'xos4 Terminus:pixelsize=12',
-	draw_outline = true,
-	default_outline_color = '#2D2D2D',
-	draw_graph_borders = false,
-	minimum_width = 260,
-	maximum_width = 260,
-	minimum_height = 930,
-	gap_y = 5,
-	gap_x = 5,
-	no_buffers = true,
-	own_window = true,
-	own_window_class = Conky,
-	own_window_type = 'override',
-	own_window_transparent = true,
-	own_window_colour = '#2D2D2D',
-	update_interval = 1.0,
-	use_xft = true,
-	default_color = '#D3D0C8',
-	format_human_readable = true,
-	short_units = true,
-	if_up_strictness = 'link',
-
-	color2 = '#F2F0EC',
-
-	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 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 = [[
-#${voffset 8}
-${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 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}
-${template0 4}
-${template2 5 1}
-${template2 6 2}
-${template2 7 3}
-${template2 8 4}
-
-${color2}${font xos4 Terminus:pixelsize=14}RAM${font}${alignr}$mem / $memeasyfree${color}
-${memmax}${alignr}$cached / $memfree${color}
-${memgraph 99CC99 F2777A -t}${color2}${voffset 10}${goto 95}$alignc$memperc%$color
-${voffset -10}${template1 1}
-${template1 2}
-${template1 3}
-${template1 4}
-${template1 5}
-${template1 6}
-${template1 7}
-${template1 8}
-
-${color2}${font xos4 Terminus:pixelsize=14}Swap${font}${alignr}$swap / $swapfree / $swapmax${color}
-$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 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 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 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
-${diskiograph_read sda 25,128 FFCC66 99CC99}$alignr${diskiograph_write sda 25,128 FFCC66 99CC99}
-${voffset -10}
-${template3 /}
-${template3 /home}
-${template3 /tmp}
-${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 F2777A}$endif$loadavg$color
-Uptime$alignr$uptime
-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 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) )))}
-
-#${color2}${font xos4 Terminus:pixelsize=14}Music On Console${font}${alignr}${if_match "$moc_state"=="??"}STOP$color$else$moc_state${color}
-#$moc_curtime / $moc_totaltime$alignr$moc_timeleft
-#${execibar 3 echo $(($(mocp -Q "%cs") * 100 / $(mocp -Q "%ts")))}
-#Titre$alignr${scroll wait 32 1 4 $moc_song}
-#Artiste$alignr${scroll wait 32 1 4 $moc_artist}
-#Album$alignr${scroll wait 32 1 4 $moc_album}
-#
-#
-#Bitrate$alignr$moc_bitrate
-#Rate$alignr$moc_rate
-#Fichier$alignr${scroll wait 32 1 4 $moc_file}$endif
-
-#${color2}${font xos4 Terminus:pixelsize=14}Tracker${font}$color
-#${execi 300 curl https://tracker.breizh.me/stats}
-
-${execpi 30 cat ~/notes}
-#foncé 386587
-#clair FFCC66
-#	own_window_argb_visual = true,
-#	own_window_argb_value = 150,
-]]

.i3blocks.conf

@@ -158,10 +158,10 @@ interval=600
 #instance=0
 #interval=5
 
-[batterybar]
+#[batterybar]
 #[battery]
 #label=bat
-interval=10
+#interval=10
 #min_width="bat ██████"
 
 # Generic media player support

.i3blocks/batterybar

@@ -78,22 +78,22 @@ end=$(($battery_count - 1))
 for i in $(seq 0 $end);
 do
 #    if (( percentages[$i] > 0 && percentages[$i] < 20  )); then
-#        squares="■"
+#        squares="◆"
 #    elif (( percentages[$i] >= 20 && percentages[$i] < 40 )); then
-#        squares="■■"
+#        squares="◆◆"
 #    elif (( percentages[$i] >= 40 && percentages[$i] < 60 )); then
-#        squares="■■■"
+#        squares="◆◆◆"
 #    elif (( percentages[$i] >= 60 && percentages[$i] < 80 )); then
-#        squares="■■■■"
+#        squares="◆◆◆◆"
 #    elif (( percentages[$i] >=80 )); then
-#        squares="■■■■■"
+#        squares="◆◆◆◆◆"
 #    fi
     percents[$i]=$(( percentages[$i] / 2 ))
     (( percents > 48 )) && percents=48
     _full_squares=$(( percents[$i] /8 ))
     for t in $(seq 1 $_full_squares)
     do
-        squares+="█"
+        squares+="◆"
     done
 
     if [[ $(( percents[$i] - ( _full_squares * 8 ) )) -eq 7 ]]
@@ -175,7 +175,7 @@ do
     _blanks=$(( 6 - ${#squares} ))
     for t in $(seq 1 $_blanks)
     do
-        squares+="</span><span foreground=\"#515151\" background=\"#515151\">█"
+        squares+="</span><span foreground=\"#515151\" background=\"#515151\">◆"
     done
     # Print Battery number if there is more than one
     if (( $end > 0 )) ; then 

.i3blocks/cpu_usage

@@ -1,87 +1,22 @@
-#!/usr/bin/perl
+#!/bin/bash
-#
-# Copyright 2014 Pierre Mavro <deimos@deimos.fr>
-# Copyright 2014 Vivien Didelot <vivien@didelot.org>
-# Copyright 2014 Andreas Guldstrand <andreas.guldstrand@gmail.com>
-#
-# Licensed under the terms of the GNU GPL v3, or any later version.
 
-use strict;
+# Récupération du taux d'IDLE
-use warnings;
+idle=$(env LC_ALL=C mpstat 1 1 -o JSON | jq '.sysstat.hosts[0].statistics[0]."cpu-load"[0].idle' | cut -d. -f1)
-use utf8;
-use Getopt::Long;
 
-# default values
+# Calcul du taux d'utilisation
-my $t_warn = 70;
+used=$((100 - $idle))
-my $t_crit = 90;
-my $cpu_usage = -1;
 
-sub help {
+# Choix de la couleur
-    print "Usage: cpu_usage [-w <warning>] [-c <critical>]\n";
+if [[ $used -ge 90 ]]
-    print "-w <percent>: warning threshold to become yellow\n";
+then color="#f2777a"
-    print "-c <percent>: critical threshold to become red\n";
+elif [[ $used -ge 70 ]]
-    exit 0;
+then color="#f99157"
-}
+elif [[ $used -ge 50 ]]
+then color="#ffcc66"
+elif [[ $used -ge 10 ]]
+then color="#99cc99"
+else color="#66cccc"
+fi
 
-GetOptions("help|h" => \&help,
+# Affichage
-           "w=i"    => \$t_warn,
+printf "<span foreground=\"%s\">%3d%%</span>" "$color" "$used"
-           "c=i"    => \$t_crit);
-
-# Get CPU usage
-$ENV{LC_ALL}="en_US"; # if mpstat is not run under en_US locale, things may break, so make sure it is
-open (MPSTAT, 'mpstat 1 1 |') or die;
-while (<MPSTAT>) {
-    if (/^.*\s+(\d+\.\d+)\s+$/) {
-        $cpu_usage = 100 - $1; # 100% - %idle
-        last;
-    }
-}
-close(MPSTAT);
-
-
-$cpu_usage eq -1 and die 'Can\'t find CPU information';
-# Print short_text, full_text
-#printf "%5.2f%%\n", $cpu_usage;
-#printf "%2d%%\n", $cpu_usage;
-my $color = "";
-
-# Print color, if needed
-if ($cpu_usage >= 90) {
-	$color = "#f2777a";
-    #exit 33;
-} elsif ($cpu_usage >= 70) {
-	$color = "#f99157";
-} elsif ($cpu_usage >= 50) {
-	$color = "#ffcc66";
-} elsif ($cpu_usage >= 10) {
-	$color = "#99cc99";
-} else {
-	$color = "#66cccc";
-}
-
-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 = "▣";
-#}
-
-#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;

.i3blocks/internet

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

.i3blocks/keyindicator

@@ -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

.i3blocks/mocp

@@ -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>" ;;
+	STOP ) status="<span foreground=\"#F2777A\">◆</span>" ;;
-	PAUSE ) status="<span foreground=\"#FFCC66\">▣</span>" ;;
+	PAUSE ) status="<span foreground=\"#FFCC66\">◆</span>" ;;
-	PLAY ) status="<span foreground=\"#99CC99\">▣</span>" ;;
+	PLAY ) status="<span foreground=\"#99CC99\">◆</span>" ;;
 esac
 
 if [[ "$origstatus" != "STOP" ]]
@@ -30,7 +30,7 @@ then
 	then
 		song=$(</dev/shm/mocp)
 	else
-		song=$(mocp -Q "%song")
+		song=$(mocp -Q "%song, %artist")
 		[[ -z "$song" ]] && song=$(basename "$(mocp -Q %file)")
 		[[ -n "$song" ]] && echo "$song" > /dev/shm/mocp
 	fi

.i3blocks/updates

@@ -2,7 +2,7 @@
 
 if [[ -f /dev/shm/claws_offline ]]
 then
-	echo "<span foreground=\"#F2777A\">▣</span>"
+	echo "<span foreground=\"#F2777A\">◆</span>"
 	exit
 fi
 
@@ -17,13 +17,13 @@ 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)"
+		[[ $total -eq 1 ]] && notify-send "1 mise à jour disponible" "$(for item in ${avail[@]} ${aur[@]}; do echo -n $item; done)"
-		[[ $total -gt 1 ]] && notify-send "$total mises à jour disponibles" "$(for item in ${avail[@]} ${aur[@]}; do echo $item; done)"
+		[[ $total -gt 1 ]] && notify-send "$total mises à jour disponibles" "$(for item in ${avail[@]} ${aur[@]}; do echo -n "$item, "; done | sed 's/, $//g')"
 	fi
 fi
 

.i3blocks/vpn

@@ -2,7 +2,14 @@
 
 if nmcli dev | grep tun0 | cut -f3 | grep " connecté" &>/dev/null
 then
-	echo "<span foreground=\"#99CC99\">▣</span>"
+	echo "<span foreground=\"#99CC99\">◆</span>"
+	[[ ! -f /dev/shm/vpn ]] && echo 1 > /dev/shm/vpn
 else
-	echo "<span foreground=\"#515151\">▣</span>"
+	echo "<span foreground=\"#515151\">◆</span>"
+	if [[ -f /dev/shm/vpn ]]
+	then
+		notify-send -u critical "VPN" "Déconnecté"
+		rm /dev/shm/vpn
+	fi
+
 fi

.local/bin/conky_mount

@@ -1,5 +0,0 @@
-#!/bin/bash
-for dir in /run/media/breizh/*
-do
-	[[ -d "$dir" ]] && echo "\${template4 $dir $(basename $dir)}"
-done

.local/bin/ytdl

@@ -11,10 +11,10 @@ do
 	ln -s "$file" ./
 done
 
-youtube-dl "$@" --exec "mv -n {} \"${actualpwd}/\""
+youtube-dl -o '%(title)s.%(ext)s' "$@" --exec "mv -n {} \"${actualpwd}/\""
 
 status="$?"
 
-rm -rf "$temp"
+#rm -rf "$temp"
 
 exit $status

.moc/notif

@@ -29,5 +29,5 @@ else
 	[[ -n "$artist" ]] && string="$artist - $string"
 	[[ -n "$album" ]] && string="$string\n$album"
 	notify-send "Music On Console" "$string"
-	echo "$title" > /dev/shm/mocp
+	echo "$title, $artist" > /dev/shm/mocp
 fi

.vim/.netrwhist

@@ -1,8 +1,2 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =6
+let g:netrw_dirhist_cnt =0
-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'

.xinitrc

@@ -24,7 +24,7 @@ DEFAULT_SESSION='i3 --shmlog-size 0'
 
 setxkbmap fr oss
 
-[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap
+#[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap
 
 case $1 in
   awesome       ) exec dbus-launch awesome ;;

.xscreensaver

@@ -1,5 +1,5 @@
 # XScreenSaver Preferences File
-# Written by xscreensaver-demo 5.40 for breizh on Thu Nov  1 14:31:51 2018.
+# Written by xscreensaver-demo 5.42 for breizh on Sun Mar  3 18:00:14 2019.
 # https://www.jwz.org/xscreensaver/
 
 timeout:	0:15:00
@@ -277,6 +277,7 @@ programs:								      \
 				filmleader -root			    \n\
 				glitchpeg -root				    \n\
 				vfeedback -root				    \n\
+  GL: 				handsy -root				    \n\
 
 
 pointerPollTime:    0:00:05