diff --git a/aliases b/aliases index 327b8fe..3b26211 100644 --- a/aliases +++ b/aliases @@ -392,8 +392,6 @@ if [[ $platform == 'Darwin' ]]; then alias tt='rmtrash' elif [[ "${platform,,}" == *'ming'* ]]; then # convert to lowercase then compare with wildcard - alias python='winpty python.exe' - alias python3='winpty python.exe' #alias rm='echo "use trash command instead!"' #alias rmr='echo "use trash command instead!"' alias trash='remove_windows_file' @@ -401,8 +399,6 @@ elif [[ "${platform,,}" == *'ming'* ]]; then # convert to lowercase then compare alias cgrep='cgrep.exe' fi -alias c='cd' -alias c-='cd -' alias cd-='echo "Use c- instead"' alias ..='cd ../' alias ...='cd ../..' diff --git a/env.loader b/env.loader index 84fe2a8..b8a555b 100644 --- a/env.loader +++ b/env.loader @@ -13,13 +13,13 @@ esac export PLATFORM=$platform export PLATFORM_OS=$platform_os -test -f "$HOME/.env.platform" && . $HOME/.env.platform -test -f "$HOME/.env.common" && . $HOME/.env.common -test -f "$HOME/.env.private" && . $HOME/.env.private -test -f "$HOME/.aliases" && . $HOME/.aliases -test -f "$HOME/.aliases.common" && . $HOME/.aliases.common -test -f "$HOME/.aliases.private" && . $HOME/.aliases.private - +test -f "$HOME/.env.platform" && . "$HOME/.env.platform" +test -f "$HOME/.env.common-pre" && . "$HOME/.env.common-pre" +test -f "$HOME/.env.private" && . "$HOME/.env.private" +test -f "$HOME/.env.common-post" && . "$HOME/.env.common-post" +test -f "$HOME/.aliases" && . "$HOME/.aliases" +test -f "$HOME/.aliases.common" && . "$HOME/.aliases.common" +test -f "$HOME/.aliases.private" && . "$HOME/.aliases.private" test -d "$HOME/bin" && export PATH=$HOME/bin/:$PATH test -d "$HOME/.dotfiles/bin" && export PATH=$HOME/.dotfiles/bin/:$PATH