updates

.bashrc

@@ -26,10 +26,6 @@ PS1="\[\e[1;32m\]\h:\W \u$\[\e[0m\] "
 bind '"\e[A": history-search-backward'
 bind '"\e[B": history-search-forward'
 
-if [ -f `brew --prefix`/etc/bash_completion ]; then
-  . `brew --prefix`/etc/bash_completion
-fi
-
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion

.gitconfig

@@ -39,14 +39,14 @@
     cmd = code --wait --diff $LOCAL $REMOTE
 
 [alias]
-    gp = push
-    gpp = publish
+    p = push
+    pp = publish
     rb = pull --rebase
     rbc = rebase --continue
     rba = rebase --abort
     fancy-log = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --date=relative
     branches = for-each-ref --count=10 --sort='-authordate:iso8601' --format=' %(color:green)%(authordate:relative) %09%(color:white)%(objectname:short) %(color:yellow)%(refname:short) %09%(color:white)%(upstream:track) %(contents:subject)' refs/heads --no-merged
-    edit-conflicted = ! git diff --name-only | uniq | xargs code
+    edit-conflicted = ! git diff --name-only | uniq | xargs $(echo $EDITOR)
     history = log -p --
 	pushf = push --force-with-lease
     pullall = ! git pull && git submodule update --init --recursive --remote

.rc.d/aliases.sh

@@ -48,4 +48,3 @@ alias branchpr="git checkout -b fix/grrowl-\$(date +%s) && gh pr create -w"
 
 # generate password
 alias pwgen="openssl rand -base64"
-

.rc.d/lazy-nvm.sh

@@ -13,10 +13,6 @@ function lazy_nvm {
     [ -s "$(brew --prefix nvm)/nvm.sh" ] && source $(brew --prefix nvm)/nvm.sh # osx
     [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # nvm bash_completion
   fi
-  # node-prototype-repl (node >13)
-  if [[ -n "$(command -v node-prototype-repl)" ]]; then
-    export NODE_REPL_EXTERNAL_MODULE=$(which node-prototype-repl)
-  fi
 }
 
 # aliases

.zshrc.d/zgen.zsh

@@ -20,6 +20,7 @@ if ! zgen saved; then
     zsh-users/zsh-syntax-highlighting
     zdharma/history-search-multi-word
     zsh-users/zsh-history-substring-search
+    buonomo/yarn-completion
 
 EOPLUGINS
   # ^ can't indent this EOPLUGINS
@@ -71,6 +72,7 @@ ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE="60"
 # customise zsh-history-substring-search
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND="underline"
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND="none"
+HISTORY_SUBSTRING_SEARCH_FUZZY="yes"
 
 # customise zsh-syntax-highlighting
 ZSH_HIGHLIGHT_STYLES[unknown-token]='none'