My half solution is to use a keyboard that physically feels quite different to help my brain use a different mode. The Linux keyboard is a big heavy mechanical keyboard while on the macbook I just use the built-in keyboard.
It's not a perfect solution and I still make mistakes, but it helps.
It's not a perfect solution and I still make mistakes, but it helps.