From cb5ad0c7f9073f578fff3c11460bf461abf2cc69 Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando@gavel.io>
Date: Tue, 22 Aug 2023 15:38:49 -0700
Subject: [PATCH 01/10] uses pnpm and nvm

---
 .zshrc | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.zshrc b/.zshrc
index 8b085b2..b928454 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,9 +1,18 @@
 # Fig pre block. Keep at the top of this file.
 [[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
+export PATH=/opt/homebrew/bin:$PATH
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 export PATH=$HOME/.deno/bin:$PATH
 export GOPATH=$HOME/.go
 
+# pnpm
+export PNPM_HOME="/Users/mando/Library/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end
+
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
 
@@ -12,6 +21,7 @@ ZSH_THEME="mrtazz" # set by `omz`
 plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
+source ~/.iterm2_shell_integration.zsh
 
 alias fp='ps aux -ww | ag $1'
 alias ctags="`brew --prefix`/bin/ctags"
@@ -19,27 +29,12 @@ alias gi='git log --all --oneline --color --decorate'
 alias gg='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short --decorate'
 alias glo='git log --oneline --no-merges master..'
 
-if [ $USE_NODE ]; then
-  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
-
-  export PATH="$HOME/.nodeenv/bin:$PATH"
-  eval "$(nodenv init -)"
-fi
-
-if [ $USE_RUBY ]; then  
-  if [[ -s $HOME/.rvm/scripts/rvm ]]; then
-    source $HOME/.rvm/scripts/rvm;
-  fi
 
-  export PATH="$HOME/.rbenv/bin:$PATH"
-  eval "$(rbenv init -)"
-
-  # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
-  export PATH="$PATH:$HOME/.rvm/bin"
-fi
+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
 
+eval "$(rbenv init - zsh)"
 
 alias ls=lsd
 alias la="ls -lah"
@@ -112,5 +107,10 @@ alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 # To download video call `yt VIDEO_ID`
 alias yt="time yt-dlp --download-archive ../downloaded.txt --merge-output-format mp4 -f \"bestvideo+bestaudio[ext=m4a]/best\" --embed-thumbnail --add-metadata --compat-options embed-thumbnail-atomicparsley -x --audio-format m4a"
 
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" || true
+
 # Fig post block. Keep at the bottom of this file.
 [[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"

From 969361a36eb8381f189143e4015112ede3dd4708 Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando@gavel.io>
Date: Mon, 11 Sep 2023 09:04:31 -0700
Subject: [PATCH 02/10] gup

---
 .zshrc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.zshrc b/.zshrc
index b928454..ab633a2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -92,6 +92,7 @@ gu() {
   git checkout $current_branch
   git merge $parent
 }
+alias gup="gu pre-production"
 
 pkg_v() {
   echo $(cat package.json \
@@ -109,8 +110,8 @@ alias yt="time yt-dlp --download-archive ../downloaded.txt --merge-output-format
 
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" || true
 
-# Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
-
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"

From 6b07afbe6a44a77664b98bac002b9774c7676c4d Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando@gavel.io>
Date: Mon, 25 Sep 2023 12:47:09 -0700
Subject: [PATCH 03/10] gum

---
 .zshrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.zshrc b/.zshrc
index ab633a2..1870b5b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -93,6 +93,7 @@ gu() {
   git merge $parent
 }
 alias gup="gu pre-production"
+alias gum="gu master"
 
 pkg_v() {
   echo $(cat package.json \

From e8260ac0d360040b4416f6a600859d0c6e7959e2 Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando@gavel.io>
Date: Fri, 1 Dec 2023 11:09:48 -0800
Subject: [PATCH 04/10] wasmtime

---
 .zshrc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.zshrc b/.zshrc
index 1870b5b..42312f7 100644
--- a/.zshrc
+++ b/.zshrc
@@ -116,3 +116,7 @@ export PATH="$PATH:$HOME/.rvm/bin"
 
 # Fig post block. Keep at the bottom of this file.
 [[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+
+export WASMTIME_HOME="$HOME/.wasmtime"
+
+export PATH="$WASMTIME_HOME/bin:$PATH"
\ No newline at end of file

From 167f1e62ba20d7d3c126d36c98666caceb42612b Mon Sep 17 00:00:00 2001
From: Armando Ortiz <>
Date: Wed, 5 Jun 2024 18:02:47 -0700
Subject: [PATCH 05/10] stuff

---
 .zshrc | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.zshrc b/.zshrc
index 42312f7..7d57b0b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,9 +1,10 @@
-# Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
+# CodeWhisperer pre block. Keep at the top of this file.
+[[ -f "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.pre.zsh" ]] && builtin source "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.pre.zsh"
 export PATH=/opt/homebrew/bin:$PATH
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 export PATH=$HOME/.deno/bin:$PATH
 export GOPATH=$HOME/.go
+export HOMEBREW_AUTO_UPDATE_SECS=86400
 
 # pnpm
 export PNPM_HOME="/Users/mando/Library/pnpm"
@@ -51,6 +52,7 @@ alias gsd="gds"
 alias wip="git add .; git commit -m 'wip'; git push origin head"
 
 alias subl="/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl"
+alias webstorm='open -na "WebStorm.app" --args "$@"'
 
 # Copies the first file of a Git Merge Conflict
 alias gmc="gs | grep UU | head -n 1 | cut -c 4- | pbcopy; pbpaste"
@@ -94,6 +96,7 @@ gu() {
 }
 alias gup="gu pre-production"
 alias gum="gu master"
+alias gbc="git branch --merged master --no-color | grep -v 'master\|pre-production' | xargs git branch -d"
 
 pkg_v() {
   echo $(cat package.json \
@@ -114,9 +117,14 @@ test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
 
-# Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
-
 export WASMTIME_HOME="$HOME/.wasmtime"
 
-export PATH="$WASMTIME_HOME/bin:$PATH"
\ No newline at end of file
+export PATH="$WASMTIME_HOME/bin:$PATH"
+
+source <(pkgx --shellcode)  #docs.pkgx.sh/shellcode
+
+
+[[ -f "$HOME/fig-export/dotfiles/dotfile.zsh" ]] && builtin source "$HOME/fig-export/dotfiles/dotfile.zsh"
+
+# CodeWhisperer post block. Keep at the bottom of this file.
+[[ -f "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.post.zsh" ]] && builtin source "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.post.zsh"

From f7b343e07d92a37ec622c6469e0b8b550347ef81 Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando.josue.og@gmail.com>
Date: Wed, 5 Jun 2024 18:11:54 -0700
Subject: [PATCH 06/10] uses pnpm and nvm

---
 .zshrc | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.zshrc b/.zshrc
index 8b085b2..b928454 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,9 +1,18 @@
 # Fig pre block. Keep at the top of this file.
 [[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
+export PATH=/opt/homebrew/bin:$PATH
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 export PATH=$HOME/.deno/bin:$PATH
 export GOPATH=$HOME/.go
 
+# pnpm
+export PNPM_HOME="/Users/mando/Library/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end
+
 # Path to your oh-my-zsh installation.
 export ZSH="$HOME/.oh-my-zsh"
 
@@ -12,6 +21,7 @@ ZSH_THEME="mrtazz" # set by `omz`
 plugins=(git)
 
 source $ZSH/oh-my-zsh.sh
+source ~/.iterm2_shell_integration.zsh
 
 alias fp='ps aux -ww | ag $1'
 alias ctags="`brew --prefix`/bin/ctags"
@@ -19,27 +29,12 @@ alias gi='git log --all --oneline --color --decorate'
 alias gg='git log --pretty=format:"%h %ad | %s%d [%an]" --graph --date=short --decorate'
 alias glo='git log --oneline --no-merges master..'
 
-if [ $USE_NODE ]; then
-  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
-
-  export PATH="$HOME/.nodeenv/bin:$PATH"
-  eval "$(nodenv init -)"
-fi
-
-if [ $USE_RUBY ]; then  
-  if [[ -s $HOME/.rvm/scripts/rvm ]]; then
-    source $HOME/.rvm/scripts/rvm;
-  fi
 
-  export PATH="$HOME/.rbenv/bin:$PATH"
-  eval "$(rbenv init -)"
-
-  # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
-  export PATH="$PATH:$HOME/.rvm/bin"
-fi
+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
 
+eval "$(rbenv init - zsh)"
 
 alias ls=lsd
 alias la="ls -lah"
@@ -112,5 +107,10 @@ alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
 # To download video call `yt VIDEO_ID`
 alias yt="time yt-dlp --download-archive ../downloaded.txt --merge-output-format mp4 -f \"bestvideo+bestaudio[ext=m4a]/best\" --embed-thumbnail --add-metadata --compat-options embed-thumbnail-atomicparsley -x --audio-format m4a"
 
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" || true
+
 # Fig post block. Keep at the bottom of this file.
 [[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+
+# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
+export PATH="$PATH:$HOME/.rvm/bin"

From 28692efbd8ad74d453b5066e4e00f0c4a7ac3618 Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando.josue.og@gmail.com>
Date: Wed, 5 Jun 2024 18:11:54 -0700
Subject: [PATCH 07/10] gup

---
 .zshrc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.zshrc b/.zshrc
index b928454..ab633a2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -92,6 +92,7 @@ gu() {
   git checkout $current_branch
   git merge $parent
 }
+alias gup="gu pre-production"
 
 pkg_v() {
   echo $(cat package.json \
@@ -109,8 +110,8 @@ alias yt="time yt-dlp --download-archive ../downloaded.txt --merge-output-format
 
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh" || true
 
-# Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
-
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
+
+# Fig post block. Keep at the bottom of this file.
+[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"

From 0a72a747bf0a9de0ecf7df812779968cf06531e5 Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando.josue.og@gmail.com>
Date: Wed, 5 Jun 2024 18:11:54 -0700
Subject: [PATCH 08/10] gum

---
 .zshrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.zshrc b/.zshrc
index ab633a2..1870b5b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -93,6 +93,7 @@ gu() {
   git merge $parent
 }
 alias gup="gu pre-production"
+alias gum="gu master"
 
 pkg_v() {
   echo $(cat package.json \

From daa4fbe28ce0250d62616c72c2d983e78f18d44d Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando.josue.og@gmail.com>
Date: Wed, 5 Jun 2024 18:11:54 -0700
Subject: [PATCH 09/10] wasmtime

---
 .zshrc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.zshrc b/.zshrc
index 1870b5b..42312f7 100644
--- a/.zshrc
+++ b/.zshrc
@@ -116,3 +116,7 @@ export PATH="$PATH:$HOME/.rvm/bin"
 
 # Fig post block. Keep at the bottom of this file.
 [[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
+
+export WASMTIME_HOME="$HOME/.wasmtime"
+
+export PATH="$WASMTIME_HOME/bin:$PATH"
\ No newline at end of file

From 3f103f493ea133d86c788d2f20c88d96d6565db3 Mon Sep 17 00:00:00 2001
From: Armando Ortiz <armando.josue.og@gmail.com>
Date: Wed, 5 Jun 2024 18:11:54 -0700
Subject: [PATCH 10/10] stuff

---
 .zshrc | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.zshrc b/.zshrc
index 42312f7..7d57b0b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,9 +1,10 @@
-# Fig pre block. Keep at the top of this file.
-[[ -f "$HOME/.fig/shell/zshrc.pre.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.pre.zsh"
+# CodeWhisperer pre block. Keep at the top of this file.
+[[ -f "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.pre.zsh" ]] && builtin source "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.pre.zsh"
 export PATH=/opt/homebrew/bin:$PATH
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 export PATH=$HOME/.deno/bin:$PATH
 export GOPATH=$HOME/.go
+export HOMEBREW_AUTO_UPDATE_SECS=86400
 
 # pnpm
 export PNPM_HOME="/Users/mando/Library/pnpm"
@@ -51,6 +52,7 @@ alias gsd="gds"
 alias wip="git add .; git commit -m 'wip'; git push origin head"
 
 alias subl="/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl"
+alias webstorm='open -na "WebStorm.app" --args "$@"'
 
 # Copies the first file of a Git Merge Conflict
 alias gmc="gs | grep UU | head -n 1 | cut -c 4- | pbcopy; pbpaste"
@@ -94,6 +96,7 @@ gu() {
 }
 alias gup="gu pre-production"
 alias gum="gu master"
+alias gbc="git branch --merged master --no-color | grep -v 'master\|pre-production' | xargs git branch -d"
 
 pkg_v() {
   echo $(cat package.json \
@@ -114,9 +117,14 @@ test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
 
-# Fig post block. Keep at the bottom of this file.
-[[ -f "$HOME/.fig/shell/zshrc.post.zsh" ]] && builtin source "$HOME/.fig/shell/zshrc.post.zsh"
-
 export WASMTIME_HOME="$HOME/.wasmtime"
 
-export PATH="$WASMTIME_HOME/bin:$PATH"
\ No newline at end of file
+export PATH="$WASMTIME_HOME/bin:$PATH"
+
+source <(pkgx --shellcode)  #docs.pkgx.sh/shellcode
+
+
+[[ -f "$HOME/fig-export/dotfiles/dotfile.zsh" ]] && builtin source "$HOME/fig-export/dotfiles/dotfile.zsh"
+
+# CodeWhisperer post block. Keep at the bottom of this file.
+[[ -f "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.post.zsh" ]] && builtin source "${HOME}/Library/Application Support/codewhisperer/shell/zshrc.post.zsh"