The thing is ... if you love what you are doing it doesn't matter since you will be 200% or more effective then anybody who just works 2 earn money without passion even he has better skills than you at the start.
Some people just get at certain point of their knowledge and sit there to get a payroll, while someone with passion will outperform such person in long term... its only a matter of time.
Building computers itself isn't such a secret knowledge anymore, its indeed practical but there is very limited demand on that.
Focus on programming with those language you know already but stay on track with newer languages as well.
Play with some SQL since DB's are everywhere now, also C# would be a nice addition to what you know already. Those 2 shouldn't be any problem for you since you have some background already.
After all its very hard to give you precise advices since all depends of demands on the local market you are living, so check the job offers in the area you a living or will be living, it might give you some clues about what is important or not there.
Clarion, python, C++, C#... programmer here
Btw I've also start playing with PC hardware -> networking->getting networking degree, but in the meantime at university i've found programming gets me crazy. When doing school projects i was like on drugs and now I'm still addicted