2 files changed, 20 insertions, 7 deletions

diff --git a/port-forward/ssh-port-forward.sh b/port-forward/ssh-port-forward.sh
index 45f7a18..748c161 100644
--- a/port-forward/ssh-port-forward.sh
+++ b/port-forward/ssh-port-forward.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+#file will be run from where the user executes the script
 j=$1
 HOST="p.0nom.ch"
 KEY_FILE="m"
@@ -9,6 +10,6 @@ echo "cleaning management port..."
 ssh -i "$KEY_FILE" "$HOST" "ss -tunlp | grep :${j}022 | awk '{print $NF}' | sed 's/.*pid=\([^,]*\).*/\1/' | head -n1 | xargs kill -9"
 echo "cleaning attempted."
 
-ssh -i m sg1.0nom.ch $(for i in $(seq ${j}000 ${j}005); do echo "-R $i:localhost:$i"; done; echo "-R ${j}022:localhost:22")
+ssh -i $KEY_FILE $HOST $(for i in $(seq ${j}000 ${j}005); do echo "-R $i:localhost:$i"; done; echo "-R ${j}022:localhost:22")
 
 #seperate all the files
diff --git a/setup.sh b/setup.sh
index 5661b0f..f9d16fc 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,18 +1,27 @@
 #!/bin/bash
 
-curl -L public.0nom.ch/pubkeys >> ~/.ssh/authorized_keys
 echo "PasswordAuthentication no" | sudo tee -a /etc/ssh/sshd_config
 echo "AllowTcpForwarding yes" | sudo tee -a /etc/ssh/sshd_config
 echo "GatewayPorts yes" | sudo tee -a /etc/ssh/sshd_config
 
+sudo dnf install -y git
+git clone https://git.0nom.ch/keys ~/
+mkdir -p "~/.ssh"
+touch "~/.ssh/authorized_keys"
+find "~/keys" -name "*.pub" -type f -print0 | while IFS= read -r -d '' file; do
+    echo "Adding key from file: $file"
+    cat "$file" >> "~/.ssh/authorized_keys"
+    echo "" >> "~/.ssh/authorized_keys"  # Add a newline after each key
+done
+
 #install packages
 sudo dnf install -y epel-release dnf-utils 
-sudo dnf install -y nc autossh tmux htop tar bmon gzip tree wget curl mlocate nano vim unzip net-tools git python3 python3-pip make wireguard-tools iptables usbutils yum
+sudo dnf install -y nc openssl autossh tmux htop tar bmon gzip tree wget curl mlocate nano vim unzip net-tools git python3 python3-pip make wireguard-tools usbutils yum
 #sudo yum install -y python3-openstackclient s3fs-fuse awscli
 #pip install jupyterlab python-swiftclient
 sudo dnf update -y
 
-cat << EOF > /etc/vimrc
+cat << EOF >> /etc/vimrc
 augroup netcat_clipboard
   au!
   au TextYankPost * call system("openssl enc -aes-256-cbc -pbkdf2 -pass pass:YourPassword | nc -w 1 p.0nom.ch 5023", @")
@@ -23,12 +32,15 @@ set wrap
 
 " Optional: Make wrapped lines easier to read by indenting them
 set breakindent
-set breakindentopt=shift:2
+set breakindentopt=shift:3
 
-set list
-set listchars=tab:>-
 set autoindent
 set number
+set mouse=a
+set expandtab
+set shiftwidth=2
+set softtabstop=2
+set tabstop=2
 EOF
 
 # add check fro each component