diff --git a/install.sh b/install.sh
index 925bbd5..514260e 100644
--- a/install.sh
+++ b/install.sh
@@ -10,10 +10,10 @@ rm -rf ~/.cache ~/.config/_cache ~/.config/vim ~/.config/zsh
 rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh*
 mkdir -p ~/.cache/ ~/.config ~/.local/bin ~/.local/settings
 
-## neovim
-rm -rf ~/.config/nvim
-ln -sf ~/.local/repos/dotfiles/nvim ~/.config/
-touch ~/.local/settings/init.vim
+## vim
+rm -rf ~/.config/vim
+ln -sf ~/.local/repos/dotfiles/vim ~/.config/
+touch ~/.local/settings/vimrc
 
 ## fdignore
 rm -rf ~/.config/fd
diff --git a/nvim/autoload/plug.vim b/vim/autoload/plug.vim
similarity index 100%
rename from nvim/autoload/plug.vim
rename to vim/autoload/plug.vim
diff --git a/nvim/init.vim b/vim/vimrc
similarity index 93%
rename from nvim/init.vim
rename to vim/vimrc
index b1817a8..1a86750 100644
--- a/nvim/init.vim
+++ b/vim/vimrc
@@ -1,3 +1,4 @@
+set runtimepath+=~/.config/vim
 call plug#begin('$XDG_DATA_HOME/vim-plugins')
 Plug 'fatih/molokai'
 Plug 'junegunn/fzf'
@@ -15,13 +16,16 @@ call plug#end()
 set title
 set number
 set gdefault
+set wildmenu
 set nobackup
+set incsearch
 set expandtab
 set smartcase
 set splitbelow
 set splitright
 set ignorecase
 set nohlsearch
+set autoindent
 set noshowmode
 set shiftround
 set cursorline
@@ -32,10 +36,12 @@ set nowritebackup
 set bs=2
 set tabstop=2
 set scrolloff=5
+set laststatus=2
 set shiftwidth=2
 set showtabline=0
 set softtabstop=2
 set winminheight=0
+set backspace=eol,start,indent
 set matchpairs+=(:),{:},[:],<:>,':',":"
 
 nmap <tab> <C-w>w
@@ -92,4 +98,4 @@ function! LightLineReadonly()
   return &readonly && &filetype !=# 'help' ? 'RO' : ''
 endfunction
 
-source ~/.local/settings/init.vim
+source ~/.local/settings/vimrc
diff --git a/zsh/.zshrc b/zsh/.zshrc
index c295e02..87270a6 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -8,7 +8,7 @@ setopt HIST_REDUCE_BLANKS
 setopt SHARE_HISTORY
 
 export PATH=~/.local/bin:$PATH
-export MANPAGER='nvim +Man!'
+export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
 export LESSHISTFILE='/dev/null'
 
 [ ! -L ~/.cache ] && { rm -rf ~/.cache; ln -sf $XDG_CACHE_HOME ~/.cache ; }