3 files changed, 39 insertions, 25 deletions

diff --git a/setup/core/tmux.sh b/setup/core/tmux.sh
new file mode 100755
index 0000000..1d3a9bd
--- /dev/null
+++ b/setup/core/tmux.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")" || exit
+
+TMUX_CONF="/etc/tmux.conf"
+CLIP_HOST="p.noml.ch"
+CLIP_PORT="5023"
+CLIP_CMD="openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 ${CLIP_HOST} ${CLIP_PORT} >/dev/null 2>&1"
+
+cat << EOF > "$TMUX_CONF"
+# Vi mode for copy
+setw -g mode-keys vi
+
+# Mouse selection
+set -g mouse on
+
+# v to start selection, y to yank (like vim)
+bind-key -T copy-mode-vi v send-keys -X begin-selection
+bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "${CLIP_CMD}"
+bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "${CLIP_CMD}"
+bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "${CLIP_CMD}"
+EOF
+
+echo "tmux config written to $TMUX_CONF"
diff --git a/setup/core/vim.sh b/setup/core/vim.sh
index b67418c..1e1a4c1 100755
--- a/setup/core/vim.sh
+++ b/setup/core/vim.sh
@@ -4,11 +4,14 @@ cd "$(dirname "${BASH_SOURCE[0]}")" || exit
 
 VIMRC_PATH="/etc/vimrc"
 [ -d /etc/vim ] && VIMRC_PATH="/etc/vim/vimrc"
+CLIP_HOST="p.noml.ch"
+CLIP_PORT="5023"
+CLIP_CMD="openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 ${CLIP_HOST} ${CLIP_PORT}"
 
 cat << EOF >> "$VIMRC_PATH"
 augroup netcat_clipboard
   au!
-  au TextYankPost * call system("echo " . shellescape(@") . " | openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.noml.ch 5023 >/dev/null 2>&1 &")
+  au TextYankPost * call system("echo " . shellescape(@") . " | ${CLIP_CMD} >/dev/null 2>&1 &")
 augroup END
 
 " Enable line wrapping
@@ -53,10 +56,6 @@ nnoremap <C-e> $
 set number
 setlocal regexpengine=2
 set paste
-set foldcolumn=12 
-
+set foldcolumn=12
 
 EOF
-
-
-
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; }