diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 6af03d8..c820661 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -9,7 +9,7 @@ set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
 for f in (ls $HOME/.ssh/*.pub);
   set -l priv (string replace '.pub' '' $f);
   if not contains $priv (ssh-add -l | awk '{ print $3 }')
-    ssh-add $priv
+    ssh-add $priv >/dev/null 2>&1
   end
 end
 
diff --git a/fish/.config/fish/functions/ll.fish b/fish/.config/fish/functions/ll.fish
index e72c1ac..94c6ef3 100644
--- a/fish/.config/fish/functions/ll.fish
+++ b/fish/.config/fish/functions/ll.fish
@@ -1,4 +1,4 @@
-# Defined in - @ line 1
-function ll --description 'alias ll=exa -l'
-	exa -l $argv;
+# Defined in /tmp/fish.LdXqvm/ll.fish @ line 2
+function ll --wraps=exa --description 'alias ll=exa -l'
+	exa -lF --git $argv;
 end
diff --git a/fish/.config/fish/functions/ydl.fish b/fish/.config/fish/functions/ydl.fish
index dd8e393..7301598 100644
--- a/fish/.config/fish/functions/ydl.fish
+++ b/fish/.config/fish/functions/ydl.fish
@@ -1,6 +1,6 @@
-# Defined in /tmp/fish.CDDaTn/ydl.fish @ line 2
+# Defined in /tmp/fish.5wSYb7/ydl.fish @ line 2
 function ydl
-  set -l addargs "--extract-audio --keep-video"
+  set -l addargs --extract-audio --keep-video
   set -l url $argv[1]
 
   echo "args = $argv[1] -- $argv[2]"
@@ -19,5 +19,6 @@ function ydl
 
   echo youtube-dl $addargs --add-metadata "$url"
   youtube-dl $addargs --add-metadata "$url"
-  rm -f "*.f???.*"
+  #rm -f "*.f???.*"
+  fd ".*\.f...\..*" -X rm
 end
diff --git a/git/.gitconfig b/git/.gitconfig
index 88ab28b..4b4b118 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -28,3 +28,6 @@
 	insteadOf = https://code.waarp.fr
 [core]
 	pager = delta --dark --theme 'Solarized (dark)'
+[merge]
+	tool = vimdiff
+	guitool = meld
diff --git a/vim/.vimrc b/vim/.vimrc
index bb0ae18..9710a57 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -209,6 +209,8 @@ nmap <silent> <space>w<space>w :call mkdir(strftime("diary/%Y/%m"), "p", 0755) \
 
 " Removes trailing whitespaces
 nnoremap <leader>s :keeppattern %s/\s\+$//<CR>
+
+" move lines around
 nnoremap <A-Down> :m .+1<CR>==
 nnoremap <A-Up> :m .-2<CR>==
 inoremap <A-Down> <Esc>:m .+1<CR>==gi
@@ -221,7 +223,7 @@ nmap <space>cf :cfirst<CR>
 nmap <space>cn :cnext<CR>
 nmap <space>cp :cprevious<CR>
 nmap <space>co :copen<CR>
-nmap <space>cc :cclose<CR>
+nmap <space>cc :cexpr [] \| cclose<CR>
 nmap <space>lf :lfirst<CR>
 nmap <space>ln :lnext<CR>
 nmap <space>lp :lprevious<CR>
@@ -306,4 +308,7 @@ if has("autocmd")
     autocmd FileType go nmap <leader>m  <Plug>(go-metalinter)
 endif
 
-nmap <space>w :w<CR>
+nmap <space>w :cexpr [] \| cclose \| w<CR>
+nmap <C-b> :b#<CR>
+nmap <C-w>M <C-w>_<C-w><BAR>
+nmap <C-w>m <C-w>=