From b1575d874759d5e6e16996d6001a0ec22981e2bc Mon Sep 17 00:00:00 2001
From: Aaron Gutierrez <aarongutierrez@asana.com>
Date: Wed, 1 Nov 2017 12:04:51 -0700
Subject: [PATCH] Install ag, fzf

---
 .gitmodules                |  9 ++++++---
 .vim/bundle/ack.vim        |  1 +
 .vim/bundle/ctrlp.vim      |  1 -
 .vim/bundle/fzf.vim        |  1 +
 .vim/indent/typescript.vim |  3 +++
 .vimrc                     | 15 +++++++++++++++
 6 files changed, 26 insertions(+), 4 deletions(-)
 create mode 160000 .vim/bundle/ack.vim
 delete mode 160000 .vim/bundle/ctrlp.vim
 create mode 160000 .vim/bundle/fzf.vim
 create mode 100644 .vim/indent/typescript.vim

diff --git a/.gitmodules b/.gitmodules
index 841e98e..af375c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule ".vim/bundle/ctrlp.vim"]
-	path = .vim/bundle/ctrlp.vim
-	url = git@github.com:kien/ctrlp.vim.git
 [submodule ".vim/bundle/nerdtree"]
 	path = .vim/bundle/nerdtree
 	url = git@github.com:scrooloose/nerdtree.git
@@ -46,3 +43,9 @@
 [submodule ".vim/bundle/tsuquyomi"]
 	path = .vim/bundle/tsuquyomi
 	url = git@github.com:Quramy/tsuquyomi.git
+[submodule ".vim/bundle/fzf.vim"]
+	path = .vim/bundle/fzf.vim
+	url = git@github.com:junegunn/fzf.vim.git
+[submodule ".vim/bundle/ack.vim"]
+	path = .vim/bundle/ack.vim
+	url = git@github.com:mileszs/ack.vim.git
diff --git a/.vim/bundle/ack.vim b/.vim/bundle/ack.vim
new file mode 160000
index 0000000..a16a9b6
--- /dev/null
+++ b/.vim/bundle/ack.vim
@@ -0,0 +1 @@
+Subproject commit a16a9b63eb85cc0960a7f25c54647ac1f99f3360
diff --git a/.vim/bundle/ctrlp.vim b/.vim/bundle/ctrlp.vim
deleted file mode 160000
index b5d3fe6..0000000
--- a/.vim/bundle/ctrlp.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
diff --git a/.vim/bundle/fzf.vim b/.vim/bundle/fzf.vim
new file mode 160000
index 0000000..f31a292
--- /dev/null
+++ b/.vim/bundle/fzf.vim
@@ -0,0 +1 @@
+Subproject commit f31a2925fee37b4b5f9a3fa115df4ae99a2a027c
diff --git a/.vim/indent/typescript.vim b/.vim/indent/typescript.vim
new file mode 100644
index 0000000..b80dc29
--- /dev/null
+++ b/.vim/indent/typescript.vim
@@ -0,0 +1,3 @@
+setlocal expandtab
+setlocal softtabstop=4
+setlocal shiftwidth=4
diff --git a/.vimrc b/.vimrc
index c4bcd55..275d781 100644
--- a/.vimrc
+++ b/.vimrc
@@ -50,6 +50,21 @@ map <C-n> :NERDTreeToggle<CR>
 set tags=./tags,../tags,../../tags,../../../tags
 let g:easytags_dynamic_files = 1
 
+" FZF
+set rtp+=/usr/local/opt/fzf
+nmap <C-p> :Files<CR>
+
+" Ack
+if executable('ag')
+	let g:ackprg = 'ag --vimgrep'
+endif
+
+nmap <Leader>a :Ack!<Space>
+
+" quickfix
+nmap <Leader>c :cclose<CR>
+nmap <Leader>C :copen<CR>
+
 " merlin
 let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
 execute "set rtp+=" . g:opamshare . "/merlin/vim"