Compare commits

..

No commits in common. "14931c541fbad69ec78a94dd052d0f0715564800" and "cbb783bfdfd7f62becc897e5ff74be30a62c73e6" have entirely different histories.

3 changed files with 8 additions and 23 deletions

View File

@ -17,19 +17,13 @@ This is a personal development environment setup repository containing:
./setup_env.sh ./setup_env.sh
# Individual tool installations # Individual tool installations
./install_postgres.sh # PostgreSQL from official apt repository ./install_postgres.sh # PostgreSQL from official repository
./install_python3.sh # Latest Python 3 from deadsnakes PPA ./install_python3.sh # Latest Python 3 from deadsnakes PPA
./install_java_dev.sh # SDKMAN for Java development ./install_java_dev.sh # SDKMAN for Java development
./install_neovim.sh # Latest Neovim release, extracted to /opt/ ./install_neovim.sh # Latest Neovim release
./install_nvchad.sh # NvChad Neovim config
./install_visidata.sh # VisiData for terminal data exploration ./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 ### Git Operations
```bash ```bash
# Automated commit and push (defined in .bashrc) # Automated commit and push (defined in .bashrc)
@ -47,9 +41,6 @@ The repository uses **symlink-based configuration deployment**. When `setup_env.
2. `deploy_bin` symlinks every file in `dotfiles/bin/` to `~/.local/bin/<filename>` 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 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:** **Critical Files:**
- `dotfiles/.bashrc` - Main bash configuration with extensive aliases and functions - `dotfiles/.bashrc` - Main bash configuration with extensive aliases and functions
- `dotfiles/.bashrc_local` - Machine-specific environment variables (PG, MS connection strings) - `dotfiles/.bashrc_local` - Machine-specific environment variables (PG, MS connection strings)
@ -68,7 +59,7 @@ The `.bashrc` contains a sophisticated workflow for working with:
**Database Query Management:** **Database Query Management:**
PostgreSQL workflow: PostgreSQL workflow:
- `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`). - `xnspa()` function - Interactive file selector for running PostgreSQL queries through nvim swap files, outputs to VisiData as CSV
- `xnsp` - Select and execute SQL file through fzf with pspg output - `xnsp` - Select and execute SQL file through fzf with pspg output
- `xns` - Select and execute SQL file through fzf - `xns` - Select and execute SQL file through fzf
- `PG` environment variable - psql connection string to database (defined in `.bashrc_local`) - `PG` environment variable - psql connection string to database (defined in `.bashrc_local`)
@ -104,7 +95,6 @@ General:
- `tstart <tid>` - Start a timer on a task identified by a `^tid-*` block-ref - `tstart <tid>` - Start a timer on a task identified by a `^tid-*` block-ref
- `tstop` - Stop the running timer - `tstop` - Stop the running timer
- `treport [filter]` - Show totals per tid, filterable by tid or filename - `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). - 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. - Companion nvim integration (in the separate `~/.config/nvim` repo) adds `<leader>ts/tp/tr` keymaps with auto-generated tids.
@ -112,7 +102,7 @@ General:
- `nv` - Launch Neovim from custom installation path - `nv` - Launch Neovim from custom installation path
- `cj` - Navigate to journal directory - `cj` - Navigate to journal directory
- `jr` - Journal sync (pull, commit, push) - `jr` - Journal sync (pull, commit, push)
- `hc` - hc companies notes sync (pull, push) - `hc` - hc comapanies notes sync (pull, push)
### Plugin Managers ### Plugin Managers
- **Vim**: Vundle (installed to `~/.vim/bundle/Vundle.vim`) - **Vim**: Vundle (installed to `~/.vim/bundle/Vundle.vim`)
@ -135,4 +125,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. 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 ### Git Commit Messages
This repository uses simple lowercase commit messages describing the change (e.g., "add cargo", "visidata", "install sdkman"). Based on recent commits, this repository uses simple lowercase commit messages describing the change (e.g., "add cargo", "visidata", "install sdkman").

View File

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

View File

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