diff --git a/files/.gitconfig b/files/.gitconfig
index 5361e0b..763eef0 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -1,5 +1,6 @@
 [core]
 	excludesfile = ~/.gitignore
+    editor = "vim '+normal gg0' +startinsert"
 [user]
 	email = contact@tobast.fr
 	name = Théophile Bastian
diff --git a/files/.vim/ftplugin/cpp.vim b/files/.vim/ftplugin/cpp.vim
index 3f97984..b963641 100644
--- a/files/.vim/ftplugin/cpp.vim
+++ b/files/.vim/ftplugin/cpp.vim
@@ -1 +1 @@
-nnoremap <Leader>s :A<CR><Esc>
+nnoremap <Leader>s :w<CR><Esc>:A<CR><Esc>