diff --git a/install.sh b/install.sh
index a3fa64c..b6e91da 100644
--- a/install.sh
+++ b/install.sh
@@ -23,9 +23,9 @@ rm -rf $XDG_DATA_HOME/repos/dotfiles
 git clone --recurse https://git.insomniac.pl/ftpd/dotfiles $XDG_DATA_HOME/repos/dotfiles
 
 ## vim
-rm -rf ~/.config/vim
-ln -sf $XDG_DATA_HOME/repos/dotfiles/vim ~/.config/
-touch ~/.local/config/vimrc
+rm -rf ~/.config/nvim
+ln -sf $XDG_DATA_HOME/repos/dotfiles/nvim ~/.config/
+touch ~/.local/config/init.vim
 
 ## fdignore
 rm -rf ~/.config/fd
diff --git a/nvim/init.vim b/nvim/init.vim
index 77a7724..fcf7367 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,6 +1,3 @@
-set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME
-set viminfofile=$XDG_CACHE_HOME/viminfo
-
 call plug#begin('$XDG_DATA_HOME/vim-plugins')
 Plug 'kamykn/skyknight'
 Plug 'junegunn/fzf'
@@ -99,4 +96,4 @@ function! LightLineReadonly()
   return &readonly && &filetype !=# 'help' ? '' : ''
 endfunction
 
-source ~/.local/config/vimrc
+source ~/.local/config/init.vim
diff --git a/zsh/.zshrc b/zsh/.zshrc
index f411f6d..37523c0 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -11,7 +11,6 @@ setopt SHARE_HISTORY
 
 export PATH=~/.local/bin:$PATH
 export EDITOR=vim
-export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
 tabs 2
 
 mkdir -p $XDG_DATA_HOME/zsh
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 73e10bd..8df4607 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -1,8 +1,5 @@
 alias grep='grep --color'
 alias less='less -r'
-if [ $(command -v bat) ]; then
-  alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright'
-fi
 if [ $(command -v exa) ]; then
   alias ls='exa --group-directories-first'
   alias ll='ls -l --git --octal-permissions --no-permissions'
@@ -13,9 +10,9 @@ else
   esac
   alias ll='ls -l'
 fi
-if [ $(command -v fd) ]; then
-  alias fd='fd -H -L --ignore-file ~/.local/config/fd'
-fi
+[ $(command -v bat) ] && alias cat='bat -pp --color=always --tabs=2 --theme=Monokai\ Extended\ Bright'
+[ $(command -v fd) ] && alias fd='fd -H -L --ignore-file ~/.local/config/fd'
+[ $(command -v nvim) ] && alias vim=nvim && alias vimdiff="nvim -d"
 
 function ud() {
   wd dots && git pull