diff --git a/clone_and_link.sh b/clone_and_link.sh
index ab5f3fe..e85ce86 100755
--- a/clone_and_link.sh
+++ b/clone_and_link.sh
@@ -12,3 +12,4 @@ ln -Tsv ~/.zsh/.zshrc $HOME/.zshrc
 ln -Tsv $PWD/tmux $HOME/.tmux
 ln -Tsv ~/.tmux/.tmux.conf $HOME/.tmux.conf
 ln -Tsv $PWD/nvim $HOME/.config/nvim
+ln -Tsv $PWD/.config/alacritty $HOME/.config/alacritty
diff --git a/setup_arch.sh b/setup_arch.sh
index 648636c..4c4d214 100755
--- a/setup_arch.sh
+++ b/setup_arch.sh
@@ -5,15 +5,17 @@
 #
 # Distributed under terms of the MIT license.
 #
+set -e
 
 sudo pacman --needed -Sy archlinux-keyring --noconfirm
 sudo pacman --needed -Syu --noconfirm
-sudo pacman --needed -Sy base-devel xorg xorg-xinit gnome gnome-extra neovim zsh tmux openssh alacritty powerline-fonts python-pip --noconfirm
-cp $PWD/nvim/scheme.vim.template $PWD/nvim/scheme.vim
-cp $PWD/.config/alacritty/schemes.yml.template $PWD/.config/alacritty/schemes.yml
-pip3 install neovim
+sudo pacman --needed -Sy base-devel gnome neovim zsh tmux openssh alacritty powerline-fonts python-pip python-pynvim --noconfirm
+
 ./clone_and_link.sh
 ./copy_fonts_arch.sh
+
+cp $PWD/nvim/scheme.vim.template $PWD/nvim/scheme.vim
+cp $PWD/.config/alacritty/schemes.yml.template $PWD/.config/alacritty/schemes.yml
 if [ $SHELL != "/bin/zsh" ]; then
     chsh -s /usr/bin/zsh;
 fi