From 8c2bce0ad941a2ae816bf53036dcd9c078947d1e Mon Sep 17 00:00:00 2001
From: mitchell <mitchelljfsimon@gmail.com>
Date: Mon, 24 Feb 2020 16:55:04 -0500
Subject: [PATCH] Modify how fzf is loaded; More nvim terminal mode bindings;

Modify EDITOR to equal 'nvim'
---
 .config/fish/config.fish | 2 +-
 .config/nvim/init.vim    | 5 +++++
 .vimrc                   | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index f7563d1..bcd44de 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,4 +1,4 @@
-set -gx EDITOR vim
+set -gx EDITOR nvim
 set -gx GOPATH $HOME/Documents/go
 set -gx GOBIN $GOPATH/bin
 set -gx DOTNET_ENVIRONMENT Development
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 2d1cd43..a8ad5e8 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -2,4 +2,9 @@ set runtimepath^=~/.vim runtimepath+=~/.vim/after
 let &packpath = &runtimepath
 source ~/.vimrc
 
+" Mappings for terminal mode
 tnoremap <Esc> <C-\><C-n>
+tnoremap <A-h> <C-\><C-N><C-w>h
+tnoremap <A-j> <C-\><C-N><C-w>j
+tnoremap <A-k> <C-\><C-N><C-w>k
+tnoremap <A-l> <C-\><C-N><C-w>l
diff --git a/.vimrc b/.vimrc
index 9134d96..dacebe4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -34,6 +34,7 @@ Plug 'junegunn/limelight.vim'
 Plug 'vimwiki/vimwiki'
 Plug 'fsharp/vim-fsharp'
 Plug 'hashivim/vim-terraform'
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 
 call plug#end()
 
@@ -58,8 +59,6 @@ set tabstop=2
 set shiftwidth=2
 set expandtab
 
-set runtimepath+=/usr/local/opt/fzf
-
 if exists('$TMUX')
     let &t_SI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=1\x7\<Esc>\\"
     let &t_EI = "\<Esc>Ptmux;\<Esc>\<Esc>]50;CursorShape=0\x7\<Esc>\\"