git add -all
Merge branch 'master' of github.com:mekf/NIX_settings