Generate .i3-config with environment vars.
Merge branch 'nyx' of github.com:Profpatsch/dotfiles into nyx

Conflicts:
	i3/.i3/config-config
Merge branch 'nyx' into soarin
Whaaaaa.
Merge branch 'nyx' into soarin