import arch-desktop
Merge branch 'arch-desktop'

Conflicts:
	home/.oh-my-zsh/themes/terriblysimple.zsh-theme
	home/.vimrc
	home/.zshrc