I like the "free repositories" enabled by default with "non-free" opt-in
That's my preference. For the activist feel-good angle then stick with the libre code only default repositories. For the rest, make it easy to opt-in to the non-libre repositories. PLF for Mandriva, Metaverse for Canonical, Non-free for Debian; users retain the choice of remaining free-source only without limiting those who just want their nvidia and broadcom to work.
Keep Up with TechRepublic