diff --git a/nvim/coc-languages/lisp.vim b/nvim/coc-languages/lisp.vim
deleted file mode 100644
index 919a2eb..0000000
--- a/nvim/coc-languages/lisp.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-call extend(g:dotfiles_coc_extensions, {'coc-cl': 1})
-call extend(g:dotfiles_coc_filetypes, {'lsp': 1})
diff --git a/nvim/init.vim b/nvim/init.vim
index 6277f37..ec3f835 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -14,7 +14,7 @@ else
 endif
 
 " Arrow key fix kanged from <https://vim.fandom.com/wiki/Fix_arrow_keys_that_display_A_B_C_D_on_remote_shell#Solution_21> {{{
-  if g:HELP_MY_ARROW_KEYS_ARE_BROKEN
+  if exists("g:HELP_MY_ARROW_KEYS_ARE_BROKEN")
     " the following simply creates an ambiguous mapping so vim fully
     " processes the escape sequence for terminal keys, see 'ttimeout' for a
     " rough explanation, this just forces it to work
diff --git a/nvim/plugin/keybinds.vim b/nvim/plugin/keybinds.vim
index d970038..c8540af 100644
--- a/nvim/plugin/keybinds.vim
+++ b/nvim/plugin/keybinds.vim
@@ -1,5 +1,20 @@
 nnoremap <C-t> :NERDTreeToggle<CR>
 
+" Completion {{{
+  function! s:check_back_space() abort
+    let col = col('.') - 1
+    return !col || getline('.')[col - 1]  =~ '\s'
+  endfunction
+
+  inoremap <expr> <cr> coc#pum#visible() ? coc#_select_confirm() : "\<CR>"
+
+  inoremap <silent><expr> <TAB>
+  \ coc#pum#visible() ? coc#pum#next(1):
+  \ <SID>check_back_space() ? "\<Tab>" :
+  \ coc#refresh()
+  inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
+" }}}
+
 " Copy to clipboard register and paste from clipboard register {{{
   " Taken from https://unix.stackexchange.com/a/23437
   nnoremap <C-y> "+y