Correct, the bulk of nuclear waste is from nuclear weapons development and manufacture. In power generation the containment vessel and cooling water also get irradiated. But that's not persistent waste, and doesn't require long term storage.