diff --git a/.bashrc b/.bashrc index cda5891..5bf90f6 100644 --- a/.bashrc +++ b/.bashrc @@ -21,18 +21,11 @@ PS1="$PURPLE\u$nc@$BLUE\H$nc:$GREEN\w$YELLOW"'$(__git_ps1)'"$nc\\n$GREEN\$$nc " export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:~/bin -export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -gpgconf --launch gpg-agent - if [ -f /usr/share/git/completion/git-prompt.sh ]; then source /usr/share/git/completion/git-prompt.sh else function __git_ps1() { echo ""; }; fi -[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc - -if [ -f ~/.bashrc.local ]; then - source ~/.bashrc.local -fi - +[ -f $HOME/.bashrc.local ] && source $HOME/.bashrc.local +[ -f $HOME/.profile ] && source $HOME/.profile diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 3895b2a..6f4430b 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -62,8 +62,7 @@ bindkey -s '^o' 'lfcd\n' autoload edit-command-line; zle -N edit-command-line bindkey '^e' edit-command-line -# Load aliases -[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc +[ -f $HOME/.profile ] && source $HOME/.profile # Load zsh-syntax-highlighting; should be last. source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null diff --git a/.profile b/.profile new file mode 100644 index 0000000..8fb7a58 --- /dev/null +++ b/.profile @@ -0,0 +1,9 @@ +# set PATH so it includes user's private bin if it exists +[ -d "$HOME/bin" ] && PATH="$HOME/bin:$PATH" + +PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH" + +[ -f "$HOME/.config/aliasrc" ] && source $HOME/.config/aliasrc + +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) +gpgconf --launch gpg-agent