From 5b32a4f4e00225aea64322413e8a711aae5a9ab7 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Thu, 30 Aug 2018 17:15:59 -0500
Subject: [PATCH] All types of customisations

---
 gitconfig |  4 ++--
 vimrc     |  4 ++--
 zshrc     | 42 ++++++++++++++++++++++++++----------------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/gitconfig b/gitconfig
index a51d623..c5206ac 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,8 +5,8 @@
 	smudge = git-lfs smudge -- %f
 [user]
 	name = Spotlight
-	email = spotlight@joscomputing.space
-	signingkey = A1C731549463236D88A17111CC3F4E0080AC47A3
+  email = spotlight@joscomputing.space
+  signingkey = 6EF6CBB6420B81DA3CCACFEA874AA355B3209BDC
 [commit]
 	gpgsign = true
 [color]
diff --git a/vimrc b/vimrc
index 2999bc5..aaab4c9 100644
--- a/vimrc
+++ b/vimrc
@@ -7,8 +7,8 @@ filetype plugin indent on
 " two-spaced tabs
 set tabstop=2
 set softtabstop=0 noexpandtab
-set shiftwidth=4
-set tabstop=4 softtabstop=0 expandtab shiftwidth=2 smarttab
+set shiftwidth=2
+set tabstop=2 softtabstop=0 expandtab shiftwidth=2 smarttab
 
 " vim-airline
 let g:airline_powerline_fonts = 1
diff --git a/zshrc b/zshrc
index 4dfd603..3e80758 100644
--- a/zshrc
+++ b/zshrc
@@ -23,7 +23,6 @@ BULLETTRAIN_PROMPT_ORDER=(
   time
   status
   custom
-  context
   dir
   screen
   ruby
@@ -31,6 +30,7 @@ BULLETTRAIN_PROMPT_ORDER=(
   git
 )
 BULLETTRAIN_PROMPT_CHAR=">"
+BULLETTRAIN_DIR_BG="black"
 
 # Install plugins if there are plugins that have not been installed
 if ! zplug check --verbose; then
@@ -47,14 +47,21 @@ zplug load
 # the env _essentials_
 #########
 
-# Local stuff, homebrew python, theos
-export PATH="${HOME}/bin:${HOME}/bin/android-sdk/platform-tools:${PATH}"
+export PATH="${HOME}/bin:$PATH"
+
+# Android SDK
+if [ -d ${HOME}/bin/android-sdk ]; then
+  export PATH="${HOME}/bin/android-sdk/platform-tools:${PATH}"
+fi
 
 # Google Cloud tools
-source ${HOME}/bin/google-cloud-sdk/completion.zsh.inc
-source ${HOME}/bin/google-cloud-sdk/path.zsh.inc
+if [ -d ${HOME}/bin/google-cloud-sdk ]; then
+  source ${HOME}/bin/google-cloud-sdk/completion.zsh.inc
+  source ${HOME}/bin/google-cloud-sdk/path.zsh.inc
+fi
 
-export EDITOR=vim
+# iTerm2 integration, only if detected as installed
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
 
 # Go
 export GOPATH=${HOME}/go
@@ -63,13 +70,14 @@ export PATH=${GOPATH}/bin:${PATH}
 # theos
 export THEOS=${HOME}/.theos
 export PATH=${THEOS}/bin:$PATH
-export THEOS_DEVICE_IP=localhost THEOS_DEVICE_PORT=2222
 
 # devkitPro and the like
-export DEVKITPRO=/opt/devkitpro
-export DEVKITARM=/opt/devkitpro/devkitARM
-export DEVKITPPC=/opt/devkitpro/devkitPPC
-export PATH=/opt/devkitpro/tools/bin:$PATH
+if [ -d /opt/devkitpro ]; then
+  export DEVKITPRO=/opt/devkitpro
+  export DEVKITARM=/opt/devkitpro/devkitARM
+  export DEVKITPPC=/opt/devkitpro/devkitPPC
+  export PATH=/opt/devkitpro/tools/bin:$PATH
+fi
 
 if [ $TILIX_ID ] || [ $VTE_VERSION ]; then
         source /etc/profile.d/vte.sh
@@ -80,10 +88,10 @@ if [[ $OSTYPE == darwin* ]]; then
   export PATH="/usr/local/bin:/usr/local/sbin:${PATH}"
 fi
 
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" ]]
-# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
-export PATH="$PATH:$HOME/.rvm/bin"
-
+if [ -s $HOME/.rvm/scripts/rvm ]; then
+    source "$HOME/.rvm/scripts/rvm"
+    export PATH="$PATH:$HOME/.rvm/bin"
+fi
 
 # Adapted from https://github.com/isaacmorneau/dotfiles/blob/882f11172a2c0fd1aa7020d627d2978e5d60f6b0/.bashrc#L125-L130
 function mvsane () {
@@ -92,4 +100,6 @@ function mvsane () {
         mv "$F" $(echo "$F" | sed -r 's/[ ]+/_/g;s/[^a-zA-Z0-9_.-]//g;s/[_-]{2,}/-/g;')
     done
 }
-. "/Users/spot/bin/acme.sh.env"
+
+# Personal preferences
+export EDITOR=vim