Redo dotfiles

WIP

Fixes #1 
Fixes #3