diff --git a/.zsh/aliases.zsh b/.zsh/aliases.zsh index 9edfc8b..16d1aa8 100644 --- a/.zsh/aliases.zsh +++ b/.zsh/aliases.zsh @@ -2,7 +2,6 @@ alias \ wget='wget -c' \ zshrc='source ~/.zshrc' \ dps='docker ps -a --format "table {{.Names}}\t{{.Image}}\t{{.Status}}"' \ - c='docker compose' \ lla='ls -lha' \ cp='cp -iv' \ rm='rm -iv' \ diff --git a/.zsh/path.zsh b/.zsh/path.zsh index 234d0a0..0f2c779 100644 --- a/.zsh/path.zsh +++ b/.zsh/path.zsh @@ -8,4 +8,5 @@ grep -q 'npm' <<< $devTools && export PATH="$PATH:$HOME/.local/npm/bin" grep -q 'GO' <<< $devTools && export PATH="$PATH:$(go env GOPATH)/bin" grep -q 'android' <<< $devTools && export ANDROID_SDK_ROOT="$HOME/.android-sdk" grep -q 'pulumi' <<< $devTools && export PATH="$PATH:$HOME/.pulumi/bin" +[ -n $GOPATH ] && export PATH="$GOPATH/bin:$PATH" export PATH="$PATH:$HOME/.local/bin" \ No newline at end of file diff --git a/.zshrc b/.zshrc index bb67448..8fc7495 100644 --- a/.zshrc +++ b/.zshrc @@ -34,6 +34,15 @@ else export EDITOR=vim fi +if ! iscmd docker-compose; then + alias c='docker compose' +fi + +if ! iscmd docker && iscmd podman; then + alias docker='podman' + alias c='podman-compose' +fi + if iscmd google-chrome-stable; then export BROWSER=google-chrome-stable fi