1 files changed, 10 insertions, 19 deletions

diff --git a/setup/setup.sh b/setup/setup.sh
index 1aecd1c..d5c009b 100755
--- a/setup/setup.sh
+++ b/setup/setup.sh
@@ -1,30 +1,21 @@
 #!/bin/bash
 
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 cd "$SCRIPT_DIR" || exit
 
-sudo tee -a /etc/bashrc > /dev/null << 'EOF2'
+# Shell appearance
+sudo tee -a /etc/bashrc > /dev/null << 'EOF'
 LS_COLORS=$LS_COLORS:'di=38;5;135:ex=00;32:' ; export LS_COLORS
 PS1='[\[\033[01;32m\]\u\[\033[00m\]@\h \[\033[38;5;135m\]\W\[\033[00m\]]\$ '
-EOF2
+export TERM=xterm-256color
+EOF
 source /etc/bashrc
 
-sudo bash ./core/ssh.sh || { echo "Failed to configure SSH"; exit 1; }
-sudo bash ./core/vim.sh || { echo "Failed to configure Vim"; exit 1; }
-sudo bash ./core/install-packages.sh || { echo "Failed to install packages"; exit 1; }
-
+# Timezone
 sudo timedatectl set-timezone Asia/Singapore
 
-# add check fro each component
-
-# then git clone work directory, or git clone altogether
-
-sudo dnf install -y ncurses-term nc # nc for vim
-echo "export TERM=xterm-256color" >> ~/.bashrc
-source ~/.bashrc
-tput colors  # shld be 256
-
-
-
-
+# Core setup
+sudo bash ./core/install-packages.sh || { echo "Failed to install packages"; exit 1; }
+sudo bash ./core/ssh.sh              || { echo "Failed to configure SSH"; exit 1; }
+sudo bash ./core/vim.sh              || { echo "Failed to configure Vim"; exit 1; }
+sudo bash ./core/tmux.sh             || { echo "Failed to configure Tmux"; exit 1; }