This reverts commit 39e4e00f75, with fixes for the guix home issues reported and another one found while reconfiguring berlin in the subsequent commit.
39e4e00f75