From 75674f2c7479a5c2ba131e9513bdb0ec2c61ae7b Mon Sep 17 00:00:00 2001
From: Matt Singleton <matt@xcolour.net>
Date: Tue, 9 Feb 2021 17:25:01 -0600
Subject: refactor zsh config

---
 .gitignore       |  2 +-
 config/zsh/zshrc |  4 ++--
 deploy.sh        |  4 ++--
 local.zsh        | 23 +++++++++++++++++++++++
 zshrc-local      | 23 -----------------------
 5 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 local.zsh
 delete mode 100644 zshrc-local

diff --git a/.gitignore b/.gitignore
index edec80b..88aee5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 vim/
 dotfiles-backup
-config/zsh/zshrc-local
+config/zsh/local.zsh
 config/git/config-local
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index 2a0fcf0..16c4bed 100644
--- a/config/zsh/zshrc
+++ b/config/zsh/zshrc
@@ -1,8 +1,8 @@
 export EDITOR=vim
 export LANG=en_US.UTF-8
 
-if [ -e "$ZDOTDIR/zshrc-local" ]; then
-    source "$ZDOTDIR/zshrc-local"
+if [ -e "$ZDOTDIR/local.zsh" ]; then
+    source "$ZDOTDIR/local.zsh"
 fi
 
 source "$ZDOTDIR/appearance.zsh"
diff --git a/deploy.sh b/deploy.sh
index 7e5575b..ba805a0 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -41,8 +41,8 @@ fi
 vim +BundleInstall +qall
 vim +BundleClean +qall
 
-if [ ! -e config/zsh/zshrc-local ]; then
-    cp zshrc-local config/zsh/zshrc-local
+if [ ! -e config/zsh/local.zsh ]; then
+    cp local.zsh config/zsh/local.zsh
 fi
 if [ ! -e config/git/config-local ]; then
     cp gitconfig-local config/git/config-local
diff --git a/local.zsh b/local.zsh
new file mode 100644
index 0000000..8b012e4
--- /dev/null
+++ b/local.zsh
@@ -0,0 +1,23 @@
+# get sbin on the path
+#export PATH="/usr/sbin:/sbin:$PATH"
+
+# move homebrew stuff to the beginning of the search path
+#export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
+#export MANPATH="/usr/local/man:$MANPATH"
+#export PATH="/usr/local/opt/python/libexec/bin:$PATH"
+#export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
+#export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"
+#export PATH="/usr/local/opt/findutils/libexec/gnubin:$PATH"
+#export MANPATH="/usr/local/opt/findutils/libexec/gnuman:$MANPATH"
+#export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
+#export MANPATH="/usr/local/opt/grep/libexec/gnuman:$MANPATH"
+
+# Java
+#export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
+
+# start the ssh agent on login and stop on logout
+#eval `ssh-agent -s`
+#trap 'eval `ssh-agent -k`' 0
+
+# prompt hostname is highlighted in red for non-local envs
+#export ZSH_LOCAL_ENV=true
diff --git a/zshrc-local b/zshrc-local
deleted file mode 100644
index 8b012e4..0000000
--- a/zshrc-local
+++ /dev/null
@@ -1,23 +0,0 @@
-# get sbin on the path
-#export PATH="/usr/sbin:/sbin:$PATH"
-
-# move homebrew stuff to the beginning of the search path
-#export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
-#export MANPATH="/usr/local/man:$MANPATH"
-#export PATH="/usr/local/opt/python/libexec/bin:$PATH"
-#export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
-#export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"
-#export PATH="/usr/local/opt/findutils/libexec/gnubin:$PATH"
-#export MANPATH="/usr/local/opt/findutils/libexec/gnuman:$MANPATH"
-#export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
-#export MANPATH="/usr/local/opt/grep/libexec/gnuman:$MANPATH"
-
-# Java
-#export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-
-# start the ssh agent on login and stop on logout
-#eval `ssh-agent -s`
-#trap 'eval `ssh-agent -k`' 0
-
-# prompt hostname is highlighted in red for non-local envs
-#export ZSH_LOCAL_ENV=true
-- 
cgit v1.2.3