diff --git a/Makefile b/Makefile
index 0ecbc40..caa67a2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ config: yaourt
 	ln -sfP $(DOTFILES)/config/terminator.conf ~/.config/terminator/config
 	sudo ln -sfP $(DOTFILES)/config/libinput-gestures.conf /etc/libinput-gestures.conf
 	git config --global core.excludesfile ~/.dotfiles/config/gitignore_global
-	git clone https://github.com/amix/vimrc.git ~/.vim_runtime
-	sh ~/.vim_runtime/install_awesome_vimrc.sh
+	git clone https://github.com/amix/vimrc.git ~/.vim_runtime || cd ~/.vim_runtime && git pull
+	ln -sfP $(DOTFILES)/config/vimrc ~/.vimrc
 
 gnome: yaourt
 	rm -rf ~/Templates/*
diff --git a/config/vimrc b/config/vimrc
new file mode 100644
index 0000000..d4ec98b
--- /dev/null
+++ b/config/vimrc
@@ -0,0 +1,27 @@
+set runtimepath+=~/.vim_runtime
+set rtp+=/usr/share/vim/vimfiles/autoload/vundle.vim
+
+source ~/.vim_runtime/vimrcs/basic.vim
+source ~/.vim_runtime/vimrcs/filetypes.vim
+source ~/.vim_runtime/vimrcs/plugins_config.vim
+source ~/.vim_runtime/vimrcs/extended.vim
+
+try
+  source ~/.vim_runtime/my_configs.vim
+catch
+endtry
+
+cmap w!! w !sudo tee >/dev/null %
+:set mouse=a
+
+call vundle#begin()
+" alternatively, pass a path where Vundle should install plugins
+"call vundle#begin('~/some/path/here')
+
+" let Vundle manage Vundle, required
+Plugin 'VundleVim/Vundle.vim'
+
+Plugin 'rykka/clickable-things'
+
+call vundle#end()            " required
+filetype plugin indent on
diff --git a/yaourt/packages.conf b/yaourt/packages.conf
index bc0b3a6..7e89e27 100644
--- a/yaourt/packages.conf
+++ b/yaourt/packages.conf
@@ -30,7 +30,6 @@ gnome-shell-extension-status-menu-buttons
 gnome-shell-mousewheel-zoom
 google-earth
 gparted
-gvim
 handbrake
 hexchat
 hipchat