diff --git a/defaults/default-packages b/defaults/default-packages
index 34fbacf..59b583e 100644
--- a/defaults/default-packages
+++ b/defaults/default-packages
@@ -6,3 +6,4 @@ youtube-dl
 black
 poetry
 magic-wormhole
+neovim-remote
diff --git a/playbooks/roles/neovim/tasks/main.yml b/playbooks/roles/neovim/tasks/main.yml
index e5c82ad..646d417 100644
--- a/playbooks/roles/neovim/tasks/main.yml
+++ b/playbooks/roles/neovim/tasks/main.yml
@@ -18,3 +18,8 @@
     state: link
     force: yes
 
+- name: Create undodir
+  file:
+    path: ~/.undodir
+    state: directory
+
diff --git a/vim/vimrc b/vim/vimrc
index f9347c9..e37db50 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -44,6 +44,10 @@ endif
 if has("persistent_undo")
     set undofile
     set undodir=$HOME/.undodir
+    augroup undodir
+        autocmd!
+        autocmd BufWritePre /tmp/* setlocal noundofile 
+    augroup END
 endif
 
 call plug#begin('~/.config/nvim/plugged')
@@ -68,6 +72,13 @@ Plug 'ctrlpvim/ctrlp.vim'
 " Wakatime
 Plug 'wakatime/vim-wakatime'
 
+" Dispatch
+Plug 'tpope/vim-dispatch'
+Plug 'radenling/vim-dispatch-neovim'
+
+" Editorconfig
+Plug 'sgur/vim-editorconfig'
+
 Plug 'terryma/vim-expand-region'
 Plug 'junegunn/rainbow_parentheses.vim'
 
@@ -99,6 +110,8 @@ let g:ctrlp_map = '<Leader>p'
 let g:ctrlp_cmd = 'CtrlPMixed'
 let g:ctrlp_user_command = 'rg --files %s'
 
+set signcolumn=yes
+
 " Builtin LSP
 lua << EOF
 local nvim_lsp = require'nvim_lsp'
@@ -147,19 +160,9 @@ vnoremap <Leader>P "+P
 vmap v <Plug>(expand_region_expand)
 vmap <C-v> <Plug>(expand_region_shrink)
 
-"Coc Keymaps and options
-nnoremap <silent> <leader><Space>d :call CocAction('jumpDefinition')<cr>
-nnoremap <silent> <leader><Space>g :call CocAction('jumpTypeDefinition')<cr>
-
 "which-key
 let g:which_key_map = {}
 autocmd! User vim-which-key call which_key#register('<Space>', 'g:which_key_map')
-let g:which_key_map[' '] =  {
-  \ 'name' : '+CoC'                ,
-  \ 'd'    : 'go-to-definition'         , 
-  \ 'g'    : 'go-to-type-definition'    ,
-  \ }
-call which_key#register('<Space>', "g:which_key_map")
 nnoremap <silent> <leader>      :<c-u>WhichKey '<Space>'<CR>
 nnoremap <silent> <localleader> :<c-u>WhichKey  ','<CR>
 
@@ -184,6 +187,10 @@ function! GetGitUrl()
 endfunction
 
 nnoremap <silent> <leader>c :call GetGitUrl()<CR>
+nnoremap <silent> <leader>* :grep <cword><CR>:cw
+
+set grepprg=rg\ -H\ --no-heading\ --vimgrep
+set grepformat=%f:%l:%c:%m
 
 if has("nvim-0.5.0")
     lua << EOF
diff --git a/zsh/zshrc b/zsh/zshrc
index 3f0852b..abee614 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -50,7 +50,6 @@ else
 fi
 
 alias exa="exa -l --git"
-alias edit='emacs'
 
 function dt() {
     local session_name
@@ -82,6 +81,14 @@ function nv() {
   nvr -s $@
 }
 
+function vim() {
+    if [[ $(whence -p nvim 2> /dev/null) ]]; then
+        nv ${@}
+    else
+        vim ${@}
+    fi
+}
+
 path+=($HOME/.anyenv/bin)
 eval "$(anyenv init -)"
 path+=($(yarn global bin))