From 7567ffcd7611c0cfa4750c0b03c6d40ccfe97882 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Wed, 28 Dec 2022 15:38:02 -0500
Subject: [PATCH] Fix issues

---
 .bash_aliases | 10 +++++-----
 .bashrc       |  3 ++-
 setup.sh      |  8 +++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index 6a367f4..72cbe67 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,15 +1,15 @@
-alias dcpull='docker-compose pull && docker-compose down && docker-compose up -d'
+alias dcpull='docker compose pull && docker compose down && docker compose up -d'
 alias dprune='docker image prune -f'
-alias dcrestart='docker-compose down && docker-compose up -d'
+alias dcrestart='docker compose down && docker compose up -d'
 
 alias tup='sudo tailscale up --login-server https://headscale.nelim.org'
 
 alias ncht='docker exec -it --user www-data app-server php occ maintenance:update:htaccess'
 
-alias serv='ssh -p 6768 dock@10.0.0.121'
+alias pve='ssh root@10.0.0.121'
+alias mc='ssh mc@10.0.0.124'
+alias dock='ssh -p 6768 dock@10.0.0.122'
 alias oksys='ssh matt@10.0.0.213'
 alias router='ssh root@10.0.0.2'
 
 alias ls='ls -lah --color=auto'
-
-alias autorm='yay -Rc $(yay -Qdt | cut -d " " -f1)'
diff --git a/.bashrc b/.bashrc
index 0e45c1e..8b0380e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -110,4 +110,5 @@ fi
 
 if [ -f ~/.bash-fzfrc ] ; then
 	. ~/.bash-fzfrc
-fi
\ No newline at end of file
+fi
+
diff --git a/setup.sh b/setup.sh
index 4aadc4b..0c898d8 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,15 +1,17 @@
-rm ../../.bash* ../../.profile /root/.bash* /etc/nanorc 
+rm ../../.bash* ../../.profile /root/.bash* /etc/nanorc
 
 ln ./.bash* /root
 ln ./.bash* ../../
 ln ./.profile ../../
 
-rm /root/.bashrc
+rm /root/.bashrc /root/.profile
 cp .bashrc /root
+cp .profile /root
 
 cat << EOF >> /root/.bashrc
+
 PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 EOF
 
 ln ./nanorc /etc/nanorc
-apt install fzf -y
+echo "Install fzf pls"