chore(docs): bin/README.md tweaks

Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>

.gitignore

@@ -46,3 +46,5 @@ config/vim/.netrwhist
 config/vim/extra/*
 config/gh/hosts.yml
 dependency-check-report.html
+local/bin/yabai
+local/man/yabai.1

.pre-commit-config.yaml

@@ -49,7 +49,7 @@ repos:
       - id: actionlint
 
   - repo: https://github.com/renovatebot/pre-commit-hooks
-    rev: 39.227.2
+    rev: 39.240.1
     hooks:
       - id: renovate-config-validator
 

config/fish/config.fish

@@ -9,18 +9,21 @@ test -e "$HOME/.config/fish/exports.fish" &&
     source "$HOME/.config/fish/exports.fish"
 
 if status is-interactive
-  # Commands to run in interactive sessions can go here
+    # Commands to run in interactive shell
 
-  # Start tmux if not already running and not in SSH
+    # version manager initializers
-  open-tmux # defined in functions/open-tmux.fish
+    type -q rbenv; and source (rbenv init -|psub)
+    type -q pyenv; and source (pyenv init -|psub)
+    type -q pyenv; and source (pyenv virtualenv-init -)
+    type -q goenv; and source (goenv init -|psub)
+    # type -q fnm; and fnm env --use-on-cd --shell fish | source
+    type -q load_nvm; and load_nvm > /dev/stderr
+
+    # Start tmux if not already running and not in SSH
+    open-tmux # defined in functions/open-tmux.fish
 end
 
 # Added by LM Studio CLI (lms)
 set -gx PATH $PATH $HOME/.lmstudio/bin
 
-type -q rbenv; and source (rbenv init -|psub)
+# vim: ft=fish ts=4 sw=4 et:
-type -q pyenv; and source (pyenv init -|psub)
-type -q goenv; and source (goenv init -|psub)
-type -q fnm; and fnm env --use-on-cd --shell fish | source
-type -q load_nvm; and load_nvm > /dev/stderr
-

config/ideavim/ideavimrc

@@ -1,5 +1,5 @@
 "" Source your .vimrc
-source ~/.dotfiles/config/vim/vimrc
+source $HOME/.dotfiles/config/vim/vimrc
 
 " https://github.com/ville6000/dotfiles/blob/main/vimrc
 " To get a list of Actions run `:actionlist `

config/yabai/yabairc

@@ -7,7 +7,6 @@
 # yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
 
 yabai -m config \
-  active_window_border_color 0xff775759 \
   auto_balance on \
   layout bsp \
   top_padding 0 \

config/zed/settings.json

@@ -5,20 +5,14 @@
   "assistant": {
     "default_model": {
       "provider": "copilot_chat",
-      "model": "claude-3-5-sonnet"
+      "model": "claude-3-7-sonnet"
     },
     "version": "2"
   },
-  "formatter": {
-    "external": {
-      "command": "prettier",
-      "arguments": [
-        "--stdin-filepath",
-        "{buffer_path}"
-      ]
-    }
-  },
   "languages": {
+    "Shell Script": {
+      "enable_language_server": true
+    },
     "JavaScript": {
       "enable_language_server": true,
       "code_actions_on_format": {

local/bin/README.md

@@ -6,8 +6,15 @@ Some problematic code has been fixed per `shellcheck` suggestions.
 ## Homegrown
 
 - dfm
+- git-dirty (based on git-extra-tools)
+- git-fsck-dirs
+- git-update-dirs
+- php-switcher
+- x-backup-folder
 - x-backup-mysql-with-prefix
 - x-check-git-attributes
+- x-clean-vendordirs
+- x-env-list
 - x-open-ports
 
 ## Sourced
@@ -25,9 +32,15 @@ Some problematic code has been fixed per `shellcheck` suggestions.
 | `x-when-up`             | skx/sysadmin-util |
 
 - Sources:
-  - [skx/sysadmin-utils](https://github.com/skx/sysadmin-util/)
+  - [skx/sysadmin-utils][skx]
     - Tools for Linux/Unix sysadmins.
-    - [Licence](https://github.com/skx/sysadmin-util/blob/master/LICENSE)
+    - [Licence][skx-license]
-  - [onnimonni](https://github.com/onnimonni)
+  - [onnimonni][onnimonni]
-    - [validate_sha256sum](https://gist.github.com/onnimonni/b49779ebc96216771a6be3de46449fa1)
+    - [validate_sha256sum][onnimonni-gist]
-  - [mvdan/dotfiles](https://github.com/mvdan/dotfiles)
+  - [mvdan/dotfiles][mvdan]
+
+[onnimonni]: https://github.com/onnimonni
+[onnimonni-gist]: https://gist.github.com/onnimonni/b49779ebc96216771a6be3de46449fa1
+[skx]: https://github.com/skx/sysadmin-util
+[skx-license]: https://github.com/skx/sysadmin-util/blob/master/LICENSE
+[mvdan]: https://github.com/mvdan/dotfiles

local/bin/php-switcher

@@ -0,0 +1,443 @@
+#!/usr/bin/env bash
+#
+# Brew PHP Switcher
+#
+# Use to switch between PHP versions installed via Homebrew.
+#
+# Usage: php-switcher <version> [--help|--installed|--current|--auto]
+# Example: php-switcher 7.4
+# Example: php-switcher 8.0
+# Example: php-switcher latest
+# Example: php-switcher --auto
+#
+# Created by Ismo Vuorinen <https://github.com/ivuorinen> (2025)
+# Licensed under the MIT License (https://opensource.org/licenses/MIT)
+
+set -euo pipefail # Add error handling
+
+# Configuration
+LATEST_VERSION_FORMULA="php"    # The formula name for latest PHP version
+PHP_VERSION_FILE=".php-version" # File name to look for when auto-switching
+
+# Switch brew php version
+function check_dependencies()
+{
+  if ! command -v brew > /dev/null 2>&1; then
+    echo "Error: Homebrew is not installed"
+    exit 1
+  fi
+}
+
+function usage()
+{
+  echo "Brew PHP Switcher - Switch between PHP versions installed via Homebrew"
+  echo ""
+  echo "Usage: php-switcher <version> [options]"
+  echo ""
+  echo "Options:"
+  echo "  --help        Show this help message"
+  echo "  --installed   List installed PHP versions"
+  echo "  --current     Show currently active PHP version"
+  echo "  --auto        Auto-switch based on .php-version file in current directory"
+  echo ""
+  echo "Examples:"
+  echo "  php-switcher 7.4"
+  echo "  php-switcher 8.0"
+  echo "  php-switcher latest"
+  echo "  php-switcher --auto"
+  echo ""
+  echo "Auto-switching:"
+  echo "  Create a .php-version file in your project directory with a PHP version"
+  echo "  Example .php-version content: 8.1"
+  echo ""
+  exit 0
+}
+
+function list_php_versions()
+{
+  # Check Homebrew's installation path for PHP versions
+  local brew_cellar
+  brew_cellar="$(brew --cellar)"
+  local php_paths=()
+  local versions=()
+  local formulas=()
+  local active=()
+
+  # Look for all PHP installations in Homebrew Cellar
+  if [[ -d "$brew_cellar/php" ]]; then
+    php_paths+=("$brew_cellar/php")
+  fi
+
+  # Look for versioned PHP installations
+  while IFS= read -r dir; do
+    if [[ -d $dir ]]; then
+      php_paths+=("$dir")
+    fi
+  done < <(find "$brew_cellar" \
+    -maxdepth 1 -name 'php@*' \
+    -type d 2> /dev/null || echo "")
+
+  if [[ ${#php_paths[@]} -eq 0 ]]; then
+    echo "No PHP versions installed through Homebrew."
+    return 1
+  fi
+
+  # Find which version is currently linked
+  local current_bin
+  current_bin=$(readlink -f \
+    "$(command -v php 2> /dev/null)" \
+    2> /dev/null || echo "")
+
+  # Collect data for each installed PHP version
+  for path in "${php_paths[@]}"; do
+    local formula
+    formula=$(basename "$path")
+    local version_label
+
+    if [[ $formula == "php" ]]; then
+      version_label="latest"
+    else
+      version_label="${formula#php@}"
+    fi
+
+    # Find the actual version from the directory structure
+    local version_dir
+    version_dir=$(find "$path" -maxdepth 1 -type d \
+      | grep -v "^$path$" | sort -V | tail -1)
+
+    if [[ -n $version_dir && -d "$version_dir/bin" ]]; then
+      local full_version
+      full_version=$("$version_dir/bin/php" -v 2> /dev/null \
+        | grep -oE 'PHP [0-9]+\.[0-9]+\.[0-9]+' \
+        | head -1 \
+        | cut -d' ' -f2 \
+        || echo "$version_label.x")
+
+      # Determine if this is the active version
+      local is_active="No"
+      if [[ -n $current_bin && $current_bin == "$version_dir/bin/php" ]]; then
+        is_active="Yes"
+      fi
+
+      # Handle the 'latest' case - replace with actual version number
+      local display_version
+      if [[ $version_label == "latest" ]]; then
+        display_version="${full_version%.*}" # Get major.minor version
+      else
+        display_version="$version_label"
+      fi
+
+      # Store data for table display
+      versions+=("$display_version")
+      formulas+=("$formula")
+      active+=("$is_active")
+    fi
+  done
+
+  # Calculate maximum column widths
+  local max_version_width=7 # "Version" header length
+  local max_formula_width=7 # "Formula" header length
+  local max_active_width=6  # "Active" header length
+
+  local count=${#versions[@]}
+  for ((i = 0; i < count; i++)); do
+    # Update max widths if needed
+    if [[ ${#versions[i]} -gt $max_version_width ]]; then
+      max_version_width=${#versions[i]}
+    fi
+    if [[ ${#formulas[i]} -gt $max_formula_width ]]; then
+      max_formula_width=${#formulas[i]}
+    fi
+  done
+
+  # Build header with correct widths
+  local header_format="| %-${max_version_width}s | %-${max_formula_width}s | "
+  header_format+="%-${max_active_width}s |"
+
+  local separator_line="|"
+  for ((i = 0; i < max_version_width + 2; i++)); do
+    separator_line="${separator_line}-"
+  done
+  separator_line="${separator_line}|"
+
+  for ((i = 0; i < max_formula_width + 2; i++)); do
+    separator_line="${separator_line}-"
+  done
+  separator_line="${separator_line}|"
+
+  for ((i = 0; i < max_active_width + 2; i++)); do
+    separator_line="${separator_line}-"
+  done
+  separator_line="${separator_line}|"
+
+  # Print table header
+  # shellcheck disable=SC2059
+  printf "$header_format\n" "Version" "Formula" "Active"
+  echo "$separator_line"
+
+  # Print table rows
+  local row_format="| %-${max_version_width}s | %-${max_formula_width}s | "
+  row_format+="%-${max_active_width}s |"
+
+  for ((i = 0; i < count; i++)); do
+    # shellcheck disable=SC2059
+    printf "$row_format\n" "${versions[i]}" "${formulas[i]}" "${active[i]}"
+  done
+}
+
+function get_php_formula_for_version()
+{
+  local version="$1"
+
+  # Handle "latest" as a special case
+  if [[ $version == "latest" ]]; then
+    echo "$LATEST_VERSION_FORMULA"
+    return 0
+  fi
+
+  # The regular version case (e.g., 7.4, 8.1)
+  echo "php@$version"
+}
+
+function check_formula_installed()
+{
+  local formula="$1"
+  local brew_cellar
+  brew_cellar="$(brew --cellar)"
+
+  if [[ $formula == "php" ]]; then
+    if [[ -d "$brew_cellar/php" ]]; then
+      return 0
+    fi
+  elif [[ -d "$brew_cellar/$formula" ]]; then
+    return 0
+  fi
+
+  return 1
+}
+
+function unlink_current_php()
+{
+  local current_formula=""
+
+  # Find formulas more safely
+  while IFS= read -r formula; do
+    if [[ -n $formula ]]; then
+      local linked
+      linked=$(brew info --json=v1 "$formula" \
+        | grep -o '"linked_keg":"[^"]*"' \
+        | grep -v ':"null"')
+      if [[ -n $linked ]]; then
+        current_formula="$formula"
+        break
+      fi
+    fi
+  done < <(brew list --formula | grep -E '^php(@[0-9]+\.[0-9]+)?$' || echo "")
+
+  # If we found a linked formula, unlink it
+  if [[ -n $current_formula ]]; then
+    echo "Unlinking current PHP version ($current_formula)..."
+    brew unlink "$current_formula" > /dev/null 2>&1 || true
+  fi
+}
+
+function link_php_version()
+{
+  local formula="$1"
+
+  if ! check_formula_installed "$formula"; then
+    echo "Error: PHP formula '$formula' is not installed"
+    echo "Available versions:"
+    list_php_versions
+    exit 1
+  fi
+
+  echo "Linking $formula..."
+  if ! brew link --force --overwrite "$formula" > /dev/null 2>&1; then
+    echo "Error: Failed to link $formula. Try running manually:"
+    echo "  brew link --force --overwrite $formula"
+    exit 1
+  fi
+
+  # Verify the switch worked
+  if ! command -v php > /dev/null 2>&1; then
+    echo "Warning: PHP was linked but may not be working correctly"
+  fi
+}
+
+function get_current_version()
+{
+  if ! command -v php > /dev/null 2>&1; then
+    echo "No PHP currently linked"
+    return 1
+  fi
+
+  local version
+  version=$(php -v 2> /dev/null \
+    | grep -oE 'PHP [0-9]+\.[0-9]+\.[0-9]+' \
+    | head -1)
+
+  if [[ -z $version ]]; then
+    echo "Unable to determine PHP version"
+    return 1
+  fi
+
+  # Find the corresponding formula
+  local current_version
+  current_version=$(echo "$version" | cut -d' ' -f2)
+  local major_minor
+  major_minor=$(echo "$current_version" | cut -d'.' -f1,2)
+
+  # Check if it's the latest version
+  if check_formula_installed "php" \
+    && brew info --json=v1 php \
+    | grep -o '"linked_keg":"[^"]*"' \
+      | grep -v ':"null"' \
+      | grep -q .; then
+    echo "Current PHP version: $current_version (latest)"
+  else
+    echo "Current PHP version: $current_version (php@$major_minor)"
+  fi
+}
+
+function validate_version()
+{
+  local version="$1"
+
+  # Valid formats: x.y or latest
+  if [[ ! $version =~ ^([0-9]+\.[0-9]+|latest)$ ]]; then
+    echo "Error: Invalid PHP version format. Use x.y format (e.g., 7.4) or"
+    echo "       'latest'"
+    exit 1
+  fi
+}
+
+function find_php_version_file()
+{
+  local dir="$PWD"
+
+  # Look for .php-version file in current directory and all parent directories
+  while [[ $dir != "/" ]]; do
+    if [[ -f "$dir/$PHP_VERSION_FILE" ]]; then
+      echo "$dir/$PHP_VERSION_FILE"
+      return 0
+    fi
+    dir=$(dirname "$dir")
+  done
+
+  # Check the root directory as well
+  if [[ -f "/$PHP_VERSION_FILE" ]]; then
+    echo "/$PHP_VERSION_FILE"
+    return 0
+  fi
+
+  return 1
+}
+
+function auto_switch_php_version()
+{
+  local version_file
+
+  # Try to find a .php-version file
+  version_file=$(find_php_version_file) || {
+    echo "No .php-version file found in current directory or any parent"
+    echo "directory. Create a $PHP_VERSION_FILE file with your desired"
+    echo "PHP version (e.g., 8.1)"
+    exit 1
+  }
+
+  # Read the version from the file
+  local version
+  version=$(tr -d '[:space:]' < "$version_file")
+
+  echo "Found $PHP_VERSION_FILE file at: $version_file"
+  echo "Requested PHP version: $version"
+
+  # Validate the version
+  validate_version "$version"
+
+  # Switch to the specified version
+  switch_php_version "$version"
+}
+
+function switch_php_version()
+{
+  local version="$1"
+
+  # Get the formula name for the version
+  local formula
+  formula=$(get_php_formula_for_version "$version")
+
+  # Check if the requested PHP version is installed
+  if ! check_formula_installed "$formula"; then
+    echo "Error: PHP version $version is not installed"
+    echo ""
+    list_php_versions
+    exit 1
+  fi
+
+  # Get the current version info for comparison
+  local current_info
+  current_info=$(get_current_version 2> /dev/null || echo "None")
+
+  # Skip if we're already on the requested version
+  if [[ $current_info == *"$version"* ]]; then
+    echo "PHP version $version is already active"
+    exit 0
+  fi
+
+  # Perform the switch
+  unlink_current_php
+  link_php_version "$formula"
+
+  # Verify the switch
+  echo ""
+  echo "Switched to:"
+  get_current_version
+  echo ""
+  echo "PHP executable: $(command -v php)"
+}
+
+function main()
+{
+  local version=""
+
+  # Parse arguments
+  case "${1:-}" in
+    --help)
+      usage
+      ;;
+    --installed)
+      list_php_versions
+      exit 0
+      ;;
+    --current)
+      get_current_version
+      exit 0
+      ;;
+    --auto)
+      auto_switch_php_version
+      exit 0
+      ;;
+    "")
+      usage
+      ;;
+    *)
+      version="$1"
+      ;;
+  esac
+
+  # Validate and switch to the specified version
+  validate_version "$version"
+  switch_php_version "$version"
+}
+
+# Run the script
+check_dependencies
+if [[ ${#@} -eq 0 ]]; then
+  usage
+else
+  main "$@"
+fi
+
+# vim: ft=bash sw=4 ts=4 et tw=80 cc=80 :