diff --git a/install/2_cli-tools.sh b/install/2_cli-tools.sh
index cc60123d..5a7b313f 100755
--- a/install/2_cli-tools.sh
+++ b/install/2_cli-tools.sh
@@ -15,6 +15,9 @@ brew install nnn
 brew install ripgrep
 brew install tree
 
+ln -s ~/dotfiles/lazygit ~/.config/lazygit
+ln -s ~/dotfiles/lazygit ~/Library/Application\ Support/lazygit
+
 # node cli tools and helpers
 npm install -g diff-so-fancy
 npm install -g fkill-cli
diff --git a/nvim/init.vim b/nvim/init.vim
index db1c3988..f1df0a48 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -5,7 +5,6 @@ Plug 'easymotion/vim-easymotion'
 Plug 'editorconfig/editorconfig-vim'
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
-Plug 'mcchrish/nnn.vim'
 Plug 'neoclide/coc.nvim', { 'branch': 'release' }
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'tpope/vim-apathy'
@@ -17,6 +16,7 @@ Plug 'tpope/vim-ragtag'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
+Plug 'voldikss/vim-floaterm'
 Plug 'wellle/targets.vim'
 Plug 'wellle/tmux-complete.vim'
 Plug 'wincent/terminus'
diff --git a/nvim/leaderkeys.vim b/nvim/leaderkeys.vim
index e0372878..2edc0919 100644
--- a/nvim/leaderkeys.vim
+++ b/nvim/leaderkeys.vim
@@ -35,3 +35,7 @@ nnoremap <leader>w :set wrap! wrap?<cr>
 
 " reload files and redraw
 nnoremap <leader>r :checktime<cr>:redraw!<cr>
+
+" vim
+nnoremap <Leader>ve :e $MYVIMRC<cr>
+nnoremap <Leader>vr :source $MYVIMRC<cr>
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index f549a7f3..df2feabb 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -26,16 +26,23 @@ nnoremap <silent> <space>h :History:<cr>
 nnoremap <silent> <space>/ :History/<cr>
 nnoremap <silent> <space>c :Commits<cr>
 
-" nnn integration
-let g:nnn#set_default_mappings = 0
-let g:nnn#command = 'nnn -deH'
-nnoremap <silent> - :NnnPicker %:p:h<CR>
-
 " EasyMotion
 let g:EasyMotion_do_mapping=0
 let g:EasyMotion_smartcase=1
 nmap <leader>j <Plug>(easymotion-overwin-f2)
 
+" Floaterm
+let g:floaterm_keymap_toggle = '<space>t'
+let g:floaterm_width = 0.9
+let g:floaterm_height = 0.62
+let g:floaterm_autoclose = 1
+let g:floaterm_opener = 'edit'
+let g:floaterm_borderchars = '─│─│╭╮╯╰'
+let g:floaterm_title = ''
+hi FloatermBorder guibg='#282828' guifg='#655c54'
+nnoremap <silent> - :FloatermNew nnn<cr>
+nnoremap <silent> <space>g :FloatermNew lazygit<cr>
+
 " COC.vim
 inoremap <silent><expr> <C-j>
   \ pumvisible() ? coc#_select_confirm() :