diff --git a/commonshrc b/commonshrc
index 2b06996..0cdfe74 100644
--- a/commonshrc
+++ b/commonshrc
@@ -58,7 +58,7 @@ test -x /usr/bin/vim && export EDITOR=/usr/bin/vim
 
 export MPD_HOST=127.0.0.1 MPD_PORT=6600
 
-test -x /usr/bin/vim && alias vi=vim
+alias vi=vim
 
 test -f $HOME/.nix-profile/etc/profile.d/nix.sh && . $HOME/.nix-profile/etc/profile.d/nix.sh
 
diff --git a/gitconfig.m4 b/gitconfig.m4
index 11741ae..6d44781 100644
--- a/gitconfig.m4
+++ b/gitconfig.m4
@@ -9,4 +9,4 @@
 [push]
 	default = simple
 [credential]
-	helper = syscmd(`find /usr/share/git /usr/share/doc/git ~/.local/bin -name git-credential-gnome-keyring')
+	helper = syscmd(`find /usr/share/git /usr/share/doc/git ~/.local/bin -name git-credential-gnome-keyring || echo store')
diff --git a/vimrc b/vimrc
index fc989f3..efeb933 100644
--- a/vimrc
+++ b/vimrc
@@ -124,6 +124,7 @@ let g:haskell_conceal              = 0
 
 au syntax tex setl iskeyword+=:
 let g:syntastic_tex_checkers=['lacheck']
+let g:syntastic_scala_checkers=[]
 call tcomment#DefineType('nix', '# %s')
 
 " better paragraph object for tex files FIXME
diff --git a/zshrc b/zshrc
index 8d541ef..0d8476b 100644
--- a/zshrc
+++ b/zshrc
@@ -2,6 +2,9 @@
 
 . ~/.commonshrc
 
+# nix
+fpath+=(/run/current-system/sw/share/zsh/site-functions)
+
 # oh-my-zsh
 export ZSH=$HOME/etc/oh-my-zsh