diff --git a/.gitmodules b/.gitmodules
index febc1bc..6a94aed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,30 @@
 [submodule "zsh/z-zsh"]
 	path = zsh/z-zsh
 	url = https://github.com/sjl/z-zsh.git
+[submodule "vim/bundle/vim-pathogen"]
+	path = vim/bundle/vim-pathogen
+	url = https://github.com/tpope/vim-pathogen.git
+[submodule "vim/bundle/vim-surround"]
+	path = vim/bundle/vim-surround
+	url = https://github.com/tpope/vim-surround.git
+[submodule "vim/bundle/vim-repeat"]
+	path = vim/bundle/vim-repeat
+	url = https://github.com/tpope/vim-repeat.git
+[submodule "vim/bundle/vim-commentary"]
+	path = vim/bundle/vim-commentary
+	url = https://github.com/tpope/vim-commentary.git
+[submodule "vim/bundle/vim-sensible"]
+	path = vim/bundle/vim-sensible
+	url = https://github.com/tpope/vim-sensible.git
+[submodule "vim/bundle/auto-pairs"]
+	path = vim/bundle/auto-pairs
+	url = https://github.com/jiangmiao/auto-pairs.git
+[submodule "vim/bundle/vim-javascript"]
+	path = vim/bundle/vim-javascript
+	url = https://github.com/pangloss/vim-javascript.git
+[submodule "vim/bundle/vim-textobj-user"]
+	path = vim/bundle/vim-textobj-user
+	url = https://github.com/kana/vim-textobj-user.git
+[submodule "vim/bundle/vim-textobj-comment"]
+	path = vim/bundle/vim-textobj-comment
+	url = https://github.com/glts/vim-textobj-comment.git
diff --git a/install.conf.yaml b/install.conf.yaml
index 4b07610..bccfa31 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -8,3 +8,5 @@
     ~/.zshrc: zsh/.zshrc
     ~/.hgrc: hg/.hgrc
     ~/.config/git/config: git/config
+    ~/.vim: vim/
+    ~/.vimrc: vim/.vimrc
diff --git a/vim/.vimrc b/vim/.vimrc
new file mode 100644
index 0000000..0a83cf4
--- /dev/null
+++ b/vim/.vimrc
@@ -0,0 +1,32 @@
+runtime bundle/vim-pathogen/autoload/pathogen.vim
+execute pathogen#infect()
+
+syntax on
+filetype plugin indent on
+set number
+
+set t_Co=256
+
+set background=dark
+" colorscheme Tomorrow-Night-Bright
+colorscheme jdkaplan
+
+set expandtab
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4
+
+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>
diff --git a/vim/bundle/auto-pairs b/vim/bundle/auto-pairs
new file mode 160000
index 0000000..b647ef5
--- /dev/null
+++ b/vim/bundle/auto-pairs
@@ -0,0 +1 @@
+Subproject commit b647ef54cd2d991d5221b97fb5dbb3c0477fdc64
diff --git a/vim/bundle/vim-commentary b/vim/bundle/vim-commentary
new file mode 160000
index 0000000..7fb632a
--- /dev/null
+++ b/vim/bundle/vim-commentary
@@ -0,0 +1 @@
+Subproject commit 7fb632aab475b1d2560fe18a329742ba3b4725c6
diff --git a/vim/bundle/vim-javascript b/vim/bundle/vim-javascript
new file mode 160000
index 0000000..bab4f39
--- /dev/null
+++ b/vim/bundle/vim-javascript
@@ -0,0 +1 @@
+Subproject commit bab4f3944fb6ef0953991ddfb6c734219c95b83a
diff --git a/vim/bundle/vim-pathogen b/vim/bundle/vim-pathogen
new file mode 160000
index 0000000..b9fb0df
--- /dev/null
+++ b/vim/bundle/vim-pathogen
@@ -0,0 +1 @@
+Subproject commit b9fb0dfd811004010f5f6903edef42d6004ebea2
diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat
new file mode 160000
index 0000000..7a6675f
--- /dev/null
+++ b/vim/bundle/vim-repeat
@@ -0,0 +1 @@
+Subproject commit 7a6675f092842c8f81e71d5345bd7cdbf3759415
diff --git a/vim/bundle/vim-sensible b/vim/bundle/vim-sensible
new file mode 160000
index 0000000..d0beb8a
--- /dev/null
+++ b/vim/bundle/vim-sensible
@@ -0,0 +1 @@
+Subproject commit d0beb8ab42627bea2c747564ca46ec663e3ba0ba
diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround
new file mode 160000
index 0000000..2d05440
--- /dev/null
+++ b/vim/bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c
diff --git a/vim/bundle/vim-textobj-comment b/vim/bundle/vim-textobj-comment
new file mode 160000
index 0000000..58ae457
--- /dev/null
+++ b/vim/bundle/vim-textobj-comment
@@ -0,0 +1 @@
+Subproject commit 58ae4571b76a5bf74850698f23d235eef991dd4b
diff --git a/vim/bundle/vim-textobj-user b/vim/bundle/vim-textobj-user
new file mode 160000
index 0000000..a305416
--- /dev/null
+++ b/vim/bundle/vim-textobj-user
@@ -0,0 +1 @@
+Subproject commit a3054162c09bcf732624f43ddacbd85dad09713b
diff --git a/vim/colors/jdkaplan.vim b/vim/colors/jdkaplan.vim
new file mode 100644
index 0000000..364d743
--- /dev/null
+++ b/vim/colors/jdkaplan.vim
@@ -0,0 +1,38 @@
+" Vim color file jdkaplan
+
+set background=dark
+hi clear
+if exists("syntax_on")
+	syntax reset
+endif
+set t_Co=256
+let colors_name = "jdkaplan"
+
+hi Comment	    guifg=#aaaaaa    ctermfg=145    gui=none    cterm=none 
+hi Constant	    guifg=#b987ff    ctermfg=141    gui=none    cterm=none 
+hi Cursor	    guibg=#eeeeee    ctermbg=255    guifg=#262626    ctermfg=235    gui=none    cterm=none
+hi CursorLine	    guifg=#ffffff    ctermfg=231    guibg=#404040    ctermbg=59    gui=none    cterm=none 
+hi ColorColumn	    guifg=#ffffff    ctermfg=231    gui=none    cterm=none 
+hi Directory	    guifg=#008b8b    ctermfg=33    gui=none    cterm=none 
+hi Folded	    guibg=#555555    ctermbg=59    guifg=#ffd700    ctermfg=220    gui=none    cterm=none 
+hi Function	    guifg=#00c8ff    ctermfg=45    gui=none    cterm=none 
+hi Identifier	    guifg=#00c8ff    ctermfg=45    gui=none    cterm=none 
+hi LineNr	    guifg=#c7c7c7    ctermfg=188    gui=none    cterm=none 
+hi MatchParen	    guifg=#ff8d4f    ctermfg=209    guibg=#262626 ctermbg=235   gui=none    cterm=none
+hi Normal	    guifg=#e4e4e4    ctermfg=254    guibg=#262626    ctermbg=235    gui=none    cterm=none 
+hi NonText	    guibg=#444444    ctermbg=238    guifg=#81bed6    ctermfg=110    gui=none    cterm=none 
+hi Number	    guifg=#ff8700    ctermfg=208    gui=none    cterm=none 
+hi PreProc	    guifg=#3dc93a    ctermfg=77    gui=none    cterm=none 
+hi Statement	    guifg=#3dc93a    ctermfg=77    gui=none    cterm=none 
+hi Special	    guifg=#e4e4e4    ctermfg=254    gui=none    cterm=none 
+hi SpecialKey	    guifg=#9acd32    ctermfg=113    gui=none    cterm=none 
+hi StatusLine	    guibg=#444444    ctermbg=238    guifg=#eeeeee    ctermfg=255    gui=none    cterm=none 
+hi StatusLineNC	    guifg=#777777    ctermfg=243    gui=none    cterm=none 
+hi String	    guifg=#d49f02    ctermfg=178    gui=none    cterm=none 
+hi StorageClass	    guifg=#e8cf0e    ctermfg=184    gui=none    cterm=none 
+hi Title	    guifg=#e4e4e4    ctermfg=254    gui=none    cterm=none 
+hi Todo	    guifg=#fffefc    ctermfg=231    gui=none    cterm=none guibg=#262626 ctermbg=235
+hi Type	    guifg=#e8cf0e    ctermfg=184    gui=none    cterm=none 
+hi Underlined	    guifg=#e4e4e4    ctermfg=254    gui=underline    cterm=underline 
+hi VertSplit	    guifg=#474747    ctermfg=239    gui=none    cterm=none 
+hi Visual	    guifg=#e4e4e4    ctermfg=254    guibg=#3a3a3a    ctermbg=237    gui=none    cterm=none