Merge pull request #189 from caarlos0/speed

Speed improvements

antibody/path.zsh

@@ -1,2 +1,5 @@
 #!/bin/zsh
-source <(antibody init)
+antibody() {
+  eval "$(command antibody init -)"
+  antibody "$@"
+}

golang/path.zsh

@@ -1,5 +1,4 @@
 #!/bin/sh
 export GOPATH="$PROJECTS/Go"
-[ ! -d "$GOPATH" ] &&  mkdir -p "$GOPATH/bin"
-[ ! -d "$GOPATH/src/github.com/" ] && mkdir -p "$GOPATH/src/github.com/"
 export PATH="$PATH:$GOPATH/bin"
+mkdir -p "$GOPATH/bin" "$GOPATH/src/github.com/"

homebrew/aliases.zsh

@@ -1,5 +1,5 @@
 #!/bin/sh
-if test "$(uname)" = "Darwin"; then
+if which brew >/dev/null 2>&1; then
   brew() {
     case "$1" in
       cleanup)

node/path.zsh

@@ -1,4 +1,2 @@
 #!/bin/sh
-export PATH="/usr/local/share/npm/bin:$PATH"
-export PATH="$PATH:$HOME/.npm/bin"
-
+export PATH="$PATH:/usr/local/share/npm/bin:$HOME/.npm/bin"

postgres/path.zsh

@@ -1,4 +1,4 @@
 #!/bin/sh
 if [ "$(uname -s)" = "Darwin" ]; then
-  export PATH=$PATH:/Applications/Postgres.app/Contents/Versions/9.4/bin
+  export PATH="$PATH:/Applications/Postgres.app/Contents/Versions/9.4/bin"
 fi

python/path.zsh

@@ -0,0 +1,5 @@
+#!/bin/sh
+pyenv() {
+  eval "$(command pyenv init -)"
+  pyenv "$@"
+}

ruby/path.zsh

@@ -1,8 +1,11 @@
 #!/bin/sh
 if [ -d "$HOME/.rbenv" ]; then
-  export PATH="$HOME/.rbenv/bin:$PATH"
+  export PATH="$PATH:$HOME/.rbenv/bin"
 fi
-# shellcheck disable=SC2039
-if rbenv &>/dev/null; then
-  eval "$(rbenv init -)"
+
+if which rbenv >/dev/null 2>&1; then
+  rbenv() {
+    eval "$(command rbenv init -)"
+    rbenv "$@"
+  }
 fi

script/test

@@ -1,5 +1,5 @@
 #!/bin/zsh
-set -e
+set -ex
 
 # Lint files
 ./build/build.sh

system/aliases.zsh

@@ -1,10 +1,11 @@
 #!/bin/sh
+
+alias wtf="imgcat ~/.dotfiles/imgs/wtf.gif"
+
 # grc overides for ls
 #   Made possible through contributions from generous benefactors like
 #   `brew install coreutils`
-alias wtf="imgcat ~/.dotfiles/imgs/wtf.gif"
-# shellcheck disable=SC2039
-if gls &>/dev/null; then
+if which gls >/dev/null 2>&1; then
   alias ls="gls -F --color"
   alias l="gls -lAh --color"
   alias ll="gls -l --color"
@@ -19,17 +20,16 @@ alias grep="grep --color=auto"
 alias duf="du -sh * | sort -hr"
 alias less="less -r"
 
-if [ -z "$(command -v pbcopy)" ]; then
-  if [ -n "$(command -v xclip)" ]; then
-    alias pbcopy="xclip -selection clipboard"
-    alias pbpaste="xclip -selection clipboard -o"
-  elif [ -n "$(command -v xsel)" ]; then
-    alias pbcopy="xsel --clipboard --input"
-    alias pbpaste="xsel --clipboard --output"
-  fi
-fi
-
 if [ "$(uname -s)" != "Darwin" ]; then
+  if [ -z "$(command -v pbcopy)" ]; then
+    if [ -n "$(command -v xclip)" ]; then
+      alias pbcopy="xclip -selection clipboard"
+      alias pbpaste="xclip -selection clipboard -o"
+    elif [ -n "$(command -v xsel)" ]; then
+      alias pbcopy="xsel --clipboard --input"
+      alias pbpaste="xsel --clipboard --output"
+    fi
+  fi
   if [ -e /usr/bin/xdg-open ]; then
     alias open="xdg-open"
   fi

system/grc.zsh

@@ -1,7 +1,6 @@
 #!/bin/sh
 # GRC colorizes nifty unix tools all over the place
-# shellcheck disable=2039
-if grc &>/dev/null && ! brew &>/dev/null; then
+if which grc >/dev/null 2>&1 && which brew >/dev/null 2>&1; then
   # shellcheck disable=SC1090
   . "$(brew --prefix)/etc/grc.bashrc"
 fi

system/path.zsh

@@ -1,3 +1,2 @@
 #!/bin/sh
-export PATH="./bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
-export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
+export PATH="$PATH:$ZSH/bin"

zsh/config.zsh

@@ -107,10 +107,3 @@ else
   bindkey "^[3;5~" delete-char
   bindkey "\e[3~" delete-char
 fi
-
-# ignore case
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
-# menu if nb items > 2
-zstyle ':completion:*' menu select=2
-# list of completers to use
-zstyle ':completion:*::::' completer _expand _complete _ignored _approximate

zsh/prompt.zsh

@@ -1,9 +1,8 @@
 #!/bin/zsh
 PURE_CMD_MAX_EXEC_TIME=1
-PURE_GIT_PULL=0
 antibody bundle sindresorhus/pure
 
-# these two guys **MUST** be load last.
+# these two guys **MUST** be loaded last.
 antibody bundle <<EOF
 zsh-users/zsh-syntax-highlighting
 zsh-users/zsh-history-substring-search

zsh/zshrc.symlink

@@ -5,6 +5,9 @@ export ZSH="$HOME/.dotfiles"
 # your project folder that we can `c [tab]` to
 export PROJECTS="$HOME/Code"
 
+# your default editor
+export EDITOR='atom'
+
 # all of our zsh files
 typeset -U config_files
 config_files=($ZSH/*/*.zsh)