diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 0119305..533427a 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -6,7 +6,7 @@ set -x VIRTUAL_ENV_DISABLE_PROMPT true
 
 ## SSH init
 set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
-for f in (ls .ssh/*.pub);
+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
@@ -53,3 +53,5 @@ function __autovenv --on-variable PWD
   end
 end
 
+set fish_command_timer_time_format ''
+source ~/.config/fish/command_timer.sh
diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish
index 242e58c..ebf8d67 100644
--- a/fish/.config/fish/functions/fish_prompt.fish
+++ b/fish/.config/fish/functions/fish_prompt.fish
@@ -24,7 +24,7 @@ function __bcarlin_prompt_git
     return
   end
 
-  set -l git_branch (echo $git_infos | grep '##' | sed -e 's|## \([^\.]\+\).*|\1|')
+  set -l git_branch (echo $git_infos | grep '##' | sed -e 's/## \([a-zA-Z0-9\/-]\+\)\( \|\.\.\.\|$\).*/\1/')
   set -l has_untracked false
   set -l staged_count 0
   set -l changed_count 0
diff --git a/mutt/.config/mutt/muttrc b/mutt/.config/mutt/muttrc
index 36ce190..570e05f 100644
--- a/mutt/.config/mutt/muttrc
+++ b/mutt/.config/mutt/muttrc
@@ -32,6 +32,11 @@ set sort_alias=alias
 set reverse_alias=yes
 source $alias_file
 
+# if there is only html dump that
+auto_view text/html
+
+# this helps with multipart messages
+alternative_order text/plain text/html
 
 # Key bindings
 bind pager <Up> previous-line 
@@ -43,3 +48,7 @@ bind index,pager \CN sidebar-next
 bind index,pager \CP sidebar-prev
 bind index <F73> previous-entry
 bind index <F72> next-entry
+
+macro attach S "<save-entry><bol>~/Téléchargements/<eol>" "Save to downloads"
+macro index,pager T ":set confirmappend=no delete=yes\n<tag-prefix><save-message>=[Gmail]/Corbeille<enter><sync-mailbox>:set confirmappend=yes delete=yes\n"
+
diff --git a/vim/.vimrc b/vim/.vimrc
index cf4861c..5cf6edc 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -52,6 +52,7 @@ if has("autocmd")
   autocmd FileType html setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType css setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType javascript setlocal ts=2 sts=2 sw=2 expandtab
+  autocmd FileType handlebars setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType xml setlocal ts=2 sts=2 sw=2 expandtab
   autocmd FileType go setlocal ts=4 sts=4 sw=4 noexpandtab
   autocmd FileType rst setlocal tw=80 ts=3 sts=3 sw=3 expandtab
@@ -106,7 +107,12 @@ if has("autocmd")
 endif
 
 " vimwiki options
-let g:vimwiki_list = [{'path': '~/Notebook', 
+let g:vimwiki_list = [{'path': '~/Notebook/work', 
+                      \ 'auto_toc': 1, 
+                      \ 'index': 'main',
+                      \ 'ext': '.md',
+                      \ 'syntax': 'markdown'},
+                     \{'path': '~/Notebook/perso', 
                       \ 'auto_toc': 1, 
                       \ 'index': 'main',
                       \ 'ext': '.md',
@@ -124,6 +130,7 @@ call plug#begin('~/.vim/plugged')
     Plug 'bling/vim-airline'
     Plug 'vim-airline/vim-airline-themes'
     Plug 'tpope/vim-fugitive'
+    Plug 'jreybert/vimagit'
     Plug 'kien/ctrlp.vim'
     Plug 'valloric/youcompleteme'
     Plug 'altercation/vim-colors-solarized'
@@ -148,4 +155,5 @@ call plug#end()
 map <C-n> :NERDTreeToggle<CR>
 map <leader>n :cnext<CR>
 map <leader>p :cprevious<CR>
+nmap <leader>N :NERDTreeFocus<CR>
 nnoremap <leader>h :cclose<CR>