Reorganize bash startup files and minor fixes.

- Move PATH exports to .env
- Move aliases to .env
- Avoid loading .env twice
- Load .bashrc only on login shell and bash only

1 files changed, 18 insertions, 0 deletions

diff --git a/.env b/.env
index d3f8923..ecf316c 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
+# .env
 PS1='$(prompt)'
 
 if [ -z "${SSH_AGENT_PID}" ]; then
@@ -25,8 +26,25 @@ alias githome='git --git-dir ~/.githome --work-tree ~'
 
 alias ls='ls --color -A --group-directories-first --sort=extension'
 alias recent='ls -ltch'
+alias gl='git pull'
+alias gcm='git checkout master'
+alias gco='git checkout'
+alias gst='git status'
 
 # Use correct TTY for GPG Pinentry
 export GPG_TTY="$(tty)"
 gpg-connect-agent updatestartuptty /bye >/dev/null
 export TERM=xterm
+export PATH=$HOME/.local/bin:$PATH
+export PATH=$HOME/.local/bin/`hostname`:$PATH
+export PATH=$HOME/.local/bin/`uname -m`:$PATH
+export PATH=$HOME/.cargo/bin:$PATH
+export GOPATH="$HOME/.local/share/go"
+export PATH=$GOPATH/bin:$PATH
+export PATH=$HOME/.local/bin:$PATH
+export PATH=$HOME/.local/bin/`hostname`:$PATH
+export PATH=$HOME/.local/bin/`uname -m`:$PATH
+export PATH=$HOME/.cargo/bin:$PATH
+export GOPATH="$HOME/.local/share/go"
+export PATH=$GOPATH/bin:$PATH
+