diff --git a/_bash_aliases b/_bash_aliases
index 11d84ab..52eff4f 100644
--- a/_bash_aliases
+++ b/_bash_aliases
@@ -30,6 +30,7 @@ alias ga='git-annex '
 alias gas='git-annex sync '
 alias vi='vim '
 alias tmr='~/bin/tmux_rattach.sh'
+alias mpc='mpc -f "[%artist% - %title% \[%album%\] %date%]|[%file%]"'
 # envoie la playlist mpc et lit le meme morceau
 function mpct() {
 	if [ $1 ] ; then
diff --git a/_bashrc b/_bashrc
index eb7d98c..367cf12 100644
--- a/_bashrc
+++ b/_bashrc
@@ -70,6 +70,9 @@ fi
 
 ##### MISC #####
 
+# edit file in tmux pane
+peek() { tmux split-window -p 33 "$EDITOR" "$@" || exit; }
+
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 shopt -s checkwinsize
diff --git a/_tmux.conf b/_tmux.conf
index 2f65b60..552ad11 100644
--- a/_tmux.conf
+++ b/_tmux.conf
@@ -37,7 +37,7 @@ set -g status-bg black
 set -g status-fg white
 set -g status-interval 5 
 set -g status-left-length 90
-set -g status-right-length 90
+set -g status-right-length 150
 set -g status-left "#[fg=Green]#(whoami)#[fg=white]::#[fg=blue]#h#[fg=white]#[fg=yellow]"
 set -g status-justify left
-set -g status-right '#[fg=Cyan]#S #[fg=green,bg=black]#(~/bin/tmux-mem-cpu-load --colors --interval 5) #[fg=white]%a %d %b %R'
+set -g status-right '#[fg=Cyan]#S #[fg=green,bg=black]#(mpc -f "[%%artist%% - %%title%% \[%%album%%\] %%date%%]|[%%file%%]" current) #[fg=white]%a %d %b %R'
diff --git a/_vimrc b/_vimrc
index 938da27..5e3ba2a 100644
--- a/_vimrc
+++ b/_vimrc
@@ -107,6 +107,8 @@ set tabstop=2
 set shiftwidth=2
 
 " {{{ Shortcuts
+" disable ex mode
+nnoremap Q <Nop>
 " clear search
 nnoremap <Leader>c :nohl<cr>
 " NERdTree