Move most things to the user config
Merge branch 'master' of github.com:ttuegel/nixos-configuration

Conflicts:
	common.nix