Revert "Simplify emacs dotfiles"

This reverts commit 9501fb5f2625023370ff7a40cfb2e7f2c2a6deaa.