merge with desktop config
Merge branch 'master' of https://github.com/aureooms/dotfiles
merge completed