diff --git a/.gitignore b/.gitignore
index 0474fa8..8ea7d2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,32 @@
 lfm/.config/lfm/lfm.history
-fish/.config/fish/fishd.*
-mutt/.config/mutt/muttrc.aliases
-mutt/.config/mutt/waarp
-mutt/.config/mutt/*.mailboxes
-bin/.local/bin/autobuild
 
 lazygit/.config/jesseduffield/lazygit/state.yml
 lazygit/.config/**/*.patch
 
 bin/.local/bin/mopen
+bin/.local/bin/autobuild
+
 fish/.config/fish/functions/pdl.fish
-mutt/.config/mutt/waarp.save-rules
\ No newline at end of file
+fish/.config/fish/fishd.*
+
+mutt/.config/mutt/waarp.save-rules
+mutt/.config/mutt/muttrc.aliases
+mutt/.config/mutt/waarp
+mutt/.config/mutt/*.mailboxes
+
+matterhorn/.config/matterhorn/history.txt
+matterhorn/.config/matterhorn/last_run_state_*.json
+
+ssh/.ssh/*
+ssh/.ssh/known_hosts*
+!ssh/.ssh/config
+
+vifm/.config/vifm/scripts/README
+vifm/.config/vifm/vifm-help.txt
+vifm/.config/vifm/vifminfo.json*
+
+vim/.vim/autoload/
+vim/.vim/colors/
+vim/.vim/plugged/
+vim/.vim/swap/
+vim/.vim/undo/
diff --git a/bin/.local/bin/wm-key b/bin/.local/bin/wm-key
index 32db516..0f372db 100755
Binary files a/bin/.local/bin/wm-key and b/bin/.local/bin/wm-key differ
diff --git a/desktop_entries/.local/share/applications/meta.desktop b/desktop_entries/.local/share/applications/meta.desktop
index 8bb14df..13f4c18 100644
--- a/desktop_entries/.local/share/applications/meta.desktop
+++ b/desktop_entries/.local/share/applications/meta.desktop
@@ -13,7 +13,7 @@ Name=Meta
 #Path=
 
 # The executable of the application, possibly with arguments.
-Exec=kitty --name meta --session ~/.config/kitty/meta.session
+Exec=kitty --name meta --session /home/bca/.config/kitty/meta.session
 
 # Describes whether this application needs to be run in a terminal or not
 Terminal=False
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index d1774ee..19f9cad 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -12,6 +12,13 @@ for f in (ls $HOME/.ssh/*.pub);
   end
 end
 
+# Start X at login
+if status is-login
+  if test -z "$DISPLAY" -a "$XDG_VTNR" = 1
+    exec startx -- -keeptty
+  end
+end
+
 ## Go utils
 set -x GOPATH ~/.go
 
diff --git a/fish/.config/fish/functions/br.fish b/fish/.config/fish/functions/br.fish
new file mode 120000
index 0000000..7160d68
--- /dev/null
+++ b/fish/.config/fish/functions/br.fish
@@ -0,0 +1 @@
+/home/bca/.local/share/broot/launcher/fish/br.fish
\ No newline at end of file
diff --git a/fish/.config/fish/functions/email.fish b/fish/.config/fish/functions/email.fish
index fce0fd1..a83a071 100644
--- a/fish/.config/fish/functions/email.fish
+++ b/fish/.config/fish/functions/email.fish
@@ -16,5 +16,5 @@ function email --description 'Opens mutt with a specific account (waarp|perso)'
 		end
 	end
 
-	env EMAIL_ACCOUNT=$account mutt
+	env EMAIL_ACCOUNT=$account neomutt
 end
diff --git a/i3wm/.config/i3/config b/i3wm/.config/i3/config
index 4cc6f07..001255d 100644
--- a/i3wm/.config/i3/config
+++ b/i3wm/.config/i3/config
@@ -48,7 +48,8 @@ bindsym Mod4+d exec dmenu_run
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
 # installed.
-bindsym Mod4+Shift+d exec --no-startup-id i3-dmenu-desktop
+#bindsym Mod4+Shift+d exec --no-startup-id i3-dmenu-desktop
+bindsym Mod4+Shift+d exec --no-startup-id rofi -modi window#run#drun#ssh -combi-modi window#run#drun#ssh -show combi -theme solarized
 
 # change focus
 bindsym Mod4+$left focus left
@@ -194,14 +195,18 @@ bindsym XF86AudioLowerVolume exec /usr/bin/pactl set-sink-volume @DEFAULT_SINK@
 bindsym XF86AudioRaiseVolume exec /usr/bin/pactl set-sink-volume @DEFAULT_SINK@ '+5%'
 bindsym XF86AudioMute exec /usr/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle
 
+
+bindsym Shift+Escape exec pactl list sources short | cut -f1 | xargs -I{} pactl set-source-mute {} 0
+bindsym --release Shift+Escape exec pactl list sources short | cut -f1 | xargs -I{} pactl set-source-mute {} 1
+
 # Playback control
 bindsym XF86AudioPlay exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
 # Backlight level control
-bindsym XF86MonBrightnessDown exec xbacklight -dec 10
-bindsym XF86MonBrightnessUp exec xbacklight -inc 10
+bindsym XF86MonBrightnessDown exec xbacklight -dec 5
+bindsym XF86MonBrightnessUp exec xbacklight -inc 5
 
 # Screenshots
 bindsym --release Print exec --no-startup-id scrot -e 'mv $f ~/Images/screenshots/'
diff --git a/kitty/.config/kitty/meta.session b/kitty/.config/kitty/meta.session
index 80285de..409df61 100644
--- a/kitty/.config/kitty/meta.session
+++ b/kitty/.config/kitty/meta.session
@@ -2,7 +2,7 @@ title 💬 matterhorn
 launch matterhorn
 
 new_tab 📨 email
-launch env EMAIL_ACCOUNT=waarp mutt
+launch env EMAIL_ACCOUNT=waarp neomutt
 
 new_tab 📅 calendar
 launch ikhal
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index b1425ef..410f696 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -1 +1,16 @@
 AddKeysToAgent  yes
+ServerAliveInterval 60
+ForwardAgent yes
+
+Host er
+    HostName er.s.bcarlin.xyz
+    User bcarlin
+    IdentityFile ~/.ssh/bca-perso-worklaptop
+
+Host yi
+    HostName yi.s.bcarlin.xyz
+    User bcarlin
+    IdentityFile ~/.ssh/bca-perso-worklaptop
+
+Host code.bcarlin.xyz
+    IdentityFile ~/.ssh/bca-perso-worklaptop
diff --git a/systemd/.config/systemd/user/msmtp-runqueue.timer b/systemd/.config/systemd/user/msmtp-runqueue.timer
index d72f1d3..613d5d7 100644
--- a/systemd/.config/systemd/user/msmtp-runqueue.timer
+++ b/systemd/.config/systemd/user/msmtp-runqueue.timer
@@ -4,7 +4,6 @@ Description=Send email from msmtp queue timer
 [Timer]
 OnBootSec=2m
 OnUnitActiveSec=5m
-Persistent=true
 Unit=msmtp-runqueue.service
 
 [Install]
diff --git a/systemd/.config/systemd/user/syncagenda.timer b/systemd/.config/systemd/user/syncagenda.timer
index bf78dc2..043aec2 100644
--- a/systemd/.config/systemd/user/syncagenda.timer
+++ b/systemd/.config/systemd/user/syncagenda.timer
@@ -4,7 +4,6 @@ Description=Calendars synchronization timer
 [Timer]
 OnBootSec=2m
 OnUnitActiveSec=5m
-Persistent=true
 Unit=syncagenda.service
 
 [Install]
diff --git a/systemd/.config/systemd/user/syncemail.timer b/systemd/.config/systemd/user/syncemail.timer
index 5d0b400..e161e9c 100644
--- a/systemd/.config/systemd/user/syncemail.timer
+++ b/systemd/.config/systemd/user/syncemail.timer
@@ -4,7 +4,6 @@ Description=Mailbox synchronization timer
 [Timer]
 OnBootSec=2m
 OnUnitActiveSec=5m
-Persistent=true
 Unit=syncemail.service
 
 [Install]
diff --git a/systemd/.config/systemd/user/syncnotebook.timer b/systemd/.config/systemd/user/syncnotebook.timer
index d88f147..6d2d9c4 100644
--- a/systemd/.config/systemd/user/syncnotebook.timer
+++ b/systemd/.config/systemd/user/syncnotebook.timer
@@ -4,7 +4,6 @@ Description=Notebook synchronization timer
 [Timer]
 OnBootSec=5m
 OnUnitActiveSec=5m
-Persistent=true
 Unit=syncnotebook.service
 
 [Install]
diff --git a/systemd/.config/systemd/user/update-mail-count.timer b/systemd/.config/systemd/user/update-mail-count.timer
index ff02670..acba6ce 100644
--- a/systemd/.config/systemd/user/update-mail-count.timer
+++ b/systemd/.config/systemd/user/update-mail-count.timer
@@ -4,7 +4,6 @@ Description=mail count timer
 [Timer]
 OnBootSec=1m
 OnUnitActiveSec=1m
-Persistent=true
 Unit=update-mail-count.service
 
 [Install]
diff --git a/vim/.vim/spell/fr.utf-8.add b/vim/.vim/spell/fr.utf-8.add
new file mode 100644
index 0000000..1ee8dd6
--- /dev/null
+++ b/vim/.vim/spell/fr.utf-8.add
@@ -0,0 +1,12 @@
+SQLite
+MySQL
+PostgreSQL
+Gateway
+Waarp
+HTTP
+HTTPS
+R66
+REST
+JSON
+SFTP
+bug
diff --git a/vim/.vim/spell/fr.utf-8.add.spl b/vim/.vim/spell/fr.utf-8.add.spl
new file mode 100644
index 0000000..da9665f
Binary files /dev/null and b/vim/.vim/spell/fr.utf-8.add.spl differ
diff --git a/vim/.vimrc b/vim/.vimrc
index fd95128..d4c0ec2 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -187,7 +187,7 @@ call plug#begin('~/.vim/plugged')
     Plug 'mattn/emmet-vim'
     Plug 'ollykel/v-vim'
 
-    Plug 'liuchengxu/vim-clap'
+    Plug 'liuchengxu/vim-clap', { 'do': { -> clap#installer#force_download() } }
     Plug 'dense-analysis/ale'
     Plug 'joereynolds/vim-minisnip'
     Plug 'neoclide/coc.nvim', {'branch': 'release'}
diff --git a/xinitrc/.xinitrc b/xinitrc/.xinitrc
index 8ea2ff4..553609c 100644
--- a/xinitrc/.xinitrc
+++ b/xinitrc/.xinitrc
@@ -36,10 +36,10 @@ fi
 setxkbmap -option caps:escape
 
 # Enable tap-to-click
-xinput set-prop 'SYNA2393:00 06CB:7A13 Touchpad' 'libinput Tapping Enabled' 1
+xinput set-prop 'DELL097D:00 04F3:311C Touchpad' 'libinput Tapping Enabled' 1
 
 # Enable Drag & Drag Lock
-xinput set-prop 'SYNA2393:00 06CB:7A13 Touchpad' 'libinput Tapping Drag Enabled' 1
-xinput set-prop 'SYNA2393:00 06CB:7A13 Touchpad' 'libinput Tapping Drag Lock Enabled' 1
+xinput set-prop 'DELL097D:00 04F3:311C Touchpad' 'libinput Tapping Drag Enabled' 1
+xinput set-prop 'DELL097D:00 04F3:311C Touchpad' 'libinput Tapping Drag Lock Enabled' 1
 
 exec i3