From c6bf4e9bc0a7f32f0736471feb391d5993252252 Mon Sep 17 00:00:00 2001
From: Andrew Coleman <penguincoder@gmail.com>
Date: Thu, 19 Nov 2020 10:46:26 -0500
Subject: [PATCH] update vimrc

---
 .vimrc | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/.vimrc b/.vimrc
index b758580..f2bedec 100644
--- a/.vimrc
+++ b/.vimrc
@@ -20,6 +20,8 @@ Plug 'airblade/vim-gitgutter'
 Plug 'elixir-editors/vim-elixir'
 Plug 'leafgarland/typescript-vim'
 Plug 'jlanzarotta/bufexplorer'
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
 
 set nocompatible
 set history=1000
@@ -40,6 +42,7 @@ set noshowmode
 set hlsearch
 set incsearch
 syntax on
+let mapleader = " "
 
 filetype on
 filetype plugin on
@@ -57,7 +60,9 @@ autocmd BufNewFile,BufRead *.tera set syntax=django
 nmap n nzz
 nmap N Nzz
 
-let g:lightline = {}
+let g:lightline = {
+      \ 'colorscheme': 'OldHope',
+      \ }
 
 let g:lightline.component = {
       \ 'readonly': '%{&readonly?"":""}',
@@ -114,9 +119,9 @@ autocmd InsertLeave * match ExtraWhitespace /\s\+$/
 autocmd BufWinLeave * call clearmatches()
 
 " shortcuts for 3-way merge
-map <Leader>1 :diffget LOCAL<CR>
-map <Leader>2 :diffget BASE<CR>
-map <Leader>3 :diffget REMOTE<CR>
+" map <Leader>1 :diffget LOCAL<CR>
+" map <Leader>2 :diffget BASE<CR>
+" map <Leader>3 :diffget REMOTE<CR>
 
 " packloadall
 " silent! helptags ALL
@@ -132,4 +137,12 @@ nmap ga <Plug>(EasyAlign)
 nnoremap <silent><leader>1 :source ~/.vimrc \| :PlugInstall<CR>
 map <Leader>s :StripWhitespace<CR>
 
+nnoremap <leader>f :GFiles<CR>
+nnoremap <leader>g :Rg<CR>
+nnoremap <silent><leader>l :Buffers<CR>
+
+if !has('gui_running')
+  set t_Co=256
+endif
+
 call plug#end()