From 69421a7a61e8bceb9315c09a31182301fe828860 Mon Sep 17 00:00:00 2001
From: James Dixon <notjamesdixon@gmail.com>
Date: Sat, 7 Nov 2020 14:42:30 -0500
Subject: [PATCH] add fzf and keymaps for fzf and vim-fugitive

---
 files/vim/.vim/keybinds.vim | 28 +++++--------------------
 files/vim/.vim/plugins.vim  | 41 +++++++++++++++++++++++++++++++++++++
 files/vim/.vim/vimrc        |  2 +-
 3 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/files/vim/.vim/keybinds.vim b/files/vim/.vim/keybinds.vim
index 662b51e..da7782c 100644
--- a/files/vim/.vim/keybinds.vim
+++ b/files/vim/.vim/keybinds.vim
@@ -5,7 +5,7 @@ let mapleader=' '
 "-------------{{{
 "paste and search
 nnoremap <silent><leader><space> :let @/ = ""<CR>
-nnoremap <leader>p :set invpaste<CR>
+nnoremap <leader>i :set invpaste<CR>
 
 "toggles
 nnoremap <silent><leader>lb :call ToggleLineBreak()<CR>
@@ -18,8 +18,11 @@ nnoremap <leader>dt :r !date<CR>
 
 "rc files
 nnoremap <leader>rc :vsplit $MYVIMRC<CR>
+nnoremap <leader>rck :vsplit ~/.vim/keybinds.vim<CR>
+nnoremap <leader>rcp :vsplit ~/.vim/plugins.vim<CR>
+nnoremap <leader>rcf :vsplit $HOME/.vim/after/ftplugin/<CR>
+
 nnoremap <leader>so :source $MYVIMRC<CR>
-nnoremap <leader>ft :vsplit $HOME/.vim/after/ftplugin/<CR>
 
 "formatting tools
 nnoremap =j :%!python -m json.tool<CR>
@@ -30,24 +33,3 @@ nnoremap =j :%!python -m json.tool<CR>
 "abbrevations
 inoreabbrev <expr> #!! "#!/usr/bin/env"
 "}}}
-
-"plugin keybinds
-"{{{
-"netrw
-nnoremap <silent><leader>e :call ToggleNetrw()<CR>
-
-"openbrowser
-nmap gx <Plug>(openbrowser-smart-search)
-vmap gx <Plug>(openbrowser-smart-search)
-
-"ale
-nnoremap <leader>at :ALEToggle<CR>
-nmap <leader>af <Plug>(ale_fix)
-nmap <leader>aK <Plug>(ale_hover)
-nmap <leader>agd <Plug>(ale_go_to_definition)
-nmap <leader>agd <Plug>(ale_go_to_definition)
-
-"vim-emmet
-let g:user_emmet_leader_key = ','
-
-"}}}
diff --git a/files/vim/.vim/plugins.vim b/files/vim/.vim/plugins.vim
index d7cc61d..1b17c9b 100644
--- a/files/vim/.vim/plugins.vim
+++ b/files/vim/.vim/plugins.vim
@@ -24,6 +24,10 @@ call plug#begin(pluginDir)
     Plug 'tpope/vim-repeat'
     "git
     Plug 'tpope/vim-fugitive'
+    "fzf
+    Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+    Plug 'junegunn/fzf.vim'
+
 
     "   syntax and colorscheme packs
     Plug 'flazz/vim-colorschemes'
@@ -94,3 +98,40 @@ let g:vim_markdown_frontmatter = 1
 let g:user_emmet_install_global = 0
 
 "}}}
+
+"plugin keybinds
+"{{{
+"netrw
+nnoremap <silent><leader>e :call ToggleNetrw()<CR>
+
+"vim-plug
+nnoremap <leader>pi :source $MYVIMRC <BAR> :PlugInstall<CR>
+nnoremap <leader>pu :source $MYVIMRC <BAR> :PlugUpdate<CR>
+nnoremap <leader>pc :source $MYVIMRC <BAR> :PlugClean<CR>
+
+"openbrowser
+nmap gx <Plug>(openbrowser-smart-search)
+vmap gx <Plug>(openbrowser-smart-search)
+
+"ale
+nnoremap <leader>at :ALEToggle<CR>
+nmap <leader>af <Plug>(ale_fix)
+nmap <leader>aK <Plug>(ale_hover)
+nmap <leader>agd <Plug>(ale_go_to_definition)
+nmap <leader>agd <Plug>(ale_go_to_definition)
+
+"vim-emmet
+let g:user_emmet_leader_key = ','
+
+"vim-fugitive
+nnoremap <leader>gl :Glog<CR>
+nnoremap <leader>gs :Gstatus<CR>
+
+"fzf
+nnoremap <leader>f :GitFiles<CR>
+nnoremap <leader>b :Buffers<CR>
+nnoremap <leader>F :Files<CR>
+nnoremap <leader>H :Helptags<CR>
+nnoremap <leader>M :Maps<CR>
+
+"}}}
diff --git a/files/vim/.vim/vimrc b/files/vim/.vim/vimrc
index b315019..e30bc4f 100644
--- a/files/vim/.vim/vimrc
+++ b/files/vim/.vim/vimrc
@@ -6,8 +6,8 @@
 source ~/.vim/settings.vim
 source ~/.vim/functions.vim
 source ~/.vim/commands.vim
-source ~/.vim/plugins.vim
 source ~/.vim/keybinds.vim
+source ~/.vim/plugins.vim
 source ~/.vim/colorschemes.vim
 source ~/.vim/autocmds.vim
 source ~/.config/vimrc