Revert "Commit desktop settings instead of laptop settings"

This reverts commit 6f0dad82e049fec26f1db0b0e5a27bcf4e7ad90a.

Conflicts:

	i3/.i3status.conf
Revert 1df51c2592 for .i3status.conf