Fix merge conflict

anthonyringoet · Oct 21, 2021 · b280a24 · b280a24
2 parents 2cbfa20 + 1fb1120
commit b280a24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.aliases b/.aliases
@@ -197,8 +197,9 @@ dssh() {
 
 # Usage:
 ##########
-# dcu            : docker-compose up -d
-# dcd            : docker-compose down -v
+# dcu            : docker-compose up --remove-orphans
+# dcud           : docker-compose up -d --remove-orphans
+# dcd            : docker-compose down -v --remove-orphans
 # dex <container>: execute a bash shell inside the RUNNING <container>
 # di <container> : docker inspect <container>
 # dim            : docker images
@@ -251,7 +252,8 @@ function dsr-fn {
 
 alias dc="docker-compose"
 alias dcu="docker-compose up --remove-orphans"
-alias dcd="docker-compose down -v"
+alias dcud="docker-compose up -d --remove-orphans"
+alias dcd="docker-compose down -v --remove-orphans"
 # alias dex="dex-fn"
 # alias di="di-fn"
 # alias dim="docker images"

diff --git a/.exports b/.exports
@@ -38,8 +38,8 @@ export GPG_TTY=$(tty);
 export BASH_SILENCE_DEPRECATION_WARNING=1;
 
 export NVM_DIR="$HOME/.nvm"
-  [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && . "/opt/homebrew/opt/nvm/nvm.sh"  # This loads nvm
-  [ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && . "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"  # This loads nvm bash_completion
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
 
-# brew install without updating _everything_
+# brew install without updating the entire universe
 export HOMEBREW_NO_AUTO_UPDATE=1