chore: merge conflict resolve

.bashrc_ext

@@ -19,6 +19,7 @@ alias dcul='docker compose up -d && docker compose logs -f'
 alias dcup='docker compose pull && docker compose down && dcul'
 alias dcd='docker compose down'
 alias dcb='docker compose build'
+alias dclf='docker compose logs -f'
 alias update='sudo apt update && sudo apt upgrade -y'
 
 cd() {
@@ -130,6 +131,22 @@ backup() {
     echo "Backup created: $backup_name"
 }
 
+check_ports() {
+    if [ $# -eq 0 ]; then
+        echo "Usage: check_ports <range>"
+        return 1
+    fi
+    ss -tuln | grep ":$1"
+}
+
+git_stash_diff() {
+    if [ $# -eq 0 ]; then
+        git stash show -p
+    else
+        git stash show -p stash@{"$1"}
+    fi
+}
+
 # on startup
 # Check if tmux is installed and automatically start tmux on SSH login
 if command -v tmux &> /dev/null && [ -z "$TMUX" ] && [ -n "$SSH_CONNECTION" ]; then

.config/atuin/config.toml

@@ -1 +1,2 @@
 sync_address = "http://10.1.0.2:8888"
+sync_frequency = "0"

.vimrc

@@ -1 +1,8 @@
 set pastetoggle=<F2>
+syntax on
+set number
+set expandtab
+set tabstop=2
+set shiftwidth=2
+set softtabstop=2
+set smartindent