add java stuff back
Merge branch 'master' of github.com:edwelker/nix_conf