Fix issues

.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)'

.bashrc

@@ -25,14 +25,12 @@ if [ -z "${arch_chroot:-}" ] && [ -r /etc/arch_chroot ]; then
 fi
 
 # set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
+export TERM=xterm-color
-    xterm-color|*-256color) color_prompt=yes;;
-esac
 
 # uncomment for a colored prompt, if the terminal has the capability; turned
 # off by default to not distract the user: the focus in a terminal window
 # should be on the output of commands, not on the prompt
-#force_color_prompt=yes
+force_color_prompt=yes
 
 if [ -n "$force_color_prompt" ]; then
     if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
@@ -114,6 +112,3 @@ if [ -f ~/.bash-fzfrc ] ; then
 	. ~/.bash-fzfrc
 fi
 
-if [ -f ~/git/dotfiles ] ; then
-        (cd ~/git/dotfiles && git pull)
-fi

.profile

@@ -0,0 +1,2 @@
+. ~/.bashrc
+bash ~/git/dotfiles/pull.sh

pull.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+if [ -f ~/git/dotfiles ] ; then
+        git config pull.rebase false
+        (cd ~/git/dotfiles && git pull)
+fi

setup.sh

@@ -1,16 +1,17 @@
-rm ../../.bash* /root/.bash*
+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
-export TERM=xterm-color
 
 cat << EOF >> /root/.bashrc
+
 PS1='${debian_chroot:+($debian_chroot)}\[\033[01;31m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 EOF
 
-. /root/.bashrc
 ln ./nanorc /etc/nanorc
+echo "Install fzf pls"