diff options
| author | Craig Jennings <c@cjennings.net> | 2026-01-26 17:36:38 -0600 |
|---|---|---|
| committer | Craig Jennings <c@cjennings.net> | 2026-01-26 17:36:38 -0600 |
| commit | dada2f255daaa2fb493ec8c7d47e2a8123aea494 (patch) | |
| tree | 0c0eeb84bb7b6e66a2d7f41cdfd061b25f80cc14 /dotfiles/common/.zshrc.d/git.sh | |
| parent | d50e5955837788fc69b4d5bc74cb574b859ed31a (diff) | |
refactor(dotfiles): rename system/ to common/ and remove unused configs
Rename dotfiles/system to dotfiles/common for clarity - indicates
shared dotfiles used across all desktop environments (DWM, Hyprland).
Removed config directories for uninstalled applications:
- ghostty (using different terminal)
- lf (using ranger instead)
- mopidy (using mpd instead)
- nitrogen (X11-only, obsolete for Wayland)
- pychess (not installed)
- JetBrains (not installed via archsetup)
- youtube-dl (using yt-dlp with different config location)
Kept audacious config for potential future use.
Updated all references in archsetup, CLAUDE.md, todo.org, and
validation.sh.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Diffstat (limited to 'dotfiles/common/.zshrc.d/git.sh')
| -rw-r--r-- | dotfiles/common/.zshrc.d/git.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/dotfiles/common/.zshrc.d/git.sh b/dotfiles/common/.zshrc.d/git.sh new file mode 100644 index 0000000..6c2b6ad --- /dev/null +++ b/dotfiles/common/.zshrc.d/git.sh @@ -0,0 +1,32 @@ +# git.sh +# Craig Jennings <c@cjennings.net> +# Git aliases and convenience functions + +# ============================================================================= +# Aliases +# ============================================================================= +alias gitlog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative" +alias gitstatus='git status -sb' +alias gitcom='git commit -m' +alias gitpp='git pull --prune' +alias gittagbydate="git for-each-ref --sort=creatordate --format '%(refname) %(creatordate)' refs/tags" + +# ============================================================================= +# Functions +# ============================================================================= + +# Stash, pull, pop +gitsp() { + git stash && git pull && git stash pop +} + +# Checkout branch with fzf +gitck() { + git checkout "$(git branch --all | fzf | tr -d '[:space:]')" +} + +# Diff with fzf preview +gitdiff() { + preview="git diff $@ --color=always -- {-1}" + git diff "$@" --name-only | fzf -m --ansi --preview "$preview" +} |
