At a minimum all schools should have gun safety training. I'd start it in grade school with the Eddie Eagle program. My grandkids loved it; they used to go around singing the song:
Stop, don't touch
I'm Eddie Eagle, and I like you too much
to see you get hurt
that's why I say
when you see a gun
just walk away!
I would add marksmanship training too, and include ballistics in science class and story problems involving ammo stockpiling, and basic firearm maintenance and repair in shop class. And if they're going to dissect a frog in science class why not gut a squirrel instead? And then cook it in home economics. And the shooting sports would be an excellent addition too. This would be much more useful than classes on things like why everyone should hate the evil white male.