resolve merge conflicts

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

CLAUDE.md

@@ -17,13 +17,19 @@ This is a personal development environment setup repository containing:
 ./setup_env.sh
 
 # Individual tool installations
-./install_postgres.sh      # PostgreSQL from official repository
+./install_postgres.sh      # PostgreSQL from official apt repository
 ./install_python3.sh       # Latest Python 3 from deadsnakes PPA
 ./install_java_dev.sh      # SDKMAN for Java development
-./install_neovim.sh        # Latest Neovim release
+./install_neovim.sh        # Latest Neovim release, extracted to /opt/
+./install_nvchad.sh        # NvChad Neovim config
 ./install_visidata.sh      # VisiData for terminal data exploration
 ```
 
+After running `setup_env.sh`, activate plugins:
+- **Tmux**: Press `prefix + I` (Ctrl-b + I) to install TPM plugins
+- **Vim**: Run `:PluginInstall` inside vim to install Vundle plugins
+
+
 ### Git Operations
 ```bash
 # Automated commit and push (defined in .bashrc)
@@ -41,6 +47,9 @@ The repository uses **symlink-based configuration deployment**. When `setup_env.
 2. `deploy_bin` symlinks every file in `dotfiles/bin/` to `~/.local/bin/<filename>`
 3. This allows version control of configs and user-local scripts while keeping them in their expected locations
 
+All dotfiles are symlinked, not copied. Editing `~/.<file>` directly modifies files in the repository.
+
+
 **Critical Files:**
 - `dotfiles/.bashrc` - Main bash configuration with extensive aliases and functions
 - `dotfiles/.bashrc_local` - Machine-specific environment variables (PG, MS connection strings)
@@ -59,7 +68,7 @@ The `.bashrc` contains a sophisticated workflow for working with:
 **Database Query Management:**
 
 PostgreSQL workflow:
-- `xnspa()` function - Interactive file selector for running PostgreSQL queries through nvim swap files, outputs to VisiData as CSV
+- `xnspa()` function - Interactive file selector for running PostgreSQL queries through nvim swap files, outputs to VisiData as CSV. Accepts extra psql args (e.g. `xnspa -v var=val`).
 - `xnsp` - Select and execute SQL file through fzf with pspg output
 - `xns` - Select and execute SQL file through fzf
 - `PG` environment variable - psql connection string to database (defined in `.bashrc_local`)
@@ -95,6 +104,7 @@ General:
 - `tstart <tid>` - Start a timer on a task identified by a `^tid-*` block-ref
 - `tstop` - Stop the running timer
 - `treport [filter]` - Show totals per tid, filterable by tid or filename
+- `tweek [filter]` - Show this week's time summary
 - Wrappers use `command td` to bypass the `td` rg alias. The CLI writes one row per entry to `$TD_LOG` (default `./time.csv`, cwd-scoped).
 - Companion nvim integration (in the separate `~/.config/nvim` repo) adds `<leader>ts/tp/tr` keymaps with auto-generated tids.
 
@@ -102,7 +112,7 @@ General:
 - `nv` - Launch Neovim from custom installation path
 - `cj` - Navigate to journal directory
 - `jr` - Journal sync (pull, commit, push)
-- `hc` - hc comapanies notes sync (pull, push)
+- `hc` - hc companies notes sync (pull, push)
 
 ### Plugin Managers
 - **Vim**: Vundle (installed to `~/.vim/bundle/Vundle.vim`)
@@ -125,4 +135,4 @@ The `.bashrc_local` file is gitignored for security. Use `dotfiles/.bashrc_local
 When modifying dotfiles, remember they are symlinked. Changes are automatically tracked by git since the actual files are in the repository's `dotfiles/` directory.
 
 ### Git Commit Messages
-Based on recent commits, this repository uses simple lowercase commit messages describing the change (e.g., "add cargo", "visidata", "install sdkman").
+This repository uses simple lowercase commit messages describing the change (e.g., "add cargo", "visidata", "install sdkman").

dotfiles/.bashrc

@@ -161,6 +161,7 @@ alias hc='cd ~/storage/shared/Documents/hc_notes/ && git pull && git push && cd
 
 xnspa() {
   local file
+  local db_args="$*"
 
   file=$(
     lsof +D ~/.local/state/nvim/swap/ 2>/dev/null | grep -v 'lsof:' |
@@ -179,8 +180,8 @@ xnspa() {
     -q \
     --csv \
     --pset footer=off \
-    -f "$file" |
-  vd -
+    $db_args \
+    -f "$file" | vd -
 }
 
 
@@ -228,4 +229,4 @@ export PATH=$PATH:~/lua-language-server/bin
 [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env"
 
 # opencode
-export PATH=/home/ptrowbridge/.opencode/bin:$PATH
+export PATH=/home/pt/.opencode/bin:$PATH

dotfiles/.gitconfig

@@ -24,5 +24,9 @@
 	directory = /etc/postgresql/15/main
 	directory = /storage/emulated/0/Documents/journal
 	directory = /storage/emulated/0/Documents/hc_notes
+	directory = /opt/tps
+	directory = /etc/ngin
+	directory = /etc/nginx
+	directory = /etc/postgresql/18/prod
 [pull]
 	rebase = false