summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Ørbekk <kj@orbekk.com>2020-10-20 11:23:07 -0400
committerKjetil Ørbekk <kj@orbekk.com>2020-10-20 11:23:07 -0400
commitf32cd7abc115f0443dbbecdd0c2c4f16755a134e (patch)
treedbf4d6bcd6181b7b5e16bf3642f16311bfc48fba
parent09849d209ca4d6c80ed8dfe84402d3e31fe23d25 (diff)
Include local zshrc. Some setup.sh improvements
-rwxr-xr-xsetup.sh4
-rw-r--r--zsh/.zshrc2
2 files changed, 5 insertions, 1 deletions
diff --git a/setup.sh b/setup.sh
index 1af71ce..e1a42db 100755
--- a/setup.sh
+++ b/setup.sh
@@ -20,6 +20,8 @@ fi
if which emacs >/dev/null; then
$STOW emacs
- git clone --depth 1 https://github.com/hlissner/doom-emacs ~/.emacs.d
+ if [[ ! -e ~/.emacs.d ]]; then
+ git clone --depth 1 https://github.com/hlissner/doom-emacs ~/.emacs.d
+ fi
doom sync # Too slow!
fi
diff --git a/zsh/.zshrc b/zsh/.zshrc
index abb4493..8e7a73a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -20,3 +20,5 @@ setopt autocd
PURE_GIT_PULL=0
PURE_GIT_UNTRACKED_DIRTY=0
prompt pure
+
+source ~/.zshrc.local