diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | config/zsh/.zshrc | 7 | ||||
| -rw-r--r-- | config/zsh/20-appearance.zsh (renamed from config/zsh/appearance.zsh) | 0 | ||||
| -rw-r--r-- | config/zsh/30-behavior.zsh (renamed from config/zsh/behavior.zsh) | 0 | ||||
| -rw-r--r-- | config/zsh/40-key-bindings.zsh (renamed from config/zsh/key-bindings.zsh) | 0 | ||||
| -rw-r--r-- | config/zsh/50-completion.zsh (renamed from config/zsh/completion.zsh) | 0 | ||||
| -rw-r--r-- | config/zsh/99-function-overrides.zsh (renamed from config/zsh/function-overrides.zsh) | 0 | ||||
| -rw-r--r-- | config/zsh/zshrc | 17 | ||||
| -rwxr-xr-x | deploy.sh | 4 | ||||
| -rw-r--r-- | local/local.zsh | 6 |
10 files changed, 13 insertions, 23 deletions
@@ -1,4 +1,4 @@ vim/ dotfiles-backup -config/zsh/local.zsh +config/zsh/00-local.zsh config/git/config-local diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc index ee3ebdd..f33ca44 100644 --- a/config/zsh/.zshrc +++ b/config/zsh/.zshrc @@ -1,3 +1,4 @@ -# just a shim to make the real zshrc not hidden -# since zsh doesn't support renaming the config -source "$ZDOTDIR/zshrc" +for f in $ZDOTDIR/*.zsh +do + source "${f}" +done diff --git a/config/zsh/appearance.zsh b/config/zsh/20-appearance.zsh index e7132a8..e7132a8 100644 --- a/config/zsh/appearance.zsh +++ b/config/zsh/20-appearance.zsh diff --git a/config/zsh/behavior.zsh b/config/zsh/30-behavior.zsh index e7e6b81..e7e6b81 100644 --- a/config/zsh/behavior.zsh +++ b/config/zsh/30-behavior.zsh diff --git a/config/zsh/key-bindings.zsh b/config/zsh/40-key-bindings.zsh index 4deac62..4deac62 100644 --- a/config/zsh/key-bindings.zsh +++ b/config/zsh/40-key-bindings.zsh diff --git a/config/zsh/completion.zsh b/config/zsh/50-completion.zsh index 740e9a3..740e9a3 100644 --- a/config/zsh/completion.zsh +++ b/config/zsh/50-completion.zsh diff --git a/config/zsh/function-overrides.zsh b/config/zsh/99-function-overrides.zsh index 8b233e5..8b233e5 100644 --- a/config/zsh/function-overrides.zsh +++ b/config/zsh/99-function-overrides.zsh diff --git a/config/zsh/zshrc b/config/zsh/zshrc deleted file mode 100644 index 16c4bed..0000000 --- a/config/zsh/zshrc +++ /dev/null @@ -1,17 +0,0 @@ -export EDITOR=vim -export LANG=en_US.UTF-8 - -if [ -e "$ZDOTDIR/local.zsh" ]; then - source "$ZDOTDIR/local.zsh" -fi - -source "$ZDOTDIR/appearance.zsh" -source "$ZDOTDIR/behavior.zsh" -source "$ZDOTDIR/completion.zsh" -source "$ZDOTDIR/key-bindings.zsh" - -# override builtin functions (preexec, precmd, etc.) -source "$ZDOTDIR/function-overrides.zsh" - -# user bin should take absolute priority -export PATH="$HOME/bin:$PATH" @@ -44,8 +44,8 @@ fi vim +BundleInstall +qall vim +BundleClean +qall -if [ ! -e config/zsh/local.zsh ]; then - cp local/local.zsh config/zsh/local.zsh +if [ ! -e config/zsh/00-local.zsh ]; then + cp local/local.zsh config/zsh/00-local.zsh fi if [ ! -e config/git/config-local ]; then cp local/gitconfig-local config/git/config-local diff --git a/local/local.zsh b/local/local.zsh index 8b012e4..1b9bf6d 100644 --- a/local/local.zsh +++ b/local/local.zsh @@ -1,3 +1,6 @@ +export EDITOR=vim +export LANG=en_US.UTF-8 + # get sbin on the path #export PATH="/usr/sbin:/sbin:$PATH" @@ -15,6 +18,9 @@ # Java #export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)" +# User bin +#export PATH="$HOME/bin:$PATH" + # start the ssh agent on login and stop on logout #eval `ssh-agent -s` #trap 'eval `ssh-agent -k`' 0 |