From f5dc7c53d99964d383c92bd273664f6f1530bcaf Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Sat, 17 Jan 2026 23:07:51 -0500 Subject: [PATCH] remove .bashrc_local from tracking and add template - Add .gitignore to exclude .bashrc_local - Create .bashrc_local_example template with placeholder passwords - Remove .bashrc_local from git tracking Co-Authored-By: Claude Sonnet 4.5 --- .gitignore | 2 ++ dotfiles/.bashrc | 23 ++++++++++++++++-- dotfiles/.bashrc_local | 9 ------- dotfiles/.bashrc_local_example | 44 ++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 11 deletions(-) create mode 100644 .gitignore delete mode 100644 dotfiles/.bashrc_local create mode 100644 dotfiles/.bashrc_local_example diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6b9d6ab --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# Ignore the actual .bashrc_local with real passwords +dotfiles/.bashrc_local diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc index 1b1993e..6697cfd 100644 --- a/dotfiles/.bashrc +++ b/dotfiles/.bashrc @@ -112,7 +112,26 @@ alias xmsp='lsof +D ~/.local/state/nvim/swap/ | grep -o "/swap/.*" | cut -c 7- | alias xms='lsof +D ~/.local/state/nvim/swap/ | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | grep "$(pwd | sed "s|^//|/|")" | fzf | xargs -I % $MSW -i % ' # alias xmspa='lsof +D ~/.local/state/nvim/swap/ | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | grep "$(pwd | sed "s|^//|/|")" | fzf | xargs -I % $MSC -i % | vd -f csv -' # alias xmspa='selected_file=$(lsof +D ~/.local/state/nvim/swap/ | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | grep "$(pwd)" | fzf) && [ -n "$selected_file" ] && $MSC -i "$selected_file" | vd -f csv -' -alias xmspa='selected_file=$(lsof +D ~/.local/state/nvim/swap/ | grep -o "/swap/.*" | cut -c 7- | tr "%" "/" | sed "s/\\.swp$//" | grep "$(pwd)" | fzf) && [ -n "$selected_file" ] && $MSC -i "$selected_file" | sed "2d" | vd -d "|" - > /dev/null 2>&1' +xmspa() { + local file + + file=$( + lsof +D ~/.local/state/nvim/swap/ 2>/dev/null | + grep -o "/swap/.*" | + sed 's|^/swap/||' | + tr "%" "/" | + sed -E 's/\.sw[op]$//' | + grep "$(pwd | sed 's|^//|/|')" | + fzf + ) || return + + [[ -z "$file" ]] && return + + eval "$MS" \ + -i "$file" | + sed "2d" | + vd -d "|" - > /dev/null 2>&1 +} alias nv='~/nvim-linux64/bin/nvim' alias gs='git status -s' alias ga='git status --untracked-files=all -s | fzf -m | awk "{print \$2}" | xargs git add ' @@ -195,6 +214,6 @@ fi bind 'set bell-style none' -[ -f ~/dot_config/.bashrc_local ] && source ~/dot_config/.bashrc_local +[ -f ~/setup_env/dotfiles/.bashrc_local ] && source ~/setup_env/dotfiles/.bashrc_local export PATH=$PATH:~/lua-language-server/bin [ -f "$HOME/.cargo/env" ] && . "$HOME/.cargo/env" diff --git a/dotfiles/.bashrc_local b/dotfiles/.bashrc_local deleted file mode 100644 index 58d870c..0000000 --- a/dotfiles/.bashrc_local +++ /dev/null @@ -1,9 +0,0 @@ -#export IPTOKEN= -#export PG="psql -U ptrowbridge -d ubm -p 5432 -h usmidsap01" -#export MS="sqlcmd.exe -S mid-sql02 -i" -#export JAVA_HOME=/opt/jdk-19.0.1 -#export PATH=$PATH:$JAVA_HOME/bin -#export PATH=$PATH:/opt/gradle/gradle-7.6/bin -#export RUNNER_PATH=/opt/runner/ -#export DB2PW= -#export PGPW= diff --git a/dotfiles/.bashrc_local_example b/dotfiles/.bashrc_local_example new file mode 100644 index 0000000..f395274 --- /dev/null +++ b/dotfiles/.bashrc_local_example @@ -0,0 +1,44 @@ +# .bashrc_local - Machine-specific environment variables +# Copy this file to .bashrc_local and fill in your actual values + +# Token for IP services (if needed) +#export IPTOKEN= + +# PostgreSQL connection string +export PG="psql -U username -d database -p 5432 -h hostname" + +# SQL Server connection strings +export MS="sqlcmd -U username -C -S servername" +export MSC="sqlcmd -U username -S servername -C -s \| -W" + +# Java and Gradle paths +export JAVA_HOME=/opt/jdk-20.0.1 +export PATH=$PATH:$JAVA_HOME/bin +export PATH=$PATH:/opt/gradle/gradle-8.1/bin +export PATH=$PATH:/opt/mssql-tools18/bin + +# Runner configuration path +export RUNNER_PATH=/opt/jrunner_conf/ + +# Database passwords (fill in your actual passwords) +export DB2PW=your_db2_password_here +export PGPW=your_postgres_password_here +export SQLCMDPASSWORD='your_sqlcmd_password_here' + +# Windows SQL Server connection (if needed) +# export MSW="sqlcmd.exe -S servername -C " + +# Alternative Java/Gradle versions (commented out) +#export JAVA_HOME=/opt/jdk-19.0.1 +#export PATH=$PATH:$JAVA_HOME/bin +#export PATH=$PATH:/opt/gradle/gradle-7.6/bin +#export RUNNER_PATH=/opt/runner/ + +# Deno installation +export DENO_INSTALL="$HOME/.deno" +export PATH="$DENO_INSTALL/bin:$PATH" + +# NVM (Node Version Manager) +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion