`desktop-path` should include CWD.
Merge branch 'head'
Merge branch 'master' of nostdal.org:/home/fod/nostdal-stuff