From 1e6eb57cc1fa18c0cd06e671585fee9afe93c056 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@zefr.com>
Date: Mon, 1 Aug 2022 09:04:24 -0700
Subject: [PATCH 1/4] ok

---
 dotfiles/bash/bashrc      | 5 +++++
 dotfiles/global_gitignore | 1 +
 2 files changed, 6 insertions(+)

diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc
index b9e30ee..4133619 100644
--- a/dotfiles/bash/bashrc
+++ b/dotfiles/bash/bashrc
@@ -192,3 +192,8 @@ fi
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
 . "$HOME/.cargo/env"
+
+if [ -f "~/.private" ]; then
+	source ~/.private
+fi
+
diff --git a/dotfiles/global_gitignore b/dotfiles/global_gitignore
index 75e9025..121c0c3 100644
--- a/dotfiles/global_gitignore
+++ b/dotfiles/global_gitignore
@@ -38,6 +38,7 @@ tramp
 
 # Notes file I tend to leave in projects
 project-notes.org
+todo.org
 
 # Recent files
 recentf

From 951764555bd500d4b8189ab34e0aa5282e03a08f Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@zefr.com>
Date: Mon, 1 Aug 2022 09:23:13 -0700
Subject: [PATCH 2/4] patch up zshrc to work on other computers

---
 dotfiles/zsh/exports.zsh |  9 +++++++--
 dotfiles/zsh/zshrc       | 27 ++++++++++++++-------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/dotfiles/zsh/exports.zsh b/dotfiles/zsh/exports.zsh
index f588ee4..b2fab00 100644
--- a/dotfiles/zsh/exports.zsh
+++ b/dotfiles/zsh/exports.zsh
@@ -29,5 +29,10 @@ export HISTCONTROL=ignoredups
 # If go is installed, set the $GOPATH to the projects directory created above.
 if which go > /dev/null; then export GOPATH=$HOME/.go; fi
 	
-export PATH="$PATH:$HOME/.rvm/bin"
-. "$HOME/.cargo/env"
+if [ -d "$HOME/.rvm" ]; then
+	export PATH="$PATH:$HOME/.rvm/bin"
+fi
+
+if [ -f "$HOME/.cargo/env" ]; then
+	. "$HOME/.cargo/env"
+fi
diff --git a/dotfiles/zsh/zshrc b/dotfiles/zsh/zshrc
index b56f9f9..b76b664 100644
--- a/dotfiles/zsh/zshrc
+++ b/dotfiles/zsh/zshrc
@@ -59,20 +59,21 @@ if [[ ! -d $HOME/.zsh ]]; then
   popd
 fi
 
-# Install zsh-syntax-highlighting if it doesn't exist
-if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then 
-  if ! is-at-least 4.3.11; then
-    echo "ZSH syntax highlighting requires ZSH >= 4.3.11 (current: $ZSH_VERSION)."
-  else
-    echo "Installing zsh syntax highlighting"
-    pushd
-    
-    cd $HOME/.zsh
-    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git 
-
-    popd
-  fi
+autoload -U is-at-least
 
+# Install zsh-syntax-highlighting if it doesn't exist
+if is-at-least 4.3.11; then
+	if [[ ! -d $HOME/.zsh/zsh-syntax-highlighting ]]; then 
+	    echo "Installing zsh syntax highlighting"
+	    pushd
+	    
+	    cd $HOME/.zsh
+	    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git 
+
+	    popd
+  	fi
+else
+	echo "ZSH syntax highlighting requires ZSH >= 4.3.11 (current: $ZSH_VERSION)."
 fi 
 
 zstyle ':completion:*:*:git:*' script $HOME/.zsh/git-completion.bash

From 47ff3956e09f7091b361d74c10100eefde7aebe1 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@zefr.com>
Date: Mon, 1 Aug 2022 09:43:22 -0700
Subject: [PATCH 3/4] Fix zprofile error

---
 dotfiles/zsh/zprofile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dotfiles/zsh/zprofile b/dotfiles/zsh/zprofile
index a9b7243..bba9daf 100644
--- a/dotfiles/zsh/zprofile
+++ b/dotfiles/zsh/zprofile
@@ -19,8 +19,10 @@ if hash pyenv 2>/dev/null; then
   eval "$(pyenv init -)"
 fi
 
-# Local bin 
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 test -r /home/vm/.opam/opam-init/init.sh && . /home/vm/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
-. "$HOME/.cargo/env"
+
+if [ -f "$HOME/.cargo/env" ]; then
+	. "$HOME/.cargo/env"
+fi

From 2693b8988bedc3269775dbcb34b118a884261232 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@zefr.com>
Date: Wed, 10 Aug 2022 11:45:01 -0700
Subject: [PATCH 4/4] sublime project ignores.

---
 dotfiles/global_gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dotfiles/global_gitignore b/dotfiles/global_gitignore
index 121c0c3..6de12e7 100644
--- a/dotfiles/global_gitignore
+++ b/dotfiles/global_gitignore
@@ -44,3 +44,8 @@ todo.org
 recentf
 
 .DS_Store
+
+# For pyright per-project configurations
+pyrightconfig.json
+*.sublime-project
+*.sublime-workspace