diff --git a/configs/neovim.nix b/configs/neovim.nix
index e655c03..747efa2 100644
--- a/configs/neovim.nix
+++ b/configs/neovim.nix
@@ -31,6 +31,7 @@
             fzf-vim
             fzfWrapper
             goyo
+            supertab
             tabular
             vimwiki
             vim-256noir
diff --git a/dot/init.vim b/dot/init.vim
index d4da9c3..6f05c1f 100644
--- a/dot/init.vim
+++ b/dot/init.vim
@@ -125,6 +125,7 @@ if has("autocmd")
   autocmd filetype javascript packadd vim-javascript
   autocmd filetype make setlocal noexpandtab
   autocmd filetype html packadd emmet-vim
+  autocmd filetype gitcommit setlocal spell
   autocmd bufreadpost *
         \ if line("'\"") > 0 && line("'\"") <= line("$") |
         \ exe "normal! g`\"" |
@@ -142,12 +143,20 @@ let g:startify_custom_header = ''
 
 " let g:deoplete#enable_at_startup = 1
 set completeopt=noinsert,menuone,noselect
+set complete+=kspell
 " let g:deoplete#sources = {}
 " let g:deoplete#sources._ = ['ale', 'file', 'omni', 'buffer']
 "
 " let g:deoplete#sources#rust#racer_binary = $HOME . '/.cargo/bin/racer'
 " let g:deoplete#sources#rust#rust_source_path = substitute(system('rustc --print sysroot'), '\n$', '', '') . '/lib/rustlib/src/rust/src'
 
+inoremap ^] ^X^]
+inoremap ^F ^X^F
+inoremap ^D ^X^D
+inoremap ^L ^X^L
+
+let g:SuperTabDefaultCompletionType = 'context'
+
 let g:haskell_enable_quantification = 1
 let g:haskell_enable_recursivedo = 1
 let g:haskell_enable_arrowsyntax = 1