Fix interactive aptitude installation
Add dotfiles from root and non-home dir
Refactor