diff --git a/neovim/.gitignore b/neovim/.gitignore
new file mode 100644
index 0000000..16873f6
--- /dev/null
+++ b/neovim/.gitignore
@@ -0,0 +1 @@
+plugins/
diff --git a/neovim/bundle b/neovim/bundle
deleted file mode 120000
index 3834b65..0000000
--- a/neovim/bundle
+++ /dev/null
@@ -1 +0,0 @@
-../vim/bundle
\ No newline at end of file
diff --git a/neovim/init.vim b/neovim/init.vim
deleted file mode 120000
index 988ed4f..0000000
--- a/neovim/init.vim
+++ /dev/null
@@ -1 +0,0 @@
-../vim/.vimrc
\ No newline at end of file
diff --git a/neovim/init.vim b/neovim/init.vim
new file mode 100644
index 0000000..e61b2f2
--- /dev/null
+++ b/neovim/init.vim
@@ -0,0 +1,72 @@
+if &compatible
+  set nocompatible
+endif
+set runtimepath+=~/.config/nvim/plugins/repos/github.com/Shougo/dein.vim
+
+if dein#load_state('~/.config/nvim/plugins')
+  call dein#begin('~/.config/nvim/plugins')
+
+  " let dein manage itself
+  call dein#add('Shougo/dein.vim')
+  call dein#add('Shougo/deoplete.nvim')
+  call dein#add('Shougo/denite.nvim')
+
+  call dein#end()
+  call dein#save_state()
+endif
+
+if dein#check_install()
+    call dein#install()
+endif
+
+filetype plugin indent on
+syntax enable
+set number
+
+set t_Co=256
+
+set background=dark
+colorscheme jdkaplan
+
+set expandtab
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4
+
+set wrap
+set linebreak
+set nolist
+set textwidth=0
+set wrapmargin=0
+
+set ignorecase
+set smartcase
+
+highlight ExtraWhitespace ctermbg=red guibg=red
+match ExtraWhitespace /\s\+$/
+autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
+autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
+autocmd InsertLeave * match ExtraWhitespace /\s\+$/
+autocmd BufWinLeave * call clearmatches()
+
+map ; :
+noremap ;; ;
+
+map ;h :wincmd h<CR>
+map ;j :wincmd j<CR>
+map ;k :wincmd k<CR>
+map ;l :wincmd l<CR>
+
+map ;" :split<CR>
+map ;% :vsplit<CR>
+map ;0 :close<CR>
+
+map ;w :w<CR>
+
+map ;b :Denite buffer<CR>
+map ;e :Denite file buffer<CR>
+map ;f :Denite file buffer<CR>
+map ;q :q<CR>
+map ;x :x<CR>
+
+let g:deoplete#enable_at_startup = 1