I've started using i3wm
Use vim as the default mergetool in git