Merge pull request #16 from jacobo-doist/dotfiles-changes-from-work-machine

Bring in changes from work machine dotfiles

Author: jdevera

home/.chezmoiexternals/iterm2_shell_integration.toml

@@ -0,0 +1,6 @@
+#{{ if .is_macos }}
+[".bash.d/200_tool_iterm2_shell_integration.sh"]
+type = "file"
+url = "https://raw.githubusercontent.com/gnachman/iTerm2/master/Resources/shell_integration/iterm2_shell_integration.bash"
+refreshPeriod = "730h"
+#{{ end -}}

home/dot_bash_profile

@@ -0,0 +1,38 @@
+#!/bin/bash
+# bash_profile vs bashrc:
+# - bash_profile: sourced for LOGIN shells (SSH, Terminal.app on macOS, console login)
+# - bashrc: sourced for INTERACTIVE NON-LOGIN shells (running `bash` from existing shell)
+# This file sources bashrc so all settings work regardless of shell type
+
+{{ if .is_macos -}}
+# ------------------------------------------------------------------------------
+# Locale Configuration
+# ------------------------------------------------------------------------------
+# My macOS is configured with AppleLocale=en_ES (English language, Spain region)
+# because I live in Spain but prefer English. Problem is, there's no en_ES Unix
+# locale on macOS. The terminal tries to derive locale settings from this, fails,
+# and ends up setting LC_CTYPE=UTF-8, which is invalid (locales need the full
+# format like en_IE.UTF-8, not just UTF-8). This causes bash to complain:
+#
+#   bash: warning: setlocale: LC_COLLATE: cannot change locale (): No such file
+#
+# The fix: explicitly set a valid locale. I use en_IE.UTF-8 (English/Ireland)
+# because it gives me:
+#   - British English spelling (colour, metre, etc.)
+#   - Metric system
+#   - Euro currency symbol
+#   - 24-hour time format
+#   - dd/MM/yyyy date format
+#
+# Useful commands:
+#   defaults read -g AppleLocale      # Check macOS locale setting
+#   locale -a | grep en_              # List available English locales
+#   locale                            # Verify current settings
+# ------------------------------------------------------------------------------
+export LANG=en_IE.UTF-8
+export LC_ALL=en_IE.UTF-8
+
+{{ end -}}
+# shellcheck source=/dev/null
+[[ -s $HOME/.bashrc ]] && source "$HOME/.bashrc"
+

home/dot_bash_profile.tmpl

@@ -111,6 +111,7 @@
     aliases = !git config --get-regexp '^alias\\.' | sed 's/alias\\.\\([^ ]\\+\\) /alias \\1=/' | showaliases -
 
     mrpush = push -omerge_request.create -o merge_request.draft
+    whereami = !(g=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) && [ "$g" != HEAD ] && echo "$g") || git describe --tags --exact-match 2>/dev/null || git rev-parse --short HEAD 2>/dev/null
 
 [hub]
     protocol = https
@@ -150,3 +151,6 @@
     expandtab = true
     refreshonfocus = true
     resizebrowsercolumns = true
+
+[submodule]
+    recurse = true

home/dot_config/git/config

@@ -108,6 +108,21 @@ set -g default-terminal "screen-256color"
 # Enable truecolor where available
 set-option -ga terminal-overrides ",xterm-256color:Tc"
 
+# Allow modified key sequences (like Shift+Enter) to pass through to
+# applications instead of being swallowed by tmux. Without this, tmux treats
+# Shift+Enter the same as Enter, breaking apps that rely on the distinction
+# (e.g. Claude Code uses Shift+Enter for newline vs Enter for submit).
+set -s extended-keys always
+
+# Use the CSI u encoding for extended keys (e.g. ESC[13;2u for Shift+Enter)
+# instead of the default xterm modifyOtherKeys format (ESC[27;2;13~), which
+# apps like Claude Code don't recognise.
+set -s extended-keys-format csi-u
+
+# Tell tmux that the outer terminal supports extended keys, so tmux knows it
+# can forward CSI u-encoded sequences from the terminal.
+set -as terminal-features 'xterm*:extkeys'
+
 # }}}
 # Key Bindings {{ "{{{" }}
 # ===============

home/dot_config/tmux/tmux.conf.tmpl

@@ -243,7 +243,7 @@ if has('win32') || has('win64')
     set guifont=Lucida\ Console:h12
 elseif has('gui_macvim')
     set macligatures
-    set guifont=FiraCodeNFM-Reg:h16
+    set guifont=FantasqueSansMNFM-Regular:h18
 elseif has('unix')
     set guifont=Monaco\ 10
 endif

home/dot_vimrc

@@ -6,4 +6,21 @@ function is_cursor_agent() {
 # @tags: canbescript
 function is_ai_agent() {
     is_cursor_agent
+}
+
+# @tags: command
+# DEPENDS-ON: assert_has_command
+function claude-spend()
+{
+   if [[ "$1" == "-h" || "$1" == "--help" ]]; then
+      echo "Usage: claude-spend [DAYS]"
+      echo "Show a sparkline of daily Claude AI spend."
+      echo ""
+      echo "  DAYS  Number of days to show (default: 5)"
+      return 0
+   fi
+   assert_has_command ccusage || return 1
+   assert_has_command spark || return 1
+   local days=${1:-5}
+   spark $(ccusage daily --since "$(date -v-"${days}"d +%Y%m%d)" --jq '[.daily[].totalCost][]' --no-color)
 }

home/exact_private_dot_bash.d/private_010_functions_ai.sh

@@ -67,4 +67,26 @@ fi
 #INFOPATH="$($BREW_PATH --prefix)/share/info:$INFOPATH"
 #export MANPATH INFOPATH
 
+# Wrapper: redirect `brew update <pkg>` to `brew upgrade <pkg>` {{{
+# brew update only updates brew itself and doesn't take formula names.
+# If positional args are given, the user almost certainly meant `brew upgrade`.
+brew() {
+    if [[ "$1" == "update" && $# -gt 1 ]]; then
+        local has_positional=false
+        for arg in "${@:2}"; do
+            if [[ "$arg" != -* ]]; then
+                has_positional=true
+                break
+            fi
+        done
+        if $has_positional; then
+            echo "brew update doesn't take formula names. Running 'brew upgrade ${*:2}' instead." >&2
+            command brew upgrade "${@:2}"
+            return
+        fi
+    fi
+    command brew "$@"
+}
+# }}}
+
 unset BREW_PATH