diff --git a/.xinitrc b/.xinitrc
index 6f51e33..37dd93c 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,4 @@
-# -*- mode: shell-script -*-
+# -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*-
 
 # -----[ Set background ]---------------------------------------------
 hsetroot -center ~/pictures/wallpapers/2960x1050/wallpaper-680196.jpg
@@ -9,6 +9,7 @@ xmodmap ~/.Xmodmap
 # -----[ Start some programs ]----------------------------------------
 conky
 numlockx &
+emacs --daemon
 
 # mpdscribble
 pidof mpdscribble >& /dev/null