dotfiles

commit f421a4028fbddb4f1619fd2d1fd78abedff9c1ba
parent 7db99efdac33984a4a993603ef974c48e99fa78e
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Sun, 22 Sep 2019 13:56:23 -0400

zshrc: bugfix

Former-commit-id: e7b64dd8f540bd1206b94619742e8614981723fe
Diffstat:
M
shell/zshrc
 | 
49
+++++++++++++++++++++++++------------------------

1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/shell/zshrc b/shell/zshrc
@@ -3,30 +3,6 @@
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
 
-# Aliases
-source $HOME/.commonprofile
-
-# Z initialization
-if ! command -v z &> /dev/null; then
-  . $DOTFILES/shell/z/z.sh
-fi
-
-# rbenv init
-if [[ $PATH != *"$HOME/.rbenv/shims"* ]] && command -v rbenv &> /dev/null; then
-  eval "$(rbenv init -)"
-fi
-
-# jenv
-if command -v jenv &> /dev/null; then
-  if [[ $PATH != *"$HOME/.jenv/bin"* ]]; then
-    export PATH="$HOME/.jenv/bin:$PATH"
-  fi
-  eval "$(jenv init -)"
-  export JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home"
-fi
-
-test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
-
 # Keybinds
 insert-arg-of-prev-cmd() {
 : ${NUMERIC:-1}
@@ -84,7 +60,32 @@ POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status root_indicator background_jobs histor
 
 source $ZSH/oh-my-zsh.sh
 # }}}
+# Other scripts {{{
 # FZF
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
+# Aliases
+source $HOME/.commonprofile
+
+# Z initialization
+if ! command -v z &> /dev/null; then
+  . $DOTFILES/shell/z/z.sh
+fi
+
+# rbenv init
+if [[ $PATH != *"$HOME/.rbenv/shims"* ]] && command -v rbenv &> /dev/null; then
+  eval "$(rbenv init -)"
+fi
+
+# jenv
+if command -v jenv &> /dev/null; then
+  if [[ $PATH != *"$HOME/.jenv/bin"* ]]; then
+    export PATH="$HOME/.jenv/bin:$PATH"
+  fi
+  eval "$(jenv init -)"
+  export JAVA_HOME="/Library/Java/JavaVirtualMachines/jdk1.8.0_202.jdk/Contents/Home"
+fi
+
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+# }}}
 # vim: foldmethod=marker foldlevel=0