Bashmarks: Migrate to XDG layout with dotfiles/local split

Move bashmarks from ~/.bashmarks to ~/.config/bashmarks/ with two files:
- dotfiles.bashmarks: tracked standard bookmarks
- local.bashmarks: includes dotfiles + machine-specific entries

Add migration scripts:
- run_once_before_ moves existing ~/.bashmarks to new location
- run_onchange_after_ deduplicates local entries when dotfiles change

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: jdevera

home/.chezmoiscripts/run_once_before_migrate-bashmarks.sh.tmpl

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# {{ template "dotfiles_bashlib.sh" . }}
+
+# Help shellcheck identify the above include
+true || source ../.chezmoitemplates/dotfiles_bashlib.sh
+
+# This script migrates ~/.bashmarks to the new XDG-style location
+# It only moves the file; deduplication happens in a separate run_onchange_after_ script
+
+dot::chezmoi_script_start "migrate bashmarks to XDG location"
+
+OLD_FILE="$HOME/.bashmarks"
+NEW_DIR="$HOME/.config/bashmarks"
+NEW_FILE="$NEW_DIR/local.bashmarks"
+
+if [[ ! -f "$OLD_FILE" ]]; then
+    dot::chezmoi_script_skipped "no ~/.bashmarks file to migrate"
+fi
+
+if [[ -f "$NEW_FILE" ]]; then
+    dot::chezmoi_script_skipped "local.bashmarks already exists, migration already done"
+fi
+
+dot::step::start "create bashmarks config directory"
+mkdir -p "$NEW_DIR" || dot::step::fatal
+dot::step::done
+
+dot::step::start "move ~/.bashmarks to new location"
+mv "$OLD_FILE" "$NEW_FILE" || dot::step::fatal
+dot::step::done
+
+dot::success "migrated ~/.bashmarks to $NEW_FILE"

home/.chezmoiscripts/run_onchange_after_bashmarks-dedup.sh.tmpl

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# dotfiles.bashmarks hash: {{ include "dot_config/bashmarks/dotfiles.bashmarks.tmpl" | sha256sum }}
+
+# {{ template "dotfiles_bashlib.sh" . }}
+
+# Help shellcheck identify the above include
+true || source ../.chezmoitemplates/dotfiles_bashlib.sh
+
+# This script removes duplicate entries from local.bashmarks that already exist
+# in dotfiles.bashmarks. It runs whenever dotfiles.bashmarks changes.
+
+dot::chezmoi_script_start "deduplicate bashmarks"
+
+DOTFILES="$HOME/.config/bashmarks/dotfiles.bashmarks"
+LOCAL="$HOME/.config/bashmarks/local.bashmarks"
+
+if [[ ! -f "$LOCAL" ]]; then
+    dot::chezmoi_script_skipped "no local.bashmarks file"
+fi
+
+if [[ ! -f "$DOTFILES" ]]; then
+    dot::chezmoi_script_skipped "no dotfiles.bashmarks file"
+fi
+
+# Build list of bookmark names from dotfiles (second field after |)
+dotfiles_names=$(grep -v '^#' "$DOTFILES" 2>/dev/null | grep -v '^$' | cut -d'|' -f2)
+
+if [[ -z "$dotfiles_names" ]]; then
+    dot::chezmoi_script_skipped "no bookmarks in dotfiles.bashmarks"
+fi
+
+# Process line by line, preserving order and context
+dot::step::start "remove duplicates from local.bashmarks"
+tmpfile=$(mktemp)
+removed=0
+
+while IFS= read -r line || [[ -n "$line" ]]; do
+    # Keep empty lines
+    if [[ -z "$line" ]]; then
+        echo "$line" >> "$tmpfile"
+        continue
+    fi
+    # Keep comments and #include lines
+    if [[ "$line" == \#* ]]; then
+        echo "$line" >> "$tmpfile"
+        continue
+    fi
+    # Check if bookmark name exists in dotfiles
+    name=$(echo "$line" | cut -d'|' -f2)
+    if echo "$dotfiles_names" | grep -qx "$name"; then
+        ((removed++))  # Skip this line (duplicate)
+    else
+        echo "$line" >> "$tmpfile"  # Keep unique entries
+    fi
+done < "$LOCAL"
+
+mv "$tmpfile" "$LOCAL"
+dot::step::done
+
+dot::success "removed $removed duplicate entries from local.bashmarks"

home/dot_bashmarks.tmpl …config/bashmarks/dotfiles.bashmarks.tmplhome/dot_bashmarks.tmpl renamed to home/dot_config/bashmarks/dotfiles.bashmarks.tmpl home/dot_bashmarks.tmpl renamed to home/dot_config/bashmarks/dotfiles.bashmarks.tmpl

@@ -1,3 +1,6 @@
+# Bashmarks managed by dotfiles
+# Add bookmarks here that should be synced across machines
+
 $HOME/devel/projects|proj
 $HOME/devel/checkout|co
 $HOME/devel/sandbox|sb
@@ -11,4 +14,3 @@ $HOME/Library/Application Support|las
 {{- if eq .chezmoi.os "linux" }}
 $HOME/comms/downloads|dow
 {{- end }}
-

home/dot_config/bashmarks/modify_local.bashmarks

@@ -0,0 +1,19 @@
+#!/bin/bash
+# Ensure local.bashmarks includes dotfiles.bashmarks
+
+INCLUDE_LINE='#include ~/.config/bashmarks/dotfiles.bashmarks'
+
+# Read current contents (empty if file doesn't exist)
+current=$(cat)
+
+# Check if include line already exists
+if echo "$current" | grep -qF "$INCLUDE_LINE"; then
+    # Already has the include, output as-is
+    echo "$current"
+else
+    # Add include at the top
+    echo "$INCLUDE_LINE"
+    if [ -n "$current" ]; then
+        echo "$current"
+    fi
+fi

home/exact_private_dot_bash.d/195_tool_bashmarks_config.sh

@@ -0,0 +1,4 @@
+# Bashmarks configuration
+# Set before bashmarks.sh is sourced (200_tool_bashmarks.sh)
+
+export BASHMARKS_FILE="$HOME/.config/bashmarks/local.bashmarks"