From 7eed56c9368beaa5da4c7c3a049371a0ad4963b7 Mon Sep 17 00:00:00 2001
From: Fabian Ising <f.ising@gmail.com>
Date: Wed, 24 May 2017 16:59:32 +0200
Subject: [PATCH] Fix links

---
 .gitmodules       | 11 +++++++++++
 clone_and_link.sh | 13 +++++++------
 general_setup.sh  |  2 +-
 link_config.sh    |  2 +-
 setup_arch.sh     | 11 +++++++----
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index e69de29..03a3ba0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,11 @@
+[submodule "plugins/tpm"]
+	path = tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm.git
+
+[submodule "antigen"]
+	path = zsh/antigen
+	url = https://github.com/zsh-users/antigen.git
+
+[submodule "bundle/Vundle.vim"]
+	path = vim/bundle/Vundle.vim
+	url = https://github.com/VundleVim/Vundle.vim.git
diff --git a/clone_and_link.sh b/clone_and_link.sh
index 076b08d..12b0563 100755
--- a/clone_and_link.sh
+++ b/clone_and_link.sh
@@ -8,10 +8,11 @@
 
 
 git submodule update --init --recursive
-ln -s $PWD/vim ~/.vim
-ln -s ~/.vim/.vimrc ~/.vimrc
-ln -s $PWD/zsh ~/.zsh
-ln -s ~/.zsh/.zshrc ~/.zshrc
-ln -s $PWD/tmux ~/.tmux
-ln -s ~/.tmux/.tmux.conf ~/.tmux.conf
+echo "ln -s $PWD/vim $HOME/.vim"
+ln -Tsv $PWD/vim $HOME/.vim
+ln -Tsv ~/.vim/.vimrc $HOME/.vimrc
+ln -Tsv $PWD/zsh $HOME/.zsh
+ln -Tsv ~/.zsh/.zshrc $HOME/.zshrc
+ln -Tsv $PWD/tmux $HOME/.tmux
+ln -Tsv ~/.tmux/.tmux.conf $HOME/.tmux.conf
 
diff --git a/general_setup.sh b/general_setup.sh
index f41a631..2301660 100755
--- a/general_setup.sh
+++ b/general_setup.sh
@@ -6,7 +6,7 @@
 # Distributed under terms of the MIT license.
 #
 
-zsh
+echo "exit" | zsh
 chsh -s /usr/bin/zsh
 tmux
 echo ":PluginInstall" | vim
diff --git a/link_config.sh b/link_config.sh
index 83d8e2a..0cdaa76 100755
--- a/link_config.sh
+++ b/link_config.sh
@@ -7,5 +7,5 @@
 #
 
 for filename in .config/*; do
-    ln -s $PWD/$filename ~/$filename
+    ln -Ts $PWD/$filename $HOME/$filename
 done
diff --git a/setup_arch.sh b/setup_arch.sh
index 2a6e620..2586a54 100755
--- a/setup_arch.sh
+++ b/setup_arch.sh
@@ -6,10 +6,13 @@
 # Distributed under terms of the MIT license.
 #
 
-sudo pacman -Sy archlinux-keyring --noconfirm
-sudo pacman -Syu --noconfirm
-sudo pacman -Sy base-devel xorg xorg-xinit gnome gnome-extra gvim zsh tmux openssh termite powerline powerline-fonts --noconfirm
+sudo pacman --needed -Sy archlinux-keyring --noconfirm
+sudo pacman --needed -Syu --noconfirm
+yes | sudo pacman --needed -Sy vte3-ng
+sudo pacman --needed -Sy base-devel xorg xorg-xinit gnome gnome-extra gvim zsh tmux openssh termite powerline powerline-fonts --noconfirm
 ./clone_and_link.sh
 cp zsh/.powerline_config_arch.example zsh/.powerline_config
 cp vim/.vimrc_config_powerline_arch.example vim/.vimrc_config_powerline 
-chsh -s /usr/bin/zsh
+if [ $SHELL != "/bin/zsh" ]; then
+    chsh -s /usr/bin/zsh;
+fi