diff --git a/setup-env.sh b/setup-env.sh
index b57da3d..9af8021 100755
--- a/setup-env.sh
+++ b/setup-env.sh
@@ -39,6 +39,16 @@ sudo pip install --upgrade pip && \
 sudo pip install virtualenvwrapper && \
 
 source ~/.zshrc && \
+
+# Check whether to install vim
+read -p "Setup vim? (Y/n)?" CONT
+if [ "$CONT" = "n" ]; then
+    echo Skipping vim installation
+  else
+      # Run vim installation script
+      ./setup-vim.sh
+    fi
+
 echo '
 
 
@@ -50,3 +60,4 @@ echo '
 
 ' && \
 echo 'Restart your shell to apply changes'
+
diff --git a/setup-vim.sh b/setup-vim.sh
index 1e96251..06e5943 100755
--- a/setup-vim.sh
+++ b/setup-vim.sh
@@ -1,15 +1,17 @@
 #!/bin/bash
+echo 'Installing vim...'
 
-# Add vim 8 repository
-sudo add-apt-repository ppa:jonathonf/vim
+# Add vim 8 repository and install vim8.0
+printf '\n' | sudo add-apt-repository ppa:jonathonf/vim
 apt-get update >> /dev/null;
 apt-get install vim -y;
 
+# Remove default vim config directory
 rm -rf ~/.vim
 # To uninstall and return to stock
 # sudo apt install ppa-purge && sudo ppa-purge ppa:jonathonf/vim
 
-# Download color scheme
+# Download color scheme - ne bash
 wget https://raw.githubusercontent.com/ViktorBarzin/dot_files/master/.vimrc -O ~/.vimrc;
 # Move plugins to plugins folder
 mv vim-plugins ~/.vim