Is my workout plan ok?

Hey Veeky Forums, I basically have a lot of free time because I have no social life, I only work on the weekends, and I'm only taking 1 summer class. I am trying to get in shape with bodyweight workouts and I think I'm doing ok for a beginner. I'm also trying to fix my diet by eating at least 4 lettuce, tomato, cucumber, and carrot salads a week, and restricting myself to 1500 calories a day. I started working out about 2 months ago and I've made some decent progression. This was my workout:

Stretch and warmup

Bodyweight squats - 15 X 3
Elbow-in pushups - 7 X 3
Situps - To failure X 2 (Current pr was about 55)

Then I'd go through my forms I learned in Taekwondo and do some cardio by shadow boxing.

Well this yesterday I incorporated a lot of exercises from startbodyweight.com so that I had a push and pull exercise for both vertical and horizontal arm motion, as well as some new tougher squats and I replaced situps with leg raises for a grand total of 6 different exercises. This workout kicked my ass and I'm still sore from it.

My question is that given my current situation, should I continue with the new exercises 3 times a week doing full body workouts? Or should I do some exercises on some days and others on other days? Any advice on tweaking my workout plan would be greatly appreciated.

>2016
>not reading the sticky

Install gentoo

I've read the sticky. I'm applying everything I know into my own personal workout plan where I don't have to go to the gym. Don't have any advice for me? Go fuck yourself with a cactus.

You don't even post what you want
Do whatever the fuck you want to do desu

Go to the damn gym

Worst bait

>'m also trying to fix my diet by eating at least 4 lettuce, tomato, cucumber, and carrot salads a week

Don't want to. Go get in a carwreck with your entire family involved.

Wow this is worse than crossfit.