From b22ac207d642fd01b1318dcaa79c414e46f2644f Mon Sep 17 00:00:00 2001
From: "flyingscorpio@arch-desktop" <tfranken@protonmail.com>
Date: Wed, 8 Apr 2020 17:17:10 +0200
Subject: [PATCH] Add vim installation

---
 installation_scripts/arch_based_installs.sh   |  8 +++++
 installation_scripts/debian_based_installs.sh |  8 +++++
 main_install.sh                               | 29 ++++++++++---------
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/installation_scripts/arch_based_installs.sh b/installation_scripts/arch_based_installs.sh
index f45aa36..c2373f1 100644
--- a/installation_scripts/arch_based_installs.sh
+++ b/installation_scripts/arch_based_installs.sh
@@ -30,3 +30,11 @@ if sudo pacman -S --needed git; then
 else
   echo "${RED}Didn't install Git${NC}"
 fi
+
+echo "Installing Vim..."
+# I use gvim instead of vim because the clipboard is compiled in gvim
+if sudo pacman -S --needed gvim; then
+  echo "${GREEN}Successfully installed Vim${NC}"
+else
+  echo "${RED}Didn't install Vim${NC}"
+fi
diff --git a/installation_scripts/debian_based_installs.sh b/installation_scripts/debian_based_installs.sh
index 10d5849..e57adf9 100644
--- a/installation_scripts/debian_based_installs.sh
+++ b/installation_scripts/debian_based_installs.sh
@@ -39,3 +39,11 @@ if sudo apt install git; then
 else
   echo "${RED}Didn't install Git${NC}"
 fi
+
+echo "Installing Vim..."
+# I use gvim instead of vim because the clipboard is compiled in gvim
+if sudo apt install gvim; then
+  echo "${GREEN}Successfully installed Vim${NC}"
+else
+  echo "${RED}Didn't install Vim${NC}"
+fi
diff --git a/main_install.sh b/main_install.sh
index eeb0c69..13e6dc3 100755
--- a/main_install.sh
+++ b/main_install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ## Script to automate the setting up of my working environment.
-
+## flyingscorpio
 
 RED=$(tput setaf 1)
 GREEN=$(tput setaf 2)
@@ -14,12 +14,12 @@ export ORANGE
 export NC
 
 BASE_DIR="$PWD"
-echo "$BASE_DIR"
 export BASE_DIR
 
 # Define OS {{{
 
 OS='none'
+
 os_release=$(cat /etc/os-release*)
 case ${os_release,,} in
   *debian* )
@@ -49,9 +49,8 @@ case ${os_release,,} in
     done
     echo "Using $OS"
 esac
-export OS
 
-/bin/bash "$BASE_DIR"/installation_scripts/separator.sh
+export OS
 
 # }}}
 
@@ -59,6 +58,7 @@ export OS
 
 OVERWRITE='false'
 UPDATE='false'
+
 if [ "$1" = '-o' ] || [ "$1" = '--overwrite' ] || [ "$2" = '-o' ] || [ "$2" = '--overwrite' ]; then
   echo "${ORANGE}You agree to overwrite preexisting files!${NC}"
   OVERWRITE='true'
@@ -78,13 +78,6 @@ export UPDATE
 
 # }}}
 
-# Update vim configuration {{{
-
-/bin/bash "$BASE_DIR"/installation_scripts/vim_update.sh
-/bin/bash "$BASE_DIR"/installation_scripts/separator.sh
-
-# }}}
-
 # Install scripts {{{
 
 echo "Installing scripts..."
@@ -102,15 +95,23 @@ fi
 
 # }}}
 
-exit
+# Update vim configuration {{{
+
+echo "Setting up configuration for Vim"
+
+/bin/bash "$BASE_DIR"/installation_scripts/vim_update.sh
+
+/bin/bash "$BASE_DIR"/installation_scripts/separator.sh
+
+# }}}
 
 # Configure ProtonVPN {{{
 
 echo "Configuring ProtonVPN..."
 
-sudo protonvpn init && sudo protonvpn c --cc NL
+sudo protonvpn init && sudo protonvpn c --cc CH
 
-/bin/bash ~/SetupCockpit/separator.sh
+/bin/bash "$BASE_DIR"/installation_scripts/separator.sh
 
 # }}}