update stuff from F
Merge branch 'master' of https://github.com/famousz/myhome

Conflicts:
	.config/ibus/bus/6add063053944e799a74330aec0b5864-unix-0