Index: vim/vimrc
==================================================================
--- vim/vimrc
+++ vim/vimrc
@@ -1,15 +1,21 @@
-set runtimepath+=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after
+set runtimepath-=~/.vim
+set runtimepath-=~/.vim/after
+exe 'set runtimepath=$XDG_CONFIG_HOME/vim,' . &runtimepath .
+\   ',$XDG_CONFIG_HOME/vim/after'
 call mkdir($XDG_CACHE_HOME . "/vim/swap", "p")
 call mkdir($XDG_CACHE_HOME . "/vim/backup", "p")
 call mkdir($XDG_CACHE_HOME . "/vim/undo", "p")
 set viminfofile=$XDG_CACHE_HOME/vim/viminfo
 set directory=$XDG_CACHE_HOME/vim/swap//
 set backupdir=$XDG_CACHE_HOME/vim/backup//
 set undodir=$XDG_CACHE_HOME/vim/undo//
 
-source $VIMRUNTIME/vimrc_example.vim
+source $VIMRUNTIME/defaults.vim
+set backup
+set undofile
+set hlsearch
 
 set t_Co=256
 set background=dark
 let g:inkpot_black_background=1
 colorscheme inkpot