Udpate for new arch install
Merge laptop and desktop repos.

Merge branch 'master' of https://github.com/sebiva/Confs