Merge branch 'main' of git.nelim.org:matt1432/dotfiles

files/.bash_aliases

@@ -1,15 +1,16 @@
-alias dcpull='docker compose pull && docker compose down && docker compose up -d'
+# docker
+alias dcpull='docker compose pull && docker compose down --remove-orphans && docker compose up -d'
 alias dprune='docker image prune -f'
-alias dcrestart='docker compose down && docker compose up -d'
+alias dcrestart='docker compose down --remove-orphans && docker compose up -d'
 
 alias docker='docker '
 alias ps='ps -a --format "table {{.Names}}:\t{{.State}}\t{{.Status}}"'
 
-alias tup='tailscale up --login-server https://headscale.nelim.org'
-
 alias ncht='docker exec -it --user www-data app-server php occ maintenance:update:htaccess'
 
-alias tmux='tmux -2 '
+
+# ssh and friends 
+alias tup='tailscale up --login-server https://headscale.nelim.org'
 
 alias pve='ssh matt@10.0.0.121'
 alias mc='ssh mc@10.0.0.124'
@@ -18,13 +19,14 @@ alias oksys='ssh matt@10.0.0.213'
 alias router='ssh root@10.0.0.2'
 alias jelly='ssh matt@10.0.0.123'
 
+
+# add default flags
+alias tmux='tmux -2 '
 alias ls='ls -lah --color=auto'
+alias cp='cp -r'
 
-alias pushdot='bash ~/git/dotfiles/pull.sh'
-alias resetdot='(cd ~/git/dotfiles; bash setup.sh)'
 
+# privileged
 alias sudo='sudo '
 alias frick='sudo $(fc -ln -1)'
 alias grubup='grub-mkconfig -o /boot/grub/grub.cfg ; sudo sed -i 's/echo/#ech~o/g' /boot/grub/grub.cfg'
-alias cmd='command'
-alias cursor='setterm -cursor on >> /etc/issue'