diff --git a/99 Daily/2026-04-16.md b/99 Daily/2026-04-16.md index 163e6fe..7e16698 100644 --- a/99 Daily/2026-04-16.md +++ b/99 Daily/2026-04-16.md @@ -200,3 +200,6 @@ tags: [daily] - 19:41 | `aimpress` - **Asked:** Make the alias persistent across terminal restarts and add welcome message cheatsheets to wezterm. - **Done:** Configured persistent `clauded` alias, added fastfetch and pokemon-colorscripts to fish/zsh startup, unified Catppuccin Mocha theme across bat/fzf/fish. +- 19:44 | `aimpress` + - **Asked:** Make the claude alias persistent across terminal restarts and add cheat sheets to wezterm startup + - **Done:** Configured persistent alias in shell config and created welcome message with cheat sheets for wezterm diff --git a/wiki/dotfiles/terminal-cheatsheet.md b/wiki/dotfiles/terminal-cheatsheet.md index 559eb1c..0925bab 100644 --- a/wiki/dotfiles/terminal-cheatsheet.md +++ b/wiki/dotfiles/terminal-cheatsheet.md @@ -30,7 +30,7 @@ See also: [[wiki/dotfiles/linux-terminal-ricing|linux-terminal-ricing]]. --- -## Git +## Git — quick aliases | Alias | Command | |-------|---------| @@ -42,6 +42,30 @@ See also: [[wiki/dotfiles/linux-terminal-ricing|linux-terminal-ricing]]. | `gp` / `gpl` | `git push` / `git pull` | | `lg` | `lazygit` (TUI) | +## Git + fzf (forgit plugin) + +Interactive fuzzy-finder versions of git commands — pick files / commits / branches visually with diff previews. + +| Abbr | Action | +|------|--------| +| `fga` | interactive `git add` — pick files via fzf | +| `fgd` | interactive diff picker | +| `glo` | git log picker with diff preview | +| `gi` | generate `.gitignore` for any language | +| `gco` | checkout commit from fzf list | +| `gcb` / `gsw` | checkout / switch branch (fzf) | +| `gbd` | delete branch (fzf multi-select) | +| `gcf` | checkout single file (fzf) | +| `grh` | reset HEAD (fzf on staged files) | +| `gss` / `gsp` | stash show / push (fzf) | +| `gcp` | cherry-pick from branch (fzf) | +| `grb` / `gsq` / `gfu` | interactive rebase / squash / fixup | +| `grc` | revert commit (fzf) | +| `gclean` | clean untracked (fzf multi-select) | + +> [!info] Conflict resolution +> forgit's default `ga` and `gd` conflict with the quick-aliases above. Renamed to `fga` / `fgd` via `set -U forgit_add fga` and `set -U forgit_diff fgd`. + ### lazygit shortcuts | Key | Action | @@ -191,6 +215,20 @@ Ctrl+R # fuzzy history search | `poke` | random Pokémon ASCII art | | `fastfetch` | system info (prints on shell start) | +## Fish plugin sugar + +Installed via `fisher`: autopair, puffer-fish, sponge, colored_man_pages, done, forgit, fzf.fish, tide. + +| Input | Effect | +|-------|--------| +| `(`, `[`, `{`, `"`, `'` | **autopair.fish** — auto-closes the matching pair | +| `...` → `../..` | **puffer-fish** — dot expansion (add more dots for more levels) | +| `!!` / `!$` | last command / last arg (puffer-fish bang expansion) | +| `$x` → `$(x)` | puffer-fish variable expansion | +| `man ` | **colored_man_pages** — syntax-highlighted manpages | +| long cmd (>5s) finishes in background | **done** — macOS notification pops up | +| typo / failed command | **sponge** — removes it from history automatically | + --- ## superfile (`spf`)