chore: Code cleanup across GPU passthrough and VM scripts

Author: slawomir-andreasik

bin/omarchy-gpu-passthrough

@@ -15,7 +15,6 @@ if ! source "$SCRIPT_DIR/omarchy-gpu-passthrough-utils"; then
 fi
 
 # Main Help Function
-
 show_main_help() {
   cat <<EOF
 GPU Passthrough for Virtual Machines
@@ -83,11 +82,9 @@ EOF
 }
 
 # Main Dispatcher
-
 case "${1:-}" in
 mode)
   shift
-  # Handle mode --help specially
   if [[ "${1:-}" == "--help" || "${1:-}" == "-h" || "${1:-}" == "help" ]]; then
     exec "$SCRIPT_DIR/omarchy-gpu-passthrough-bind" mode --help
   else
@@ -106,10 +103,8 @@ info)
   show_main_help
   ;;
 *)
-  echo ""
   echo "Unknown command: \"$1\""
   echo "Run 'omarchy-gpu-passthrough --help' for usage information"
-  echo ""
   exit 1
   ;;
 esac

bin/omarchy-gpu-passthrough-bind

@@ -73,7 +73,6 @@ check_gpu_processes() {
         if [[ -n "$compositor_pids" ]]; then
           echo ""
           msg_error "SAFETY: Compositor has NVIDIA handle!"
-          echo ""
           msg_error "Compositor holding NVIDIA device - unbind will crash it (blackscreen)!"
           echo ""
           sudo fuser -v /dev/nvidia* 2>&1 | grep -iE "Hyprland|USER" | head -10
@@ -94,7 +93,6 @@ check_gpu_processes() {
     else
       echo ""
       msg_error "GPU actively in use (${gpu_memory_usage}MiB memory):"
-      echo ""
       GPU_PROCESSES=$(sudo fuser -v /dev/nvidia* 2>&1 | grep -v "USER\|kernel" | head -20)
       echo "$GPU_PROCESSES"
       echo ""
@@ -116,34 +114,27 @@ check_gpu_processes() {
           gpu_memory_usage=$(nvidia-smi --query-gpu=memory.used --format=csv,noheader,nounits 2>/dev/null | awk '{print int($1)}')
           if [[ "$gpu_memory_usage" -lt 10 ]]; then
             log_success "GPU processes terminated, continuing..."
-            # Continue with binding (fall through to binding code)
           else
             echo ""
             msg_error "GPU still in use (${gpu_memory_usage}MiB memory)"
-            echo ""
             log_error "Cannot bind: GPU actively in use after kill attempt"
             exit 1
           fi
         else
           msg_info "Close GPU apps manually: sudo pkill -9 -f '<name>'"
-          echo ""
           log_error "Cannot bind: GPU actively in use (${gpu_memory_usage}MiB memory used)"
           exit 1
         fi
       else
         msg_info "Close GPU apps or kill processes: sudo pkill -9 -f '<name>'"
-        echo ""
         log_error "Cannot bind: GPU actively in use (${gpu_memory_usage}MiB memory used)"
         exit 1
       fi
     fi
   elif [[ "$current_driver" == "vfio-pci" ]]; then
-    # VFIO GPU in use (likely VM running)
     echo ""
     msg_error "GPU in use by VM or VFIO process"
     echo ""
-
-    # Show process details (PIDs from gpu_processes variable set at line 36)
     local first_pid=""
     if [[ -n "$gpu_processes" ]]; then
       echo "Processes using GPU:"
@@ -158,7 +149,6 @@ check_gpu_processes() {
     fi
 
     msg_warning "GPU is bound to vfio-pci and in use (likely by running VM)"
-    echo ""
     echo "To unbind GPU:"
     echo "  1. Stop your VM: omarchy-windows-vm stop"
     if [[ -n "$first_pid" ]]; then
@@ -171,10 +161,8 @@ check_gpu_processes() {
     log_error "Cannot unbind: GPU in use by VFIO process (VM likely running)"
     exit 1
   else
-    # AMD GPU in use
     echo ""
     msg_error "AMD GPU in use by processes:"
-    echo ""
     GPU_PROCESSES=$(sudo fuser -v /dev/dri/card* /dev/dri/renderD* 2>&1 | grep -v "USER\|kernel" | head -20)
     echo "$GPU_PROCESSES"
     echo ""
@@ -196,24 +184,20 @@ check_gpu_processes() {
         GPU_PROCESSES_AFTER=$(sudo fuser -v /dev/dri/card* /dev/dri/renderD* 2>&1 | grep -v "USER\|kernel" || true)
         if [[ -z "$GPU_PROCESSES_AFTER" ]]; then
           log_success "GPU processes terminated, continuing..."
-          # Continue with binding (fall through to binding code)
         else
           echo ""
           msg_error "GPU still in use by processes"
           echo "$GPU_PROCESSES_AFTER"
-          echo ""
           log_error "Cannot bind: AMD GPU still in use after kill attempt"
           exit 1
         fi
       else
         msg_info "Close GPU apps manually: sudo pkill -9 -f '<name>'"
-        echo ""
         log_error "Cannot bind: AMD GPU in use by processes"
         exit 1
       fi
     else
       msg_info "Close GPU apps or kill processes: sudo pkill -9 -f '<name>'"
-      echo ""
       log_error "Cannot bind: AMD GPU in use by processes"
       exit 1
     fi
@@ -250,7 +234,6 @@ check_display_safety() {
         if [[ "$connected_displays" -gt 0 ]]; then
           echo ""
           msg_error "SAFETY: Monitor connected to dedicated GPU!"
-          echo ""
           msg_error "Detected $connected_displays monitor(s) on $gpu_drm_card - unbind will cause BLACKSCREEN!"
           echo ""
           msg_warning "Solution:"
@@ -295,7 +278,6 @@ unload_nvidia_modules() {
 cmd_bind() {
   log_init
 
-  # Check configuration first (before printing headers)
   if ! load_gpu_config; then
     msg_section "GPU Mode: VM"
     echo ""
@@ -306,9 +288,6 @@ cmd_bind() {
   fi
 
   msg_section "GPU Mode: Switch to VM"
-
-  echo ""
-  echo "Binding GPU to vfio-pci (VM passthrough mode)..."
   echo ""
 
   local current_driver=$(lspci -nnk -s "$GPU_PCI_ADDR" | grep "Kernel driver in use:" | awk '{print $5}')
@@ -356,9 +335,6 @@ cmd_bind() {
     sudo chgrp kvm /sys/bus/pci/drivers/vfio-pci/{bind,unbind,new_id,remove_id} 2>/dev/null || true
   fi
 
-  msg_info "Binding to vfio-pci..."
-  log_info "Binding GPU to vfio-pci..."
-
   echo "$GPU_VENDOR_ID $GPU_DEVICE_ID" | tee /sys/bus/pci/drivers/vfio-pci/new_id >/dev/null 2>&1 || true
 
   if [[ ! -d "/sys/bus/pci/drivers/vfio-pci/0000:$GPU_PCI_ADDR" ]]; then
@@ -388,10 +364,6 @@ cmd_bind() {
   echo ""
   if [[ "$current_driver" == "vfio-pci" ]]; then
     msg_success "GPU bound to vfio-pci (ready for VM)"
-    echo ""
-    echo "Next: Start VM (GPU will be used by VM)"
-    echo "Optional: 'omarchy-gpu-passthrough mode none' to unbind GPU"
-    echo ""
     log_success "=== BIND SUCCESS: GPU ready for VM passthrough ==="
 
     # Update state marker
@@ -408,7 +380,6 @@ cmd_bind() {
 cmd_set_none() {
   log_init
 
-  # Check configuration first (before printing headers)
   if ! load_gpu_config; then
     msg_section "GPU Mode: None"
     echo ""
@@ -419,9 +390,6 @@ cmd_set_none() {
   fi
 
   msg_section "GPU Mode: Switch to None"
-
-  echo ""
-  echo "Unbinding GPU from all drivers (inactive state)..."
   echo ""
 
   local current_driver=$(lspci -nnk -s "$GPU_PCI_ADDR" | grep "Kernel driver in use:" | awk '{print $5}')
@@ -476,10 +444,6 @@ cmd_set_none() {
   echo ""
   if [[ -z "$current_driver" ]]; then
     msg_success "GPU set to none mode (no driver loaded)"
-    echo ""
-    echo "GPU is now inactive (same as boot state)"
-    echo "To use: 'omarchy-gpu-passthrough mode vm' or 'mode host'"
-    echo ""
     log_success "=== SET NONE SUCCESS: GPU inactive ==="
 
     # Update state marker
@@ -496,7 +460,6 @@ cmd_set_none() {
 cmd_unbind() {
   log_init
 
-  # Check configuration first (before printing headers)
   if ! load_gpu_config; then
     msg_section "GPU Mode: Host"
     echo ""
@@ -507,9 +470,6 @@ cmd_unbind() {
   fi
 
   msg_section "GPU Mode: Switch to Host"
-
-  echo ""
-  echo "Restoring GPU to original driver (make available to host)..."
   echo ""
 
   local current_driver=$(lspci -nnk -s "$GPU_PCI_ADDR" | grep "Kernel driver in use:" | awk '{print $5}')
@@ -633,17 +593,12 @@ cmd_unbind() {
 
   show_spinner 2 "Loading driver..."
 
-  # Verify
   current_driver=$(lspci -nnk -s "$GPU_PCI_ADDR" | grep "Kernel driver in use:" | awk '{print $5}')
   log_info "Final driver: ${current_driver:-none}"
 
   echo ""
   if [[ "$current_driver" == "$GPU_DRIVER_ORIGINAL" ]] || [[ -n "$current_driver" && "$current_driver" != "vfio-pci" ]]; then
     msg_success "GPU restored to $GPU_DRIVER_ORIGINAL (available to host)"
-    echo ""
-    echo "GPU available for host use (CUDA/compute tasks)"
-    echo "To rebind for VM: omarchy-gpu-passthrough mode vm"
-    echo ""
     log_success "=== UNBIND SUCCESS: GPU restored to $GPU_DRIVER_ORIGINAL ==="
 
     # Update state marker
@@ -664,7 +619,6 @@ cmd_unbind() {
 
 # Mode Command Functions
 
-# Ensure state marker exists and matches reality (/var/run is tmpfs, marker recreated after reboot)
 ensure_state_marker() {
   # Use flock for atomic state marker operations (prevent race conditions)
   # Use user runtime directory (systemd standard) to avoid permission issues
@@ -751,7 +705,6 @@ cmd_mode_set() {
   *)
     echo ""
     msg_error "Invalid mode: $target"
-    echo ""
     echo "Valid modes: none, vm, host"
     echo "Usage: omarchy-gpu-passthrough mode [none|vm|host]"
     echo ""
@@ -770,16 +723,13 @@ cmd_mode_get() {
     echo ""
     msg_error "GPU passthrough not configured"
     msg_info "Run: omarchy-gpu-passthrough setup"
-    echo ""
     exit 1
   fi
 
   local current_driver=$(lspci -nnk -s "$GPU_PCI_ADDR" | grep "Kernel driver in use:" | awk '{print $5}')
 
   echo ""
   echo "GPU: $GPU_NAME ($GPU_PCI_ADDR)"
-  echo ""
-
   case "$current_driver" in
   vfio-pci)
     msg_success "Mode: vm"
@@ -845,7 +795,6 @@ cmd_quick_status() {
   echo ""
   echo "GPU: $GPU_NAME ($GPU_PCI_ADDR)"
   echo "Driver: ${current_driver:-none}"
-  echo ""
 
   if [[ "$current_driver" == "vfio-pci" ]]; then
     msg_success "Status: Bound to vfio-pci (ready for VM)"