move env var stuff back to fish as emacs issue has been fixed