initial commit

Author: cyclingwithelephants

.gitignore

@@ -6,6 +6,7 @@
 **/.zsh_history
 **/.zshrc.backup
 **/.zsh_sessions/
+**/.zcompcache/
 
 # Gcloud config, this is more of a data store
 **/gcloud
@@ -25,3 +26,6 @@
 # IntelliJ
 **/.idea/
 **/JetBrains
+
+# rclone stores credentials in configuration
+rclone

zsh/.zshenv

@@ -25,3 +25,8 @@ export PATH="$PATH:${GOPATH}/bin:${GOROOT}/bin:$HOME/bin"
 # Java
 # This allows java based apps to show (e.g. goland)
 export _JAVA_AWT_WM_NONREPARENTING=1
+
+# Save command history
+export HISTFILE=${ZDOTDIR:-$HOME}/.zsh_history
+export HISTSIZE=2000
+export SAVEHIST=1000

zsh/.zshrc

@@ -1,6 +1,7 @@
 
 
 source ${ZDOTDIR}/aliases
+source ${ZDOTDIR}/functions
 
 # This is for zsh auto completion
 autoload -Uz compinit
@@ -24,34 +25,30 @@ ssh-add ~/.ssh/personal/Adams-MBP_github 2> /dev/null
 
 [[ /usr/local/bin/kubectl ]] && source <(kubectl completion zsh)
 
-# AWS default creds
-if test -f '~/.aws/credentials'; then
-	aws_profile='default'
-	export AWS_ACCESS_KEY_ID=$(aws configure get default.aws_access_key_id --profile $aws_profile)
-	export AWS_SECRET_KEY=$(aws configure get default.aws_secret_access_key --profile $aws_profile)
-fi
+# # AWS default creds
+# if test -f '~/.aws/credentials'; then
+# 	aws_profile='default'
+# 	export AWS_ACCESS_KEY_ID=$(aws configure get default.aws_access_key_id --profile $aws_profile)
+# 	export AWS_SECRET_KEY=$(aws configure get default.aws_secret_access_key --profile $aws_profile)
+# fi
 
 # Updates PATH for the Google Cloud SDK.
-file='/Users/adam/google-cloud-sdk/path.zsh.inc'
-test -f $file && source $file
-
+source_if_exists '/Users/adam/google-cloud-sdk/path.zsh.inc'
 # Enables shell command completion for gcloud.
-file='/Users/adam/google-cloud-sdk/completion.zsh.inc'
-test -f $file && source $file
+source_if_exists '/Users/adam/google-cloud-sdk/completion.zsh.inc'
+
 
 # Enables the following plugins for zsh (without oh-my-zsh)
-os=$(uname)
-if [[ "$os" == "Darwin" ]]; then
-	source /usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh
-	source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-	
-else
-	# os == Linux
-	source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-	source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-fi
+# macos x86
+source_if_exists /usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+source_if_exists /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+# macos ARM
+source_if_exists /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+source_if_exists /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+# Linux
+source_if_exists /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+source_if_exists /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
 
 # Machine specific config
-file="${HOME}/.zshrc"
-test -f ${file} && source ${file}
+source_if_exists "${HOME}/.zshrc"

zsh/functions

@@ -0,0 +1,6 @@
+source_if_exists() {
+    path=$1
+    if test -f "${path}"; then
+        source "${path}"
+    fi
+}