From 3f022f6ea39e8d5b9d1db5f7920bdc282c200475 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 12:10:15 -0500
Subject: [PATCH 01/17] Update Brewfile

---
 Brewfile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Brewfile b/Brewfile
index 42400fb855d..1bf4990c8f7 100644
--- a/Brewfile
+++ b/Brewfile
@@ -16,19 +16,9 @@ brew 'yt-dlp'
 
 cask '1password'
 cask 'airtable'
-cask 'android-platform-tools'
 cask 'arq'
 cask 'diffusionbee'
 cask 'handbrake'
-cask 'messenger'
 cask 'notion-calendar'
-cask 'plex'
-cask 'sonos'
-cask 'transmission'
-cask 'raycast'
-cask 'warp'
-cask 'whatsapp'
 cask 'visual-studio-code'
-cask 'vlc'
-cask 'zed'
-cask 'zoom'
+cask 'zed'
\ No newline at end of file

From 0a7491600f34200eb12adb3eead8e4f6ac5a1a58 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 12:10:38 -0500
Subject: [PATCH 02/17] Update git configs

---
 git/gitconfig.symlink | 7 +++++++
 git/gitignore.symlink | 1 +
 2 files changed, 8 insertions(+)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 7f0647ba36f..1f33f7cf334 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -9,6 +9,10 @@
         wtf     = !$ZSH/bin/git-wtf
         rank-contributors = !$ZSH/bin/git-rank-contributors
         count   = !git shortlog -sn
+		pushd   = push -u origin HEAD
+		open    = "!f(){ open https://github.$(git config remote.origin.url | cut -f2 -d. | tr ':' /); }; f"
+		# Switch to a branch, creating it if necessary
+		go      = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
 [color]
         diff = auto
         status = auto
@@ -38,3 +42,6 @@
 
 [init]
 	defaultBranch = main
+
+[url "ssh://git@github.com/sendgrid"]
+	insteadOf = https://github.com/sendgrid
\ No newline at end of file
diff --git a/git/gitignore.symlink b/git/gitignore.symlink
index 6fd41c0f56e..0b31fb55342 100644
--- a/git/gitignore.symlink
+++ b/git/gitignore.symlink
@@ -1,3 +1,4 @@
 .DS_Store
 *~
 *.swp
+.vscode/*
\ No newline at end of file

From e8c1338cd75475d2c656249e875008f669c1859f Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 12:10:59 -0500
Subject: [PATCH 03/17] Update pubkey

---
 system/keys.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/keys.zsh b/system/keys.zsh
index cf4fe31501d..05aab016905 100644
--- a/system/keys.zsh
+++ b/system/keys.zsh
@@ -1,2 +1,2 @@
 # Pipe my public key to my clipboard.
-alias pubkey="more ~/.ssh/id_rsa.pub | pbcopy | echo '=> Public key copied to pasteboard.'"
+alias pubkey="more ~/.ssh/id_ed25519.pub | pbcopy | echo '=> Public key copied to pasteboard.'"

From a63aebd130f69ae51aefa8e3e99af3b7025512a5 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 12:11:12 -0500
Subject: [PATCH 04/17] Add goto

---
 functions/goto | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 functions/goto

diff --git a/functions/goto b/functions/goto
new file mode 100644
index 00000000000..82bb56746c7
--- /dev/null
+++ b/functions/goto
@@ -0,0 +1,75 @@
+#
+# Go to a <repo> in ~/dev
+#
+
+goto() {
+  GO_DEFAULT=sendgrid
+
+  #
+  # The brains behind goto
+  #
+
+  nav() {
+    cd ~/dev/src/github.com/$1 &> /dev/null ||
+    clone $1 2> /dev/null ||
+    echo "repo @ $1 does not exist"
+  }
+
+  #
+  # Bash completion for goto()
+  #
+
+  _goto()
+  {
+    cur=${COMP_WORDS[COMP_CWORD]}
+    if [[ "$cur" =~ ^([^/]+)/(.+)$ ]]; then
+      use=`tree -f -L 1 ~/dev/src/github.com/ccnixon/ | grep ${BASH_REMATCH[2]} | tr / '\t' | awk '{print $(NF-1),$NF}' | tr ' ' /`
+    else
+      use=`ls ~/dev/src/github.com/$GO_DEFAULT/ | grep $cur`
+    fi
+    COMPREPLY=(`compgen -W "$use" -- $cur`)
+  }
+
+  if hash complete 2>/dev/null; then
+    complete -o default -o nospace -F _goto goto
+  fi
+
+  if hash shopt 2>/dev/null; then
+    shopt -s cdspell
+  fi
+
+  case $1 in
+
+    */*)
+      nav $1
+    ;;
+
+    *)
+      nav $GO_DEFAULT/$1
+    ;;
+
+  esac
+
+  if hash shopt 2>/dev/null; then
+    shopt -s cdspell
+  fi
+
+}
+
+#
+# Clone a <repo ...> by "owner/name" into ~/dev
+#
+
+clone() {
+  for repo in $@; do
+		if [[ "$repo" == */* ]]; then
+		  local dir=$GOPATH/src/github.com/$repo
+		  git clone ssh://git@github.com/$repo.git $dir
+		  cd $dir
+	  else
+		  local dir=$GOPATH/src/github.com/$USER_DEFAULT/$repo
+		  git clone ssh://git@github.com/$USER_DEFAULT/$repo.git $dir
+		  cd $dir
+	  fi
+  done
+}
\ No newline at end of file

From af97808dd0d6a1adc1e32fc45d12238bda52bc14 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 12:11:27 -0500
Subject: [PATCH 05/17] Add go directory

---
 go/config.zsh | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 go/config.zsh

diff --git a/go/config.zsh b/go/config.zsh
new file mode 100644
index 00000000000..06c8754f1ec
--- /dev/null
+++ b/go/config.zsh
@@ -0,0 +1,2 @@
+export GOPATH=~/Code
+export PATH=$PATH:$GOPATH/bin
\ No newline at end of file

From 93a6c4a6931d906fb0e3c4e6256acbe8ef991d9d Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 12:22:06 -0500
Subject: [PATCH 06/17] Update zsh config

---
 bin/dot           | 10 +++---
 bin/set-defaults  |  4 +--
 system/_path.zsh  |  2 +-
 zsh/config.zsh    |  4 +--
 zsh/fpath.zsh     |  2 +-
 zsh/prompt.zsh    | 77 -----------------------------------------------
 zsh/zshrc.symlink | 14 ++++++---
 7 files changed, 21 insertions(+), 92 deletions(-)
 delete mode 100644 zsh/prompt.zsh

diff --git a/bin/dot b/bin/dot
index d84a178a29b..1701951cc00 100755
--- a/bin/dot
+++ b/bin/dot
@@ -42,16 +42,16 @@ export ZSH=$HOME/.dotfiles
 
 # Update dotfiles themselves
 echo "› git pull"
-git -C $ZSH pull
+git -C $ZSHDOT pull
 
 # Set macOS defaults
-$ZSH/macos/set-defaults.sh
+$ZSHDOT/macos/set-defaults.sh
 
 # Set macOS hostname
-$ZSH/macos/set-hostname.sh
+$ZSHDOT/macos/set-hostname.sh
 
 # Install homebrew
-$ZSH/homebrew/install.sh 2>&1
+$ZSHDOT/homebrew/install.sh 2>&1
 
 # Upgrade homebrew
 echo "› brew update"
@@ -62,4 +62,4 @@ brew upgrade
 
 # Install software
 echo "› script/install"
-$ZSH/script/install
+$ZSHDOT/script/install
diff --git a/bin/set-defaults b/bin/set-defaults
index 333859619a8..2c81db46509 100755
--- a/bin/set-defaults
+++ b/bin/set-defaults
@@ -1,5 +1,5 @@
 #!/bin/sh
 #
-# Sets macOS defaults by running $ZSH/macos/set-defaults.sh.
+# Sets macOS defaults by running $ZSHDOT/macos/set-defaults.sh.
 
-exec $ZSH/macos/set-defaults.sh
+exec $ZSHDOT/macos/set-defaults.sh
diff --git a/system/_path.zsh b/system/_path.zsh
index 255c2cfca66..fcc99d2a464 100644
--- a/system/_path.zsh
+++ b/system/_path.zsh
@@ -1,2 +1,2 @@
-export PATH="./bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
+export PATH="./bin:/usr/local/bin:/usr/local/sbin:$ZSHDOT/bin:$PATH"
 export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
diff --git a/zsh/config.zsh b/zsh/config.zsh
index 8ca7389e218..9cbb9270694 100644
--- a/zsh/config.zsh
+++ b/zsh/config.zsh
@@ -1,9 +1,9 @@
 export LSCOLORS="exfxcxdxbxegedabagacad"
 export CLICOLOR=true
 
-fpath=($ZSH/functions $fpath)
+fpath=($ZSHDOT/functions $fpath)
 
-autoload -U $ZSH/functions/*(:t)
+autoload -U $ZSHDOT/functions/*(:t)
 
 HISTFILE=~/.zsh_history
 HISTSIZE=10000
diff --git a/zsh/fpath.zsh b/zsh/fpath.zsh
index eaff4f41b0b..cf8a46d3c94 100644
--- a/zsh/fpath.zsh
+++ b/zsh/fpath.zsh
@@ -1,2 +1,2 @@
 #add each topic folder to fpath so that they can add functions and completion scripts
-for topic_folder ($ZSH/*) if [ -d $topic_folder ]; then  fpath=($topic_folder $fpath); fi;
+for topic_folder ($ZSHDOT/*) if [ -d $topic_folder ]; then  fpath=($topic_folder $fpath); fi;
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
deleted file mode 100644
index d35b8c53f5c..00000000000
--- a/zsh/prompt.zsh
+++ /dev/null
@@ -1,77 +0,0 @@
-autoload colors && colors
-# cheers, @ehrenmurdick
-# http://github.com/ehrenmurdick/config/blob/master/zsh/prompt.zsh
-
-if (( $+commands[git] ))
-then
-  git="$commands[git]"
-else
-  git="/usr/bin/git"
-fi
-
-git_branch() {
-  echo $($git symbolic-ref HEAD 2>/dev/null | awk -F/ {'print $NF'})
-}
-
-git_dirty() {
-  if $(! $git status -s &> /dev/null)
-  then
-    echo ""
-  else
-    if [[ $($git status --porcelain) == "" ]]
-    then
-      echo "on %{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}"
-    else
-      echo "on %{$fg_bold[red]%}$(git_prompt_info)%{$reset_color%}"
-    fi
-  fi
-}
-
-git_prompt_info () {
- ref=$($git symbolic-ref HEAD 2>/dev/null) || return
-# echo "(%{\e[0;33m%}${ref#refs/heads/}%{\e[0m%})"
- echo "${ref#refs/heads/}"
-}
-
-# This assumes that you always have an origin named `origin`, and that you only
-# care about one specific origin. If this is not the case, you might want to use
-# `$git cherry -v @{upstream}` instead.
-need_push () {
-  if [ $($git rev-parse --is-inside-work-tree 2>/dev/null) ]
-  then
-    number=$($git cherry -v origin/$(git symbolic-ref --short HEAD) 2>/dev/null | wc -l | bc)
-
-    if [[ $number == 0 ]]
-    then
-      echo " "
-    else
-      echo " with %{$fg_bold[magenta]%}$number unpushed%{$reset_color%}"
-    fi
-  fi
-}
-
-directory_name() {
-  echo "%{$fg_bold[cyan]%}%1/%\/%{$reset_color%}"
-}
-
-battery_status() {
-  if test ! "$(uname)" = "Darwin"
-  then
-    exit 0
-  fi
-
-  if [[ $(sysctl -n hw.model) == *"Book"* ]]
-  then
-    $ZSH/bin/battery-status
-  fi
-}
-
-export PROMPT=$'\n$(battery_status)in $(directory_name) $(git_dirty)$(need_push)\n› '
-set_prompt () {
-  export RPROMPT="%{$fg_bold[cyan]%}%{$reset_color%}"
-}
-
-precmd() {
-  title "zsh" "%m" "%55<...<%~"
-  set_prompt
-}
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index e3ade6421bc..5c3cbeb75e0 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -1,8 +1,14 @@
-# shortcut to this dotfiles path is $ZSH
-export ZSH=$HOME/.dotfiles
+# shortcut to this dotfiles path is $ZSHDOT
+export ZSHDOT=$HOME/.dotfiles
+export ZSH="/Users/cnixon/.oh-my-zsh"
 
 # your project folder that we can `c [tab]` to
-export PROJECTS=~/Code
+export PROJECTS=~/Code/src/github.com/
+
+ZSH_THEME="robbyrussell"
+
+plugins=(git)
+source $ZSH/oh-my-zsh.sh
 
 # Stash your environment variables in ~/.localrc. This means they'll stay out
 # of your main dotfiles repository (which may be public, like this one), but
@@ -14,7 +20,7 @@ fi
 
 # all of our zsh files
 typeset -U config_files
-config_files=($ZSH/**/*.zsh)
+config_files=($ZSHDOT/**/*.zsh)
 
 # load the path files
 for file in ${(M)config_files:#*/path.zsh}

From e3f25a6187cbbd31d3c750a4660cb8f9e78084d2 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 12:24:32 -0500
Subject: [PATCH 07/17] Update git colors

---
 git/gitconfig.symlink | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 1f33f7cf334..e763d50de75 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -5,19 +5,26 @@
         protocol = https
 [alias]
         co = checkout
-        promote = !$ZSH/bin/git-promote
-        wtf     = !$ZSH/bin/git-wtf
-        rank-contributors = !$ZSH/bin/git-rank-contributors
+        promote = !$ZSHDOT/bin/git-promote
+        wtf     = !$ZSHDOT/bin/git-wtf
+        rank-contributors = !$ZSHDOT/bin/git-rank-contributors
         count   = !git shortlog -sn
 		pushd   = push -u origin HEAD
 		open    = "!f(){ open https://github.$(git config remote.origin.url | cut -f2 -d. | tr ':' /); }; f"
 		# Switch to a branch, creating it if necessary
 		go      = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
-[color]
-        diff = auto
-        status = auto
-        branch = auto
-        ui = true
+[color "diff"]
+
+	meta = yellow bold
+	frag = magenta bold # line info
+	old = red # deletions
+	new = green # additions
+
+[color "status"]
+
+	added = yellow
+	changed = green
+	untracked = cyan
 [core]
         excludesfile = ~/.gitignore
         editor = vim

From 1246af20befcce99a5ee9a41f0b488916b055af6 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 15:43:13 -0500
Subject: [PATCH 08/17] Add secrets directory for sensitve stuff

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

diff --git a/.gitignore b/.gitignore
index bbb3a495c22..98309ba96ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 git/gitconfig.local.symlink
 Brewfile.lock.json
+secrets/
\ No newline at end of file

From dba1e83542025fc5721f99022f29b3c1defab7e1 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 15:43:39 -0500
Subject: [PATCH 09/17] Update brewfile

---
 Brewfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index 1bf4990c8f7..aa128ce0148 100644
--- a/Brewfile
+++ b/Brewfile
@@ -1,6 +1,7 @@
 cask_args appdir: '/Applications'
 
 tap 'homebrew/bundle'
+tap 'blendle/blendle'
 
 brew 'cloudflared'
 brew 'imagemagick'
@@ -13,6 +14,8 @@ brew 'stripe/stripe-cli/stripe'
 brew 'stripe/stripe-mock/stripe-mock'
 brew 'wget'
 brew 'yt-dlp'
+brew 'awscli'
+brew 'kns'
 
 cask '1password'
 cask 'airtable'
@@ -21,4 +24,7 @@ cask 'diffusionbee'
 cask 'handbrake'
 cask 'notion-calendar'
 cask 'visual-studio-code'
-cask 'zed'
\ No newline at end of file
+cask 'zed'
+
+# work stuff
+tap 'sendgrid-ops/workstation'
\ No newline at end of file

From 351df8b418fa11b1ae2127157ad579d8040bef65 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Mon, 24 Jun 2024 15:43:51 -0500
Subject: [PATCH 10/17] Use homebrew ruby

---
 ruby/rbenv.zsh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ruby/rbenv.zsh b/ruby/rbenv.zsh
index cb93d589d6a..f41728703da 100644
--- a/ruby/rbenv.zsh
+++ b/ruby/rbenv.zsh
@@ -3,3 +3,8 @@ if (( $+commands[rbenv] ))
 then
   eval "$(rbenv init -)"
 fi
+
+if [ -d "/opt/homebrew/opt/ruby/bin" ]; then
+  export PATH=/opt/homebrew/opt/ruby/bin:$PATH
+  export PATH=`gem environment gemdir`/bin:$PATH
+fi

From 79d25c9a7ca39ea3944632f26d4f27640dfbc34d Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Tue, 25 Jun 2024 14:30:40 -0500
Subject: [PATCH 11/17] Add sendgrid exports

---
 sendgrid/exports.zsh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 sendgrid/exports.zsh

diff --git a/sendgrid/exports.zsh b/sendgrid/exports.zsh
new file mode 100644
index 00000000000..c97ce9c406a
--- /dev/null
+++ b/sendgrid/exports.zsh
@@ -0,0 +1 @@
+export BOOTSTRAP_SCRIPT_DIR=/Users/cnixon/Code/src/github.com/sendgrid/sg-workstation/scripts
\ No newline at end of file

From 738088072cc9c4a54161ef014ca90415d911656b Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Tue, 25 Jun 2024 14:30:57 -0500
Subject: [PATCH 12/17] Update goto

---
 functions/goto | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/functions/goto b/functions/goto
index 82bb56746c7..3055e88c8da 100644
--- a/functions/goto
+++ b/functions/goto
@@ -1,5 +1,5 @@
 #
-# Go to a <repo> in ~/dev
+# Go to a <repo> in ~/Code
 #
 
 goto() {
@@ -10,7 +10,7 @@ goto() {
   #
 
   nav() {
-    cd ~/dev/src/github.com/$1 &> /dev/null ||
+    cd ~/Code/src/github.com/$1 &> /dev/null ||
     clone $1 2> /dev/null ||
     echo "repo @ $1 does not exist"
   }
@@ -23,9 +23,9 @@ goto() {
   {
     cur=${COMP_WORDS[COMP_CWORD]}
     if [[ "$cur" =~ ^([^/]+)/(.+)$ ]]; then
-      use=`tree -f -L 1 ~/dev/src/github.com/ccnixon/ | grep ${BASH_REMATCH[2]} | tr / '\t' | awk '{print $(NF-1),$NF}' | tr ' ' /`
+      use=`tree -f -L 1 ~/Code/src/github.com/ccnixon/ | grep ${BASH_REMATCH[2]} | tr / '\t' | awk '{print $(NF-1),$NF}' | tr ' ' /`
     else
-      use=`ls ~/dev/src/github.com/$GO_DEFAULT/ | grep $cur`
+      use=`ls ~/Code/src/github.com/$GO_DEFAULT/ | grep $cur`
     fi
     COMPREPLY=(`compgen -W "$use" -- $cur`)
   }
@@ -57,7 +57,7 @@ goto() {
 }
 
 #
-# Clone a <repo ...> by "owner/name" into ~/dev
+# Clone a <repo ...> by "owner/name" into ~/Code
 #
 
 clone() {

From b7a2f2f7e5a61c8824e037678ab94f8dbb33ca58 Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Tue, 25 Jun 2024 14:31:13 -0500
Subject: [PATCH 13/17] Update diff tool

---
 git/gitconfig.symlink | 56 +++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index e763d50de75..e96d7338870 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -1,54 +1,54 @@
 # Local/private config goes in the include
 [include]
-        path = ~/.gitconfig.local
+	path = ~/.gitconfig.local
 [hub]
-        protocol = https
+	protocol = https
 [alias]
-        co = checkout
-        promote = !$ZSHDOT/bin/git-promote
-        wtf     = !$ZSHDOT/bin/git-wtf
-        rank-contributors = !$ZSHDOT/bin/git-rank-contributors
-        count   = !git shortlog -sn
-		pushd   = push -u origin HEAD
-		open    = "!f(){ open https://github.$(git config remote.origin.url | cut -f2 -d. | tr ':' /); }; f"
-		# Switch to a branch, creating it if necessary
-		go      = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
+	co = checkout
+	promote = !$ZSHDOT/bin/git-promote
+	wtf     = !$ZSHDOT/bin/git-wtf
+	rank-contributors = !$ZSHDOT/bin/git-rank-contributors
+	count   = !git shortlog -sn
+	pushd   = push -u origin HEAD
+	open    = "!f(){ open https://github.$(git config remote.origin.url | cut -f2 -d. | tr ':' /); }; f"
+	# Switch to a branch, creating it if necessary
+	go      = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
 [color "diff"]
-
 	meta = yellow bold
 	frag = magenta bold # line info
 	old = red # deletions
 	new = green # additions
-
 [color "status"]
-
 	added = yellow
 	changed = green
 	untracked = cyan
 [core]
-        excludesfile = ~/.gitignore
-        editor = vim
+	excludesfile = ~/.gitignore
+	editor = vim
+	pager = delta --line-numbers
+[delta]
+	side-by-side = true
 [apply]
-        whitespace = nowarn
+    whitespace = nowarn
 [mergetool]
-        keepBackup = false
+    keepBackup = false
 [difftool]
-        prompt = false
+    prompt = false
 [help]
-        autocorrect = 1
+    autocorrect = 1
 [push]
-        # See `git help config` (search for push.default)
-        # for more information on different options of the below setting.
-        #
-        # Setting to git 2.0 default to suppress warning message
-        default = simple
+	# See `git help config` (search for push.default)
+	# for more information on different options of the below setting.
+	#
+	# Setting to git 2.0 default to suppress warning message
+	default = simple
 [credential]
 	helper = osxkeychain
 [diff "spaceman-diff"]
   command = /opt/homebrew/bin/spaceman-diff
-
 [init]
 	defaultBranch = main
-
 [url "ssh://git@github.com/sendgrid"]
-	insteadOf = https://github.com/sendgrid
\ No newline at end of file
+	insteadOf = https://github.com/sendgrid
+[url "git@github.com:"]
+	insteadOf = https://github.com/

From 82c5ea5a6ae7833141fdc9daeec98bef70702f0b Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Tue, 25 Jun 2024 14:31:37 -0500
Subject: [PATCH 14/17] Update go exports

---
 go/config.zsh | 3 ++-
 go/path.zsh   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 go/path.zsh

diff --git a/go/config.zsh b/go/config.zsh
index 06c8754f1ec..23bcffe5b54 100644
--- a/go/config.zsh
+++ b/go/config.zsh
@@ -1,2 +1,3 @@
 export GOPATH=~/Code
-export PATH=$PATH:$GOPATH/bin
\ No newline at end of file
+export GOPRIVATE=github.com/sendgrid/*,github.com/sendgrid-ops/*,code.hq.twilio.com/*
+export GOBIN=$GOPATH/bin
\ No newline at end of file
diff --git a/go/path.zsh b/go/path.zsh
new file mode 100644
index 00000000000..beb9e4fdf06
--- /dev/null
+++ b/go/path.zsh
@@ -0,0 +1 @@
+export PATH=$PATH:$GOPATH/bin
\ No newline at end of file

From 7d1f7bd902a4ce4cae80d35b3811dbe45847611d Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Tue, 25 Jun 2024 14:32:22 -0500
Subject: [PATCH 15/17] Update gemrc

---
 ruby/gemrc.symlink | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ruby/gemrc.symlink b/ruby/gemrc.symlink
index 63e8ac20eba..27716c46716 100644
--- a/ruby/gemrc.symlink
+++ b/ruby/gemrc.symlink
@@ -1,6 +1,12 @@
---- 
+---
+:backtrace: false
+:bulk_threshold: 1000
+:sources:
+- https://rubygems.org/
+- https://gems.sendgrid.net
 :update_sources: true
 :verbose: true
-:backtrace: false
-:benchmark: false
-gem: --no-document
+install: "--user --no-document"
+update: "--user --no-document"
+benchmark: false
+gem: "--no-document"

From 2b42f28d2445b940fa61c99dcf75429361bd1fab Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Tue, 25 Jun 2024 14:32:35 -0500
Subject: [PATCH 16/17] Update pubkey alias

---
 system/keys.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/keys.zsh b/system/keys.zsh
index 05aab016905..cf4fe31501d 100644
--- a/system/keys.zsh
+++ b/system/keys.zsh
@@ -1,2 +1,2 @@
 # Pipe my public key to my clipboard.
-alias pubkey="more ~/.ssh/id_ed25519.pub | pbcopy | echo '=> Public key copied to pasteboard.'"
+alias pubkey="more ~/.ssh/id_rsa.pub | pbcopy | echo '=> Public key copied to pasteboard.'"

From 04ef70f19766aed2608db09b118ae8282770d56f Mon Sep 17 00:00:00 2001
From: ccnixon <cnixon@twilio.com>
Date: Tue, 25 Jun 2024 14:33:16 -0500
Subject: [PATCH 17/17] Add dotfiles alias

---
 zsh/aliases.zsh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index b88e3aa5a1b..9a55ba23621 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -1,3 +1,5 @@
 alias reload!='. ~/.zshrc'
 
 alias cls='clear' # Good 'ol Clear Screen command
+
+alias dotfiles='code ~/.dotfiles' # Open dotfiles
\ No newline at end of file