Mise à jour de quelques fichiers de config

.config/dunst/dunstrc

@@ -1,5 +1,5 @@
 [global]
-    font = Fira Sans
+    font = Latin Modern Sans
     
     # Allow a small subset of html markup:
     #   <b>bold</b>

.i3/config

@@ -1,27 +1,24 @@
-# i3 config file (v4)
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
 ## Base16 Eighties
 # Author: Chris Kempson (http://chriskempson.com)
 #
 # You can use these variables anywhere in the i3 configuration file.
 
-set $base00 #2d2d2d
+set_from_resource $base00 i3wm.color0	#2d2d2d
-set $base01 #393939
+set_from_resource $base01 i3wm.color18	#393939
-set $base02 #515151
+set_from_resource $base02 i3wm.color19	#515151
-set $base03 #747369
+set_from_resource $base03 i3wm.color8	#747369
-set $base04 #a09f93
+set_from_resource $base04 i3wm.color20	#a09f93
-set $base05 #d3d0c8
+set_from_resource $base05 i3wm.color7	#d3d0c8
-set $base06 #e8e6df
+set_from_resource $base06 i3wm.color21	#e8e6df
-set $base07 #f2f0ec
+set_from_resource $base07 i3wm.color15	#f2f0ec
-set $base08 #f2777a
+set_from_resource $base08 i3wm.color9	#f2777a
-set $base09 #f99157
+set_from_resource $base09 i3wm.color16	#f99157
-set $base0A #ffcc66
+set_from_resource $base0A i3wm.color3	#ffcc66
-set $base0B #99cc99
+set_from_resource $base0B i3wm.color2	#99cc99
-set $base0C #66cccc
+set_from_resource $base0C i3wm.color6	#66cccc
-set $base0D #6699cc
+set_from_resource $base0D i3wm.color4	#6699cc
-set $base0E #cc99cc
+set_from_resource $base0E i3wm.color5	#cc99cc
-set $base0F #d27b53
+set_from_resource $base0F i3wm.color17	#d27b53
 
 # Basic color configuration using the Base16 variables for windows and borders.
 # Property Name		Border		BG		Text		Indicator	Child Border
@@ -30,7 +27,7 @@ client.focused_inactive	$base01		$base01		$base05		$base03		$base01
 client.unfocused	$base01		$base00		$base05		$base01		$base01
 client.urgent		$base08		$base08		$base00		$base08		$base08
 client.placeholder	$base00		$base00		$base05		$base00		$base00
-client.background	$base07
+client.background	$base00
 
 # Set mod key (Mod1=<Alt>, Mod4=<Super>)
 set $mod Mod4
@@ -53,8 +50,7 @@ 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 -xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
+font xft:xos4 Terminus
-# font xft:Cantarell
 
 # Use Mouse+$mod to drag floating windows
 floating_modifier $mod
@@ -64,18 +60,19 @@ bindsym $mod+Return exec terminal -e fish
 bindsym $mod+Ctrl+Return exec terminal
 bindsym $mod+Shift+Return exec terminal -fn -xos4-terminus-medium-r-normal--32-320-72-72-c-160-iso10646-1 -e fish
 
+
 # kill focused window
 bindsym $mod+Shift+q kill
 
 # start program launcher
 # bindsym $mod+d exec --no-startup-id dmenu_recent -f -nb '#2d2d2d' -nf '#747369' -sb '#6699cc' -sf '#2d2d2d' -p 'execute' -fn 'xos4 Terminus'
-bindsym $mod+d exec --no-startup-id dmenu_recent -f -fn 'Fira Mono'
+bindsym $mod+d exec --no-startup-id dmenu_recent -f -fn 'xos4 Terminus'
 
 # launch desktop menu
-bindsym $mod+z exec --no-startup-id i3-dmenu-desktop --dmenu='dmenu -f -p "Launch:" -i -fn "Fira Mono" -nb "#2d2d2d" -nf "#747369" -sb "#6699cc" -sf "#2d2d2d"'
+bindsym $mod+z exec --no-startup-id i3-dmenu-desktop --dmenu='dmenu -f -p "Launch:" -i -fn "xos4 Terminus" -nb "#2d2d2d" -nf "#747369" -sb "#6699cc" -sf "#2d2d2d"'
 
 # launch without history
-bindsym $mod+Ctrl+d exec --no-startup-id dmenu_run -f -p "Execute:" -nb '#2d2d2d' -nf '#747369' -sb '#6699cc' -sf '#2d2d2d' -fn 'Fira Mono' 
+bindsym $mod+Ctrl+d exec --no-startup-id dmenu_run -f -p "Execute:" -nb '#2d2d2d' -nf '#747369' -sb '#6699cc' -sf '#2d2d2d' -fn 'xos4 Terminus' 
 
 # HUD
 # exec ~/.i3/i3-appmenu-service.py
@@ -109,15 +106,15 @@ bindsym --release Caps_Lock exec --no-startup-id pkill -SIGRTMIN+11 i3blocks
 bindsym --release Num_Lock  exec --no-startup-id pkill -SIGRTMIN+12 i3blocks
 
 # Start Applications
-bindsym $mod+Ctrl+b exec i3-sensible-terminal +sb -e 'bmenu'
+bindsym $mod+Ctrl+b exec i3-sensible-terminal +sb -e fish -c bmenu
 bindsym $mod+F2 exec $BROWSER
 bindsym $mod+Shift+F2 exec $BROWSER --private-window
 bindsym $mod+Ctrl+F2 exec surf "https://www.qwant.com?l=fr&h=1&hc=2&a=1&s=1&b=0&i=1&r=FR&sr=fr"
 bindsym $mod+Ctrl+F3 exec pcmanfm
-bindsym $mod+F3 exec i3-sensible-terminal +sb -e ranger
+bindsym $mod+F3 exec i3-sensible-terminal +sb -e fish -c ranger
-bindsym $mod+F4 exec i3-sensible-terminal +sb -e bashmount
+bindsym $mod+F4 exec i3-sensible-terminal +sb -e fish -c bashmount
 bindsym $mod+Shift+F3 exec gksu pcmanfm
-bindsym $mod+F5 exec i3-sensible-terminal +sb -e 'mocp'
+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'"
@@ -278,11 +275,13 @@ for_window [class="Timeset-gui"] floating enable border normal
 for_window [class="Xfburn"] floating enable
 for_window [class="(?i)variety"] floating enable
 for_window [class="Yad"] floating enable
-# for_window [class="Firefox"] border pixel 1
+for_window [class="Firefox"] border pixel 1
+for_window [class="Nightly"] border pixel 1
 for_window [title="(?i)pinentry"] floating enable
 for_window [title="(?i)Minecraft"] border none
 # switch to workspace with urgent window automatically
 for_window [urgent=latest] focus
+for_window [title="dclock"] floating enable border pixel 1
 
 # reload the configuration file
 bindsym $mod+Shift+c reload
@@ -351,10 +350,7 @@ exec --no-startup-id xscreensaver -no-splash
 exec_always --no-startup-id setcursor
 exec claws-mail
 exec ring.cx -r
-exec --no-startup-id sleep 10 && i3-msg '[class="Gnome-ring"] move scratchpad'
+exec --no-startup-id sleep 2 && urxvtc +sb -e fish -c newsboat
-#exec zeal
-#exec --no-startup-id qbittorrent
-exec --no-startup-id sleep 2 && urxvtc +sb -e newsboat
 exec --no-startup-id sleep 5 && i3-msg '[class="URxvt"] 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
@@ -364,10 +360,10 @@ exec --no-startup-id redshift-gtk
 #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 btpd --bw-out 40 --max-peers 50 
 exec --no-startup-id nm-applet
 exec --no-startup-id sudo droidmote 2302 1234
-exec --no-startup-id gdfs $HOME/.google_drive $HOME/Google_Drive/
+#exec --no-startup-id gdfs $HOME/.google_drive $HOME/Google_Drive/
+#exec --no-startup-id transmission-gtk -m
 
 # Start i3bar to display a workspace bar (plus the system information i3status if available)
 bar {
@@ -387,7 +383,7 @@ bar {
 	colors {
             background $base00
             separator  $base01
-            statusline $base04
+            statusline $base05
 
             # State             Border  BG      Text
             focused_workspace   $base05 $base0D $base00
@@ -401,3 +397,8 @@ bar {
 
 # hide/unhide i3status bar
 bindsym $mod+semicolon bar mode toggle
+
+#gaps inner 10
+#gaps outer 0
+#smart_gaps on
+#smart_borders no_gaps

.i3blocks.conf

@@ -26,7 +26,7 @@
 # Each block command defaults to the script name to avoid boilerplate.
 command=${HOME}/.i3blocks/$BLOCK_NAME
 separator_block_width=15
-markup=none
+markup=pango
 
 #[window_title]
 #command=echo $(xdotool getactivewindow getwindowname)
@@ -46,7 +46,7 @@ interval=1
 [load_average]
 #label=
 label=load
-interval=1
+interval=5
 
 # Temperature
 #
@@ -56,12 +56,14 @@ interval=1
 [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
@@ -70,11 +72,13 @@ interval=3
 [memory]
 label=ram
 separator=false
+markup=none
 interval=1
 #min_width=RAM 99.99%
 
 [memory]
 label=swap
+markup=none
 instance=swap
 #separator=false
 interval=1
@@ -96,10 +100,10 @@ interval=1
 #instance=/mnt/data
 #interval=30
 
-# Packages to update
+[internet]
-[updates]
+label=wan
-#label=
+interval=30
-interval=300
+separator=false
 
 # Network interface monitoring
 #
@@ -116,8 +120,15 @@ interval=300
 #interval=60
 #separator=false
 
-#[vpn]
+[vpn]
-#interval=30
+label=vpn
+interval=30
+
+# Packages to update
+[updates]
+label=updt
+interval=600
+
 
 #[wifi]
 ##label=
@@ -140,11 +151,16 @@ interval=300
 # Battery indicator
 #
 # The battery instance defaults to 0.
-[battery]
+#[battery]
 #label=BAT
 #label=⚡
-instance=0
+#instance=0
-interval=5
+#interval=5
+
+[batterybar]
+label=bat
+interval=10
+#min_width="bat █████"
 
 # Generic media player support
 #
@@ -154,6 +170,7 @@ interval=5
 #instance=spotify
 interval=20
 signal=13
+markup=none
 
 # OpenVPN support
 #
@@ -161,7 +178,6 @@ signal=13
 #[openvpn]
 #interval=20
 
-
 # Volume indicator
 #
 # The first parameter sets the step (and units to display)
@@ -172,12 +188,14 @@ instance=Master
 #instance=PCM
 interval=once
 signal=10
+markup=none
 separator=false
 
 [volume]
 instance=Capture
 #instance=PCM
 interval=once
+markup=none
 signal=10
 
 
@@ -188,17 +206,19 @@ signal=10
 # bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks
 # bindsym --release Num_Lock  exec pkill -SIGRTMIN+12 i3blocks
 [keyindicator]
+label=caps
 instance=CAPS
 interval=once
 signal=11
 separator=false
 
 [keyindicator]
+label=num
 instance=NUM
 interval=once
 signal=12
-
 # Date Time
 #
 [time]
 interval=1
+markup=none

.i3blocks/cpu_usage

@@ -41,21 +41,46 @@ 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 "%5.2f%%\n", $cpu_usage;
-printf "%2d%%\n", $cpu_usage;
+#printf "%2d%%\n", $cpu_usage;
+my $color = "";
 
 # Print color, if needed
-if ($cpu_usage >= $t_crit) {
+if ($cpu_usage >= 80) {
-    print "#f2777a\n";
+	$color = "#f2777a";
     #exit 33;
-} elsif ($cpu_usage >= $t_warn) {
+} elsif ($cpu_usage >= 60) {
-    print "#f99157\n";
+	$color = "#f99157";
 } elsif ($cpu_usage >= 40) {
-	print "#ffcc66\n";
+	$color = "#ffcc66";
-} elsif ($cpu_usage >= 10) {
+} elsif ($cpu_usage >= 20) {
-	print "#99cc99\n";
+	$color = "#99cc99";
 } else {
-	print "#66cccc\n";
+	$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\" background=\"#515151\">$pave</span>";
+
 exit 0;

.i3blocks/keyindicator

@@ -62,12 +62,9 @@ close(XSET);
 my $indi = "N";
 
 # Output
-printf "%s\n", $indicator;
-if ($indicator eq "CAPS") {$indi = "C";}
-printf "%s\n", $indi;
 if (($indicators{$indicator} || 0) & $mask) {
-    printf "%s\n", $color_on;
+    printf "<span foreground=\"%s\">█</span>", $color_on;
 } else {
-    printf "%s\n", $color_off;
+    printf "<span foreground=\"%s\">█</span>", $color_off;
 }
 exit 0

.i3blocks/load_average

@@ -15,23 +15,39 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 load="$(cut -d ' ' -f1 /proc/loadavg)"
-all="$(cut -d ' ' -f1-3 /proc/loadavg)"
+load5="$(cut -d ' ' -f2 /proc/loadavg)"
+load15="$(cut -d ' ' -f3 /proc/loadavg)" 
 cpus="$(nproc)"
 
-# full text
-echo "$all"
-
-# short text
-echo "$load"
-
 # color if load is too high
-awk -v cpus=$cpus -v cpuload=$load '
+if [[ "$(echo "$load < 0.75 * $cpus" | bc)" = "1" ]]
-    BEGIN {
+then
-        if (cpus <= cpuload) {
+	color="#99CC99"
-            print "#f2777a";
+elif [[ "$(echo "$load < $cpus" | bc)" = "1" ]]
-            #exit 33;
+then
-    	} else {
+	color="#FFCC66"
-        	print "#99cc99";
+else
-        }
+	color="#F2777A"
-    }
+fi
-'
+
+if [[ "$(echo "$load5 < 0.75 * $cpus" | bc)" = "1" ]]
+then
+	color5="#99CC99"
+elif [[ "$(echo "$load5 < $cpus" | bc)" = "1" ]]
+then
+	color5="#FFCC66"
+else
+	color5="#F2777A"
+fi
+
+if [[ "$(echo "$load15 < 0.75 * $cpus" | bc)" = "1" ]]
+then
+	color15="#99CC99"
+elif [[ "$(echo "$load15 < $cpus" | bc)" = "1" ]]
+then
+	color15="#FFCC66"
+else
+	color15="#F2777A"
+fi
+
+echo "<span foreground=\"$color\">█</span><span foreground=\"$color5\">█</span><span foreground=\"$color15\">█</span>"

.i3blocks/mocp

@@ -15,4 +15,14 @@ case $status in
 	PLAY ) status=" >" ;;
 esac
 
-echo $status $(mocp -Q "%song")
+dots=
+song=$(mocp -Q "%song")
+
+[[ -z "$song" ]] && song=$(basename "$(mocp -Q %file)")
+
+if [ ${#song} -gt 30 ]
+then
+	dots="…"
+fi
+
+echo $status ${song:0:30}$dots

.i3blocks/updates

@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 
-avail=$(checkupdates | wc -l )
+if [ -f /dev/shm/claws_offline ]
-aur=$(yaourt -Qua | grep 'aur/' | wc -l)
-
-if [[ $(($aur+$avail)) -eq 0 ]]
 then
-    echo "0 màj"
+	echo "<span foreground=\"#F2777A\">█</span>"
-    echo ok
+	exit
-    echo "#99cc99"
+fi
-else
+
-    echo "$avail màj"
+avail=$(checkupdates | wc -l)
-    echo "$avail"
+
-    echo "#f99157"
+if [[ $avail -eq 0 ]]
+then
+	echo "<span foreground=\"#99CC99\">█</span>"
+else
+    echo "<span foreground=\"#FFCC66\">█</span>"
 fi

.i3blocks/vpn

@@ -1,11 +1,8 @@
 #!/bin/bash
 
-echo VPN
+if nmcli dev | grep tun0 | cut -f3 | grep " connecté" &>/dev/null
-echo VPN
-
-if [ -e "/var/run/vpnc/defaultroute" ]
 then
-	echo "#00FFFF"
+	echo "<span foreground=\"#99CC99\">█</span>"
 else
-	echo "#386587"
+	echo "<span foreground=\"#515151\">█</span>"
 fi

.ssh/config

@@ -8,3 +8,9 @@ Host breizh.me
 	User alarm
 	Port 22
 	IdentityFile ~/.ssh/id_rsa
+
+Host git
+	Hostname breizh.me
+	User gitolite
+	Port 22
+	IdentityFile ~/.ssh/id_rsa

.vim/.netrwhist

@@ -1,8 +1,11 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =6
+let g:netrw_dirhist_cnt =9
-let g:netrw_dirhist_1='/boot/grub/themes/Archlinux'
+let g:netrw_dirhist_1='/home/breizh'
-let g:netrw_dirhist_2='/home/breizh/.config/i3'
+let g:netrw_dirhist_2='/home/breizh/.i3'
-let g:netrw_dirhist_3='/home/breizh/projects'
+let g:netrw_dirhist_3='/etc/elasticsearch'
-let g:netrw_dirhist_4='/home/breizh/.config/fisherman/transfer'
+let g:netrw_dirhist_4='/home/breizh/.podget'
-let g:netrw_dirhist_5='/home/breizh/Documents/IUT/Licence/Admin_Réseaux'
+let g:netrw_dirhist_5='/tmp'
-let g:netrw_dirhist_6='/home/breizh/Documents/IUT/Licence/Admin_Réseaux/TP4'
+let g:netrw_dirhist_6='/tmp/numpy'
+let g:netrw_dirhist_7='/home/breizh'
+let g:netrw_dirhist_8='/home/breizh/projects/utilitaires'
+let g:netrw_dirhist_9='/home/breizh/.i3blocks'

.vim/bundle/base16-vim

@@ -1 +1 @@
-Subproject commit ee13503508ee52c62b16a79ada86779e0cb46886
+Subproject commit 97f2feb554471760f72cb6e4f872fde0f825b4b3

.vim/bundle/onedark.vim

@@ -1 +1 @@
-Subproject commit 1552d3e8ec7a25aa72bd0dfa5a8344d9c132a7c5
+Subproject commit 4f0292533a9960978e73c32245967b2efc66666b

.vim/bundle/rtorrent-syntax-file

@@ -0,0 +1 @@
+Subproject commit 1bc04a5b146fa52ff94dac9ce5c5800e051a9b0b

.vim/bundle/sieve.vim

@@ -0,0 +1 @@
+Subproject commit 934cec007c0e7b380603bce99b6139a894105252

.vim/bundle/vim-table-mode

@@ -1 +1 @@
-Subproject commit 40fe641708c58476c3a1b9aeafb68dd888d4920b
+Subproject commit c35fd9b104fb75017f3866a28a77cf38f61b7801

.vim/bundle/vimtex

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

.vim/config/settings.vim

@@ -1,4 +1,5 @@
 set nocompatible
+set lazyredraw
 set number
 set relativenumber
 set autoindent 
@@ -7,13 +8,24 @@ set hlsearch
 set incsearch
 set textwidth=79
 set colorcolumn=+2
+nnoremap <F3> :set hlsearch!<CR>
+let g:vimtex_view_method = 'zathura'
 let g:table_mode_corner_corner='+'
 let g:table_mode_header_fillchar='='
-let g:grammalecte_cli_py='/usr/share/grammalecte-fr/cli.py'
+let g:grammalecte_cli_py='/usr/share/grammalecte-fr/grammalecte-cli.py'
 if filereadable(expand("~/.vimrc_background"))
   if &t_Co >= 256
     let base16colorspace=256
-  endif
     source ~/.vimrc_background
+  else
+    colorscheme default
   endif
+endif
+"nnoremap j jzz
+"nnoremap k kzz
+"nnoremap <Down> jzz
+"nnoremap <Up> kzz
+"set scrolloff=999
 cmap w!! w !sudo tee > /dev/null %
+
+

.vim/vimrc

@@ -1,5 +1,5 @@
 set shell=/bin/bash
-call pathogen#infect()
+execute pathogen#infect()
 call pathogen#helptags()
 runtime! archlinux.vim
 runtime! config/**/*.vim