Switch to fzf instead of ctrlp

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "zsh/lib/gitstatus"]
+	path = zsh/lib/gitstatus
+	url = git@github.com:romkatv/gitstatus.git

vim/vimrc.d/fzf.vim

@@ -0,0 +1 @@
+map <C-P> :FZF<CR>

vimrc.bundles.local

@@ -11,6 +11,11 @@ Plug 'rizzatti/dash.vim'
 
 Plug 'ryanoasis/vim-devicons'
 
+" Search
+UnPlug 'ctrlp.vim'
+Plug '/usr/local/opt/fzf'
+Plug 'junegunn/fzf.vim'
+
 " Language additions
 Plug 'briancollins/vim-jst', { 'for': ['jst', 'ejs'] }
 Plug 'elixir-editors/vim-elixir'
@@ -30,6 +35,7 @@ Plug 'vim-ruby/vim-ruby', { 'for': 'ruby' }
 Plug 'keith/swift.vim', { 'for': 'swift' }
 Plug 'tpope/vim-markdown', { 'for': 'markdown' }
 Plug 'AndrewRadev/splitjoin.vim'
+Plug 'dearrrfish/vim-applescript'
 
 Plug 'junegunn/goyo.vim'
 Plug 'reedes/vim-pencil'

zsh/configs/prompt.zsh.local

@@ -1,69 +1,31 @@
-source "$HOME/.zsh/lib/async.zsh"
+source "$HOME/.zsh/lib/gitstatus/gitstatus.plugin.zsh"
 
-async_init
+gitstatus_start MY
 
-async_register_callback git_prompt_worker git_prompt_callback
+export GIT_PROMPT=""
 
-export PROMPT_GIT_BRANCH=""
-export PROMPT_GIT_DIRTY=""
+update_git_prompt() {
+  typeset -g GIT_PROMPT=""
 
-git_prompt_callback() {
-  case $1 in
-    git_branch)
-      PROMPT_GIT_BRANCH=$3
-      ;;
-    git_dirty)
-      PROMPT_GIT_DIRTY=$3
-      ;;
-  esac
+  gitstatus_query -t 5 MY || return
+  [[ $VCS_STATUS_RESULT == ok-sync ]] || return
 
-  zle reset-prompt
-}
+  GIT_PROMPT+="%{$fg[blue]%}[%{$fg_bold[blue]%}${VCS_STATUS_LOCAL_BRANCH}%{$reset_color%}"
 
-# gets whether git is currently dirty
-git_dirty() {
-  git diff --ignore-submodules --quiet
-  if [[ $? == 1 ]]; then
-    echo "✱"
-  else
-    git diff --staged --ignore-submodules --quiet
-    [[ $? == 1 ]] && echo "✱"
+  if [[ $VCS_STATUS_HAS_STAGED == 1 ]]; then
+    GIT_PROMPT+="%{$fg_bold[yellow]%}+%{$reset_color%}"
   fi
-}
 
-# gets the current git branch
-git_branch() {
-  git rev-parse --abbrev-ref HEAD 2>/dev/null
-}
-
-# adds the current branch name in green
-git_prompt_info() {
-  if [[ -n $PROMPT_GIT_BRANCH ]]; then
-    echo "%{$fg_bold[green]%}${PROMPT_GIT_BRANCH}%{$reset_color%}%{$fg_bold[red]%}${PROMPT_GIT_DIRTY}%{$reset_color%} "
+  if [[ $VCS_STATUS_HAS_UNSTAGED == 1 ]]; then
+    GIT_PROMPT+="%{$fg_bold[red]%}∗%{$reset_color%}"
   fi
-}
 
-git_branch_async() {
-  async_job git_prompt_worker git_branch
+  GIT_PROMPT+="%{$fg[blue]%}]%{$reset_color%} "
 }
 
-git_status_async() {
-  async_job git_prompt_worker git_dirty
-}
-
-worker_change_directory() {
-  PROMPT_GIT_BRANCH=""
-  PROMPT_GIT_DIRTY=""
-  async_worker_eval git_prompt_worker builtin cd -q "$PWD"
-}
-
-async_start_worker git_prompt_worker
-
 autoload -Uz add-zsh-hook
 
-add-zsh-hook chpwd worker_change_directory
-add-zsh-hook precmd git_branch_async
-add-zsh-hook precmd git_status_async
+add-zsh-hook precmd update_git_prompt
 
 # makes color constants available
 autoload -U colors
@@ -76,7 +38,7 @@ export CLICOLOR=1
 setopt promptsubst
 
 # prompt
-export PROMPT='$(git_prompt_info)${SSH_CONNECTION+"%{$fg[yellow]%}%n@%m%{$reset_color%}:"}%{$fg_bold[blue]%}%2c%{$reset_color%} %{$fg_bold[cyan]%}❯%{$reset_color%} '
+export PROMPT='${SSH_CONNECTION+"%{$fg[yellow]%}%n@%m%{$reset_color%}:"}%{$fg_bold[green]%}%2c%{$reset_color%} ${GIT_PROMPT}%{$fg_bold[cyan]%}❯%{$reset_color%} '
 export RPROMPT='%D{%K:%M:%S}'
 
 # update the prompt on carriage return

zsh/lib/gitstatus

@@ -0,0 +1 @@
+Subproject commit 86bc4a8f04429c5920674ef5b8136dbf10f436fe