Commit graph

457 commits

Author SHA1 Message Date
Sami Samhuri
680c5f03a9
Dedupe duplicate git [commit] block in gitconfig 2026-06-22 18:11:28 -07:00
edc90821c3 Add gdu to Brewfile 2026-06-19 23:47:29 -07:00
Sami Samhuri
968bc770e5 Add gradient powerline pill prefix to jj prompt line
Marks the jj status line with a colored 'jj' powerline pill so it stands
out from command output above it. Track FiraCode Nerd Font in the Brewfile
since the powerline separators need a Nerd Font.
2026-06-18 19:19:52 -07:00
Sami Samhuri
e92a2eeb92 Make jj tips only show mutable and non-empty changes 2026-06-18 15:34:05 -07:00
a41717ab98 Use jj b advance instead of a tug alias
Drop the tug alias plus its closest_bookmark and tug_target revsets in favour
of the built-in jj b advance. The bookmark-advance-from default already matches
the old closest_bookmark, and setting revsets.bookmark-advance-to keeps the
empty-scratchpad behaviour (land on @, or @- when @ is empty).
2026-06-18 09:03:48 -07:00
Sami Samhuri
c9698b86b3 Add behind_trunk revset and stale alias, scope bks to mine() 2026-06-15 17:49:29 -07:00
f094a00623 Make tug skip empty @ and target @- instead
When @ is a fresh empty scratchpad, tug now moves the closest bookmark to
@- so it lands on the actual work instead of the empty change. Driven by a
new tug_target() revset.
2026-05-31 14:52:03 -07:00
8d9909688b Track common Homebrew developer tools 2026-05-30 17:08:14 -07:00
009a2df1b4 Add tracked jj config with aliases, revsets, and per-machine override support 2026-05-29 18:57:21 -07:00
6c815121ff Remove cruft committed by mistake 2026-05-29 12:31:31 -07:00
Sami Samhuri
cb476d4979 Highlight change ID prefix and refine prompt colors
Bold magenta on the unique prefix, gray on the rest, matching jj's own
log output. Gray parens instead of yellow. Empty marker moved to the
diff-stat slot for a uniform layout.
2026-05-29 12:13:31 -07:00
Sami Samhuri
d53fd836ce Add multiline jj prompt with change id, bookmarks, diff stat, parents, and description 2026-05-26 18:04:32 -07:00
c96abb64d4 Configure jj defaults to prefer github remote 2026-05-17 08:17:49 -07:00
Sami Samhuri
906d817c70 Remove claude-scratchpad from gitignore 2026-05-11 14:33:55 -07:00
468acc22c7 Fix jj identity check in init.sh
jj config get exits 0 for empty defaults, so the old exit-code check
always concluded name/email were already set. Switch to checking the
actual output value instead.
2026-05-02 09:37:58 -07:00
95222a65b9 Set up jj name and email in init.sh 2026-05-01 18:13:53 -07:00
869f56305b
Remove bundle/config from git 2026-03-30 12:31:13 -07:00
d6148217c1
Fix gitconfig include syntax 2026-03-25 15:10:48 -07:00
e8fdffc5e1 Extract SSH key config to gitconfig-ssh 2026-03-25 14:33:21 -07:00
2044019e67
Use difft with git via GIT_EXTERNAL_DIFF instead of gitconfig
Sometimes tools don't pass --no-ext-diff and difft can be very slow
and/or break tools that don't expect its output.
2026-03-19 17:09:45 -07:00
ae9b658f1c
Try workaround from mosh PR #1054 2026-02-28 11:30:31 -08:00
787da4cf93
Tweak setting terminal-features for tmux copy 2026-02-28 11:27:44 -08:00
77084aad8d
Try to fix copying text using tmux inside of mosh 2026-02-28 11:09:06 -08:00
118483898d
Swap claude back in for cc alias 2026-02-10 14:56:11 -08:00
32461a3a56
Conditionally configure zsh based on interactivity 2026-01-26 11:26:01 -08:00
54e474cd26
Remove cruft from Brewfile 2026-01-26 11:24:27 -08:00
b3e1dcded4
Clean up gitconfig transfer flags 2025-11-24 14:17:17 -08:00
9ef9727e05
Swap in Codex for cc alias 2025-10-20 14:03:52 -07:00
aedd9edb9c
Make the init script idempotent 2025-09-20 12:53:48 -07:00
1db9de17e1
[tmux] Bind <prefix> space to next-window, like screen 2025-09-09 09:03:07 -07:00
392782cba0
Add tmux.conf and enable mousewheel in screenrc 2025-09-04 22:15:55 +00:00
b09bddfcdd
Use difftastic for git and add fzf to zsh 2025-08-17 12:37:26 -07:00
0d7f49d84a
Add nvm setup to zshrc 2025-07-18 09:31:08 -07:00
e1359d3f3c
Add .claude to gitignore 2025-07-09 16:32:21 -07:00
43c44fc06c
Add CLAUDE.local.md to .gitignore 2025-06-16 10:56:17 -07:00
112c00c584
Update gitignore and add mosh to Brewfile 2025-06-14 22:10:02 -07:00
dc4359eb0a
Add direct links to custom git commands in README
Make it easier to view the implementation of rmb and gup by linking directly to the scripts in the samsonjs/bin repository.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-06-09 09:14:10 -07:00
1d13655c5e
Add Readme.md and CLAUDE.md, remove some cruft 2025-06-06 09:05:43 -07:00
6924181dcd
Add cc alias for Claude Code 2025-06-05 07:53:39 -07:00
9d754bd1c4
Remove git conflictstyle = zdiff3, not useful that often 2025-05-08 08:33:52 -07:00
73958f335f
Turn on zle's bracketed-paste-magic 2025-05-08 08:25:32 -07:00
9a32974419
Fix neardrop entry in Brewfile 2025-01-03 09:25:52 -08:00
bfe18647a5
Revert "Remove neardrop from Brewfile"
This reverts commit 4019423491.
2025-01-02 19:20:39 -08:00
4019423491
Remove neardrop from Brewfile 2025-01-02 18:35:40 -08:00
ad5f6ac34f
Stop tapping homebrew/core in Brewfile 2025-01-02 18:25:05 -08:00
b6bc845a39
Stop tapping homebrew/cask in Brewfile 2025-01-02 18:24:48 -08:00
7d620873c6
Add s3cmd to Brewfile 2025-01-02 18:23:53 -08:00
794ba5cde5
Drop evalcache, it's actually annoying and I use rbenv all the time 2024-12-16 09:19:29 -08:00
94bf862741
Stop loading the keychain at every shell startup, it's slow 2024-12-16 09:02:05 -08:00
e7e599fef1
Omit commands from history that start with a space 2024-12-16 09:02:05 -08:00