vimp: Merge quickmarks
git: merge --no-ff by default
i3: standard volume sink for voyager