bring bulk of sxhkdrc up to date with upstream
laptop stuff