adjust things my way

zsh/configs/color.zsh

@@ -1,6 +1,3 @@
 # makes color constants available
 autoload -U colors
 colors
-
-# enable colored output from ls, etc. on FreeBSD-based systems
-export CLICOLOR=1

zsh/configs/fzf.zsh

@@ -0,0 +1 @@
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

zsh/configs/keybindings.zsh

@@ -3,15 +3,3 @@ stty -ixon
 
 # vi mode
 bindkey -v
-bindkey "^F" vi-cmd-mode
-
-# handy keybindings
-bindkey "^A" beginning-of-line
-bindkey "^E" end-of-line
-bindkey "^K" kill-line
-bindkey "^R" history-incremental-search-backward
-bindkey "^P" history-search-backward
-bindkey "^Y" accept-and-hold
-bindkey "^N" insert-last-word
-bindkey "^Q" push-line-or-edit
-bindkey -s "^T" "^[Isudo ^[A" # "t" for "toughguy"

zsh/configs/post/completion.zsh

@@ -1,5 +1,5 @@
 # load our own completion functions
-fpath=(~/.zsh/completion /usr/local/share/zsh/site-functions $fpath)
+fpath=(~/.zsh/completion $fpath)
 
 # completion
 autoload -U compinit

zsh/configs/post/path.zsh

@@ -1,12 +1,13 @@
 # ensure dotfiles bin directory is loaded first
-PATH="$HOME/.bin:/usr/local/sbin:$PATH"
+PATH="$HOME/local/bin:$PATH"
 
 # load rbenv if available
 if command -v rbenv >/dev/null; then
   eval "$(rbenv init - --no-rehash)"
 fi
 
-# mkdir .git/safe in the root of repositories you trust
-PATH=".git/safe/../../bin:$PATH"
+# nvm
+NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && source "$NVM_DIR/nvm.sh"
 
 export -U PATH

zsh/configs/prompt.zsh

@@ -1,6 +1,6 @@
 # modify the prompt to contain git branch name if applicable
 git_prompt_info() {
-  current_branch=$(git current-branch 2> /dev/null)
+  current_branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
   if [[ -n $current_branch ]]; then
     echo " %{$fg_bold[green]%}$current_branch%{$reset_color%}"
   fi